fix

public/css/oldVer/main0.css

@@ -67,11 +67,19 @@ iframe {
   z-index: 999999;
   background: rgba(0, 0, 0, 0.6);
 }
+.popup-wrap {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  max-width: 950px;
+  width: 100%;
+  height: 530px;
+  transform: translate(-50%, -50%);
+}
 .popup-content {
   position: relative;
-  width: 100%;
-  height: 100%;
   overflow: hidden;
+  height: 100%;
 }
 #id1 {
   width: 100%;
@@ -82,12 +90,12 @@ iframe {
 }
 #closepop {
   background: url(../../images/close2.png) no-repeat;
-  width: 30px;
-  height: 30px;
+  width: 25px;
+  height: 25px;
   cursor: pointer;
   position: absolute;
-  right: 420px;
-  top: 190px;
+  right: 30px;
+  top: 30px;
   text-indent: -999em;
   background-size: 100% 100%;
 }
@@ -186,18 +194,19 @@ a {
 }
 
 @media screen and (max-width: 1200px) {
-  #closepop {
-    width: 40px;
-    height: 40px;
-    top: 20px;
-    right: 20px;
-  }
   .specialTitle {
     bottom: 66%;
     font-size: 26px;
   }
 }
 
+@media screen and (max-width: 1000px) {
+  .popup-wrap {
+    width: 90%;
+    height: 55%;
+  }
+}
+
 @media screen and (max-width: 768px) {
   .specialTitle {
     bottom: 62%;
@@ -224,9 +233,11 @@ a {
     background-size: cover;
     width: 35px;
     height: 35px;
-    top: 50%;
-    right: 50%;
-    transform: translate(50%, 150px);
+    top: unset;
+    left: 50%;
+    right: unset;
+    bottom: -55px;
+    transform: translateX(-50%);
   }
 
   #title-toggle {
@@ -285,4 +296,4 @@ a {
   .pinTop {
     top: 0px;
   }
-}
+}

public/js/Hot.js

@@ -53,14 +53,18 @@ window.initHot = function (model) {
     var src = ''
     var r = link.substring(link.indexOf('html') + 4),
       o = 'en' == manage.number('lang') ? '&lang=' + manage.number('lang') : ''
-    ;-1 == r.indexOf('?')
-      ? (src = link + '?time=' + randomTime().getTime() + '&id=' + window.number + o)
-      : (src = link + '&time=' + randomTime().getTime() + '&id=' + window.number + o)
+      ; -1 == r.indexOf('?')
+        ? (src = link + '?time=' + randomTime().getTime() + '&id=' + window.number + o)
+        : (src = link + '&time=' + randomTime().getTime() + '&id=' + window.number + o)
 
     return src.replace(
       'https://www.4dmodel.com/SuperTwo/hot_online1',
       'https://houseoss.4dkankan.com/project/HainanMuseum/hot'
     )
+    // return src.replace(
+    //   'https://www.4dmodel.com/SuperTwo/hot_online1',
+    //   'http://localhost:8080'
+    // )
     // return src
   }
   var removeSrcPostMark = function (url) {
@@ -363,7 +367,7 @@ window.initHot = function (model) {
         if (media) {
           this.changeShineTex(media)
         } else {
-          this.styleImg = /* this.styleImg || */ []
+          this.styleImg = /* this.styleImg || */[]
           if (this.info.styleImg) {
             this.styleImg = this.info.styleImg.map(src => {
               return { src: /* manage.dealURL( */ src } //如果要dealURL,在predeal里
@@ -451,7 +455,7 @@ window.initHot = function (model) {
         {
           let action = CloneObject(settings.hotClickEvent.shine)
           if (info.actionType == 'noAction' || info.noAction) {
-            ;(action.examine = false), (action.openHot = false)
+            ; (action.examine = false), (action.openHot = false)
           } else if (info.actionType == 'dontExam') {
             action.examine = false
           }
@@ -690,9 +694,9 @@ window.initHot = function (model) {
         visibility != void 0
           ? visibility
           : !this.info.visiblePanos ||
-            (type == 'every'
-              ? panos.every(pano => this.info.visiblePanos.includes(pano.id))
-              : panos.some(pano => this.info.visiblePanos.includes(pano.id))) //type为every时，需要panos中每个都可见才显示
+          (type == 'every'
+            ? panos.every(pano => this.info.visiblePanos.includes(pano.id))
+            : panos.some(pano => this.info.visiblePanos.includes(pano.id))) //type为every时，需要panos中每个都可见才显示
 
       convertTool.updateVisible(this, 'visi', visible)
 
@@ -1194,32 +1198,32 @@ window.initHot = function (model) {
       var popup = document.getElementById('popup')
 
       if (openHot) {
-        ;(g_currentHot = this), (popup.style.display = 'block'), popup.classList.add('wait')
+        ; (g_currentHot = this), (popup.style.display = 'block'), popup.classList.add('wait')
         var n = document.createElement('iframe')
 
         SoundManager.play('hot')
 
         var src = getLink(this.info.link)
         n.src = src
-        ;(n.id = 'id1'), (n.allowTransparency = 'true')
+          ; (n.id = 'id1'), (n.allowTransparency = 'true')
         var a = document.getElementById('id1')
         if (void 0 === a || null == a) {
           document.querySelector('.popup-content').appendChild(n)
           var s = !1
-          ;(window.loaddingSuccess = function () {
-            s = !0
-          }),
-            setTimeout(function e() {
-              if (s) {
-                var t = document.querySelector('#id1').contentWindow.document
-                t.querySelector('video') &&
-                  (t.querySelector('video').play(),
-                  !t.querySelector('video').paused &&
-                    t.querySelector('.playPause') &&
-                    t.querySelector('.playPause').classList.add('fa-pause')),
-                  t.querySelector('audio') && t.querySelector('audio').play()
-              } else setTimeout(e, 300)
-            }, 800)
+            ; (window.loaddingSuccess = function () {
+              s = !0
+            }),
+              setTimeout(function e() {
+                if (s) {
+                  var t = document.querySelector('#id1').contentWindow.document
+                  t.querySelector('video') &&
+                    (t.querySelector('video').play(),
+                      !t.querySelector('video').paused &&
+                      t.querySelector('.playPause') &&
+                      t.querySelector('.playPause').classList.add('fa-pause')),
+                    t.querySelector('audio') && t.querySelector('audio').play()
+                } else setTimeout(e, 300)
+              }, 800)
         }
       }
 
@@ -1265,7 +1269,7 @@ window.initHot = function (model) {
           var f = new THREE.Matrix4().lookAt(c.position, h, new THREE.Vector3(0, 1, 0))
           p.quaternion = new THREE.Quaternion().setFromRotationMatrix(f)
         }
-        ;(p.callback = done),
+        ; (p.callback = done),
           (p.duration = options.duration || 1500),
           (p.mode = 'panorama'),
           (p.aimDuration = options.aimDuration)

src/pages/A1home/index.tsx

@@ -29,8 +29,10 @@ function A1home() {
       <div id='hot'> </div>
       <div className='widgets-doll-labels'> </div>
       <div id='popup'>
-        <div className='popup-content'></div>
-        <div id='closepop'>close</div>
+        <div className='popup-wrap'>
+          <div className='popup-content'></div>
+          <div id='closepop'>close</div>
+        </div>
       </div>
 
       <div className='sidecontent' style={{ width: '35%' }}>

src/pages/A2main/index.module.scss

@@ -60,7 +60,9 @@
       display: flex;
       justify-content: flex-end;
       align-items: center;
-      gap: 38px;
+      > *:not(:last-child) {
+        margin-right: 38px;
+      }
       .likeBox,
       #volume,
       #gui-fullscreen,
@@ -69,7 +71,6 @@
       .A2_view_box {
         width: 48px;
         height: 48px;
-        margin: 0;
         background-color: transparent !important;
         position: relative;
         img {
@@ -241,8 +242,11 @@
         justify-content: flex-end;
         flex-direction: column;
         align-items: center;
-        gap: 20px;
         margin-bottom: -20px;
+        > *:not(:last-child) {
+          margin-right: unset;
+          margin-bottom: 20px;
+        }
         .likeBox,
         #volume,
         #gui-fullscreen,
@@ -251,7 +255,6 @@
         .A2_view_box {
           width: 35px;
           height: 35px;
-          margin: 0;
           background-color: transparent !important;
           position: relative;
           a {