fix

public/css/main.css

@@ -2952,7 +2952,7 @@ html {
 }
 
 @media only screen and (-webkit-min-device-pixel-ratio: 2),
-  only screen and (-o-min-device-pixel-ratio: 2) {
+only screen and (-o-min-device-pixel-ratio: 2) {
   .gui-floorplan-label-mobile {
     font-size: 65%;
     border-radius: 1px;
@@ -2960,7 +2960,7 @@ html {
 }
 
 @media only screen and (-webkit-min-device-pixel-ratio: 3),
-  only screen and (-o-min-device-pixel-ratio: 3) {
+only screen and (-o-min-device-pixel-ratio: 3) {
   .gui-floorplan-label-mobile {
     font-size: 65%;
     border-radius: 1px;
@@ -3647,7 +3647,7 @@ ul {
   height: auto;
 }
 
-@media only screen and (max-width: 600px), (max-height: 600px) {
+@media only screen and (max-width: 1000px), (max-height: 600px) {
   #quick-logo img {
     width: 150px;
     height: auto;
@@ -3753,7 +3753,7 @@ a.tag-link {
   height: 22px;
   line-height: 20px;
   left: 0px;
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#4c4c4c', endColorstr='#262626', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#4c4c4c', endColorstr='#262626', GradientType=0);
   font-size: 16px;
   text-align: center;
   -webkit-border-radius: 6px;
@@ -5836,12 +5836,7 @@ a.hasHover.tag-link:hover {
   #help-dialog.desktop.es-MX .interactions .bottom-info,
   #help-dialog.desktop.es-MX.dollhouse .interactions .bottom-info,
   #help-dialog.desktop.fr-FR.dollhouse .interactions .bottom-info,
-  #help-dialog.desktop.fr-FR.floorplan
-    .interactions
-    .bottom-info
-    #help-dialog.desktop.fr-FR
-    .interactions
-    .bottom-info {
+  #help-dialog.desktop.fr-FR.floorplan .interactions .bottom-info #help-dialog.desktop.fr-FR .interactions .bottom-info {
     top: 65%;
   }
   #help-dialog.desktop.es-MX.dollhouse .interactions .bottom-info,
@@ -6509,7 +6504,7 @@ a.hasHover.tag-link:hover {
 }
 
 @media only screen and (min-height: 650px) and (min-width: 650px) and (max-aspect-ratio: 650/800),
-  (min-aspect-ratio: 800/650) and (min-height: 650px) and (min-width: 650px) {
+(min-aspect-ratio: 800/650) and (min-height: 650px) and (min-width: 650px) {
   #help-dialog.mobile .interactions .top-info,
   #help-dialog.mobile.fr-FR.dollhouse .interactions .top-info {
     font-size: 21px;
@@ -7622,7 +7617,7 @@ a.hasHover.tag-link:hover {
   }
 }
 
-@media only screen and (max-width: 600px) {
+@media only screen and (max-width: 1000px) {
   #myCompany {
     width: 200px;
   }
@@ -7678,12 +7673,12 @@ a.hasHover.tag-link:hover {
   }
 }
 
-@media screen and (orientation: landscape) {
+/* @media screen and (orientation: landscape) {
   .viewContainer,
   #gui-modes-map {
     display: block !important;
   }
-}
+} */
 
 @media only screen and (max-width: 370px) {
   #gui-name {
@@ -8017,4 +8012,4 @@ a.hasHover.tag-link:hover {
     opacity: 1;
     margin-top: 0;
   }
-}
+}

public/css/main.css.bak

@@ -3167,7 +3167,7 @@ body,html {
     height: auto
 }
 
-@media only screen and (max-width: 600px),(max-height:600px) {
+@media only screen and (max-width: 1000px),(max-height:600px) {
     #quick-logo img {
         width:150px;
         height: auto

public/css/oldVer/main0.css

@@ -57,20 +57,29 @@ iframe {
 }
 
 #popup {
-  text-align: center;
-  padding: 0;
-  position: relative;
-  width: 100%;
-  height: 100%;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.6);
   /* margin: 80px auto; */
   display: none;
   z-index: 999999;
-  background: rgba(0, 0, 0, 0.6);
 }
-.popup-content {
-  position: relative;
+.popup-wrap {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  gap: 30px;
   width: 100%;
   height: 100%;
+}
+.popup-content {
+  position: relative;
+  width: 60%;
+  height: 65%;
   overflow: hidden;
 }
 #id1 {
@@ -85,9 +94,6 @@ iframe {
   width: 30px;
   height: 30px;
   cursor: pointer;
-  position: absolute;
-  right: 405px;
-  top: 185px;
   text-indent: -999em;
   background-size: 100% 100%;
 }
@@ -189,16 +195,18 @@ a {
   #closepop {
     width: 45px;
     height: 45px;
-    top: 50%;
-    right: 50%;
-    transform: translate(50%, 156px);
   }
   .specialTitle {
     bottom: 66%;
     font-size: 26px;
   }
 }
-
+@media screen and (max-width: 1000px) {
+  .popup-content {
+    width: 90%;
+    height: 80%;
+  }
+}
 @media screen and (max-width: 768px) {
   .specialTitle {
     bottom: 62%;
@@ -223,9 +231,6 @@ a {
   #closepop {
     width: 45px;
     height: 45px;
-    top: 50%;
-    right: 50%;
-    transform: translate(50%, 176px);
   }
 
   #title-toggle {
@@ -284,4 +289,4 @@ a {
   .pinTop {
     top: 0px;
   }
-}
+}

public/hottemp/css/style.css

@@ -1,82 +1,204 @@
-button{background:transparent;}
-html,body {
-    width: 100%;
-    height: 100%;
-    font-family: "Microsoft YaHei";
-    margin:0px;
-    overflow: hidden;
-}
-body{ overflow-y:scroll; -webkit-overflow-scrolling:touch;}
-.wrapper{width: 64%;height: 100%;margin:  0 auto; padding-top: 100px;}
-.contioner{ overflow: hidden;}
-.wrap-img, .wrap-video, .wrap-model{ background: rgba(0,0,0,0.8); width: 100%; height: 100%; display: none; display: flex; justify-content: center; align-items: center;}
-.wrap-img img{ max-width: 100%; max-height: 100%; }
-.wrap-img > div, .wrap-video > video, .wrap-model > div{width: 100%; height: 100%;}
-.footer-title{ display: flex; justify-content: space-between; margin-top: 20px;  }
-.footer-text{margin-top: 20px;}
-.footer-title h3 { font-size: 20px; color: #fff; font-weight: 600;}
-.wrap-iframe{ height: 100%; overflow-x:hidden; -webkit-overflow-scrolling:touch;}
-.wrap-iframe iframe, .wrap-model iframe { width: 100%; height: 99%;} 
-.footer-btn button{ font-size: 14px; color: #fff; width: 90px; height: 32px; line-height: 32px; cursor: pointer; border-radius: 10px; border: solid 1px #fff; margin-right: 10px; }
-.footer-btn button.active{background: #19bbed; border: none;}
-.footer-text{ color: #fff; line-height: 120%; position: relative; text-align: justify;}
-.img-icon{background: url("https://super.4dage.com/data/388/hot/images/img-icon.png")no-repeat left top;}
-.video-icon{background: url("https://super.4dage.com/data/388/hot/images/video-icon.png")no-repeat left top;}
-.model-icon{background: url("https://super.4dage.com/data/388/hot/images/model-icon.png")no-repeat left top;}
-.iframe-icon{background: url("https://super.4dage.com/data/388/hot/images/iframe-icon.png")no-repeat left top;}
-.footer-btn i{ display: inline-block; position: relative; top: 4px; background-size: 100%; width: 18px; position: relative;  height: 18px; margin-right: 5px;}
- .footer-mask{position: absolute;/* background: linear-gradient(rgba(61,61,61,0) 0%, rgba(61,61,61,0.9) 40%,  rgba(61,61,61,1) 60%,rgba(61,61,61,0) 100%);*/  z-index: 10;bottom: -16px;left: 0;width: 100%;height: 50%;} 
+button {
+  background: transparent;
+}
+html, body {
+  width: 100%;
+  height: 100%;
+  font-family: "Microsoft YaHei";
+  margin: 0px;
+  overflow: hidden;
+}
+body {
+  overflow-y: scroll;
+  -webkit-overflow-scrolling: touch;
+}
+.wrapper {
+  width: 64%;
+  height: 100%;
+  margin: 0 auto;
+  padding-top: 100px;
+}
+.contioner {
+  overflow: hidden;
+}
+.wrap-img, .wrap-video, .wrap-model {
+  background: rgba(0, 0, 0, 0.8);
+  width: 100%;
+  height: 100%;
+  display: none;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.wrap-img img {
+  max-width: 100%;
+  max-height: 100%;
+}
+.wrap-img > div, .wrap-video > video, .wrap-model > div {
+  width: 100%;
+  height: 100%;
+}
+.footer-title {
+  display: flex;
+  justify-content: space-between;
+  margin-top: 20px;
+}
+.footer-text {
+  margin-top: 20px;
+}
+.footer-title h3 {
+  font-size: 20px;
+  color: #fff;
+  font-weight: 600;
+}
+.wrap-iframe {
+  height: 100%;
+  overflow-x: hidden;
+  -webkit-overflow-scrolling: touch;
+}
+.wrap-iframe iframe, .wrap-model iframe {
+  width: 100%;
+  height: 99%;
+}
+.footer-btn button {
+  font-size: 14px;
+  color: #fff;
+  width: 90px;
+  height: 32px;
+  line-height: 32px;
+  cursor: pointer;
+  border-radius: 10px;
+  border: solid 1px #fff;
+  margin-right: 10px;
+}
+.footer-btn button.active {
+  background: #19bbed;
+  border: none;
+}
+.footer-text {
+  color: #fff;
+  line-height: 120%;
+  position: relative;
+  text-align: justify;
+}
+.img-icon {
+  background: url("https://super.4dage.com/data/388/hot/images/img-icon.png")no-repeat left top;
+}
+.video-icon {
+  background: url("https://super.4dage.com/data/388/hot/images/video-icon.png")no-repeat left top;
+}
+.model-icon {
+  background: url("https://super.4dage.com/data/388/hot/images/model-icon.png")no-repeat left top;
+}
+.iframe-icon {
+  background: url("https://super.4dage.com/data/388/hot/images/iframe-icon.png")no-repeat left top;
+}
+.footer-btn i {
+  display: inline-block;
+  position: relative;
+  top: 4px;
+  background-size: 100%;
+  width: 18px;
+  position: relative;
+  height: 18px;
+  margin-right: 5px;
+}
+.footer-mask {
+  position: absolute;
+  /* background: linear-gradient(rgba(61,61,61,0) 0%, rgba(61,61,61,0.9) 40%,  rgba(61,61,61,1) 60%,rgba(61,61,61,0) 100%);*/
+  z-index: 10;
+  bottom: -16px;
+  left: 0;
+  width: 100%;
+  height: 50%;
+}
 
- .pinch-zoom-container{height: 100%;}
+.pinch-zoom-container {
+  height: 100%;
+}
+
+@media screen and (max-width: 1600px) {
+  .wrapper {
+    width: 76%;
+    padding-top: 70px;
+  }
 
- @media screen and (max-width: 1600px) {
-    .wrapper{ width: 76%; padding-top: 70px;}
-    
 }
 @media screen and (max-width: 1000px) {
-    .wrapper{ width: 86%; padding-top: 50px;}
+  .wrapper {
+    width: 86%;
+    padding-top: 50px;
+  }
 }
 @media screen and (max-width: 700px) {
-    .footer-title h3{ font-size: 16px;}
-    .footer-text{ font-size: 14px; margin-top: 10px; padding: 0 6px; line-height: 150%;}
-    .footer-text p { text-indent: 28px;}
-    .wrapper{ width: 94%; padding-top: 30px;}
-    .footer-title{flex-direction:column-reverse; align-items:center; margin-top: 10px; }
-    .footer-btn{margin-bottom: 10px;}
-    .ui-icon-before:before{left: 4px;}
-    
-}
-@media screen and (max-width: 600px) {
-    .wrapper{ width: 100%; padding-top: 34px; }
-    .o-slider--item{background: rgba(0,0,0,0.4);}
+  .footer-title h3 {
+    font-size: 16px;
+  }
+  .footer-text {
+    font-size: 14px;
+    margin-top: 10px;
+    padding: 0 6px;
+    line-height: 150%;
+  }
+  .footer-text p {
+    text-indent: 28px;
+  }
+  .wrapper {
+    width: 94%;
+    padding-top: 30px;
+  }
+  .footer-title {
+    flex-direction: column-reverse;
+    align-items: center;
+    margin-top: 10px;
+  }
+  .footer-btn {
+    margin-bottom: 10px;
+  }
+  .ui-icon-before:before {
+    left: 4px;
+  }
+
 }
-@media screen and (max-width: 400px) {
+@media screen and (max-width: 1000px) {
+  .wrapper {
+    width: 100%;
+    padding-top: 34px;
+  }
+  .o-slider--item {
+    background: rgba(0, 0, 0, 0.4);
+  }
 }
+@media screen and (max-width: 400px) {}
 
 
-::-webkit-scrollbar/*整体部分*/
-{
-    width: 10px;
-    height:10px;
+::-webkit-scrollbar
+/*整体部分*/
+  {
+  width: 10px;
+  height: 10px;
 }
 
-::-webkit-scrollbar-track/*滑动轨道*/
-{
-    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-    border-radius: 0px;
-    background: rgba(0,0,0,0.1);
+::-webkit-scrollbar-track
+/*滑动轨道*/
+  {
+  -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+  border-radius: 0px;
+  background: rgba(0, 0, 0, 0.1);
 }
 
-::-webkit-scrollbar-thumb/*滑块*/
-{
-    border-radius: 5px;
-    -webkit-box-shadow: inset 0 0 5px rgba(192,192,192,0.2);
-    background: rgba(192,192,192,0.2);
+::-webkit-scrollbar-thumb
+/*滑块*/
+  {
+  border-radius: 5px;
+  -webkit-box-shadow: inset 0 0 5px rgba(192, 192, 192, 0.2);
+  background: rgba(192, 192, 192, 0.2);
 }
 
-::-webkit-scrollbar-thumb:hover/*滑块效果*/
-{
-    border-radius: 5px;
-    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-    background: rgba(0,0,0,0.4);
-}
+::-webkit-scrollbar-thumb:hover
+/*滑块效果*/
+  {
+  border-radius: 5px;
+  -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+  background: rgba(0, 0, 0, 0.4);
+}

public/hottemp/css/video.css

@@ -64,7 +64,9 @@
 .playPause.ui-icon.fa-pause {
   opacity: 0;
 }
-.video-index{ height: 100%;}
+.video-index {
+  height: 100%;
+}
 .ui {
   color: #fff;
   padding: 10px 1vw;
@@ -127,7 +129,7 @@
   color: rgba(0, 0, 0, 0.6);
 }
 .fullscreen:hover:before {
-  color: rgba(0,0,0, 0.8);
+  color: rgba(0, 0, 0, 0.8);
 }
 
 .ui-icon {
@@ -170,7 +172,7 @@
 }
 
 .progress-buffer {
-  background-color:#cccccc;
+  background-color: #cccccc;
   -moz-transition: width 250ms linear;
   -o-transition: width 250ms linear;
   -webkit-transition: width 250ms linear;
@@ -203,9 +205,17 @@
 .volumeControl .ui-slider-handle:focus {
   outline: none;
 }
-.ui-icon-before{display: flex;justify-content: center;align-items: center;width: 120px;height: 120px;background:rgba(0, 0, 0, 0.8);border-radius:50%;}
-.ui-icon-before:before{
-  content:"\f04b";
+.ui-icon-before {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 120px;
+  height: 120px;
+  background: rgba(0, 0, 0, 0.8);
+  border-radius: 50%;
+}
+.ui-icon-before:before {
+  content: "\f04b";
   font-size: 50px;
   color: rgba(255, 255, 255, 0.8);
   z-index: 2;
@@ -213,12 +223,19 @@
   position: relative;
   left: 5px;
 }
-.fa-play:before{ content:""; }
-@media screen and (max-width: 600px){
-  .ui-icon-before{width: 60px;height: 60px;}
-  .ui-icon-before:before{
+.fa-play:before {
+  content: "";
+}
+@media screen and (max-width: 1000px) {
+  .ui-icon-before {
+    width: 60px;
+    height: 60px;
+  }
+  .ui-icon-before:before {
     font-size: 35px;
     left: 3px;
   }
-  .ui{padding: 2px 1vw;}
+  .ui {
+    padding: 2px 1vw;
+  }
 }

public/js/Hot.js

@@ -53,7 +53,7 @@ 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/WuhanMuseum/hot')
     // return src.replace('https://www.4dmodel.com/SuperTwo/hot_online1', 'http://localhost:8080')
@@ -341,7 +341,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里
@@ -429,7 +429,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
           }
@@ -1135,29 +1135,29 @@ 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)
         }
       }
 
@@ -1203,7 +1203,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.duration = options.duration || 1500), (p.mode = 'panorama'), (p.aimDuration = options.aimDuration)
+        ; (p.callback = done), (p.duration = options.duration || 1500), (p.mode = 'panorama'), (p.aimDuration = options.aimDuration)
         player.flyToNewMode(p)
       }
     }

public/js/loadCAD.js

@@ -50,7 +50,7 @@ window.grendCAD = (function grendCAD() {
         height: 100%;
       }
 
-      @media only screen and (max-width: 600px) {
+      @media only screen and (max-width: 1000px) {
         .cad {
             position: absolute;
             left: 16px;

public/showa/js/loadCAD.js

@@ -71,7 +71,7 @@ window.grendCAD = (function grendCAD() {
         transition: opacity 0.3s ease;
       }
 
-      @media only screen and (max-width: 600px) {
+      @media only screen and (max-width: 1000px) {
         .cad {
             position: absolute;
             left: 16px;

src/assets/styles/base.css

@@ -14,7 +14,8 @@ body {
   height: 100%;
 }
 @font-face {
-  font-family: 'fzFont'; /* 自定义字体名称 */
+  font-family: 'fzFont';
+  /* 自定义字体名称 */
   src: url('../font/fzFont.TTF') format('truetype');
 }
 a {
@@ -143,6 +144,9 @@ body,
 .likeMoveAc {
   animation: likeMoveAc 2s linear forwards;
 }
+.room-label p {
+  color: #FDFBB2;
+}
 @keyframes likeMoveAc {
   0% {
     opacity: 1;
@@ -161,8 +165,8 @@ body,
     height: 120px;
   }
 }
-@media screen and (max-width: 600px) {
+@media screen and (max-width: 1000px) {
   html .cad {
     top: 20px;
   }
-}
+}

src/assets/styles/base.less

@@ -196,8 +196,8 @@ body,
   }
 }
 
-@media screen and (max-width: 600px) {
+@media screen and (max-width: 1000px) {
   html .cad {
     top: 20px;
   }
-}
+}

src/pages/A1home/index.tsx

@@ -23,8 +23,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

@@ -199,7 +199,7 @@
 
     // 移动端
 
-    @media screen and (max-width: 600px) {
+    @media screen and (max-width: 1000px) {
       .hoveImg {
         height: 20px;
         top: 30px;

src/pages/A3hotList/index.module.scss

@@ -72,7 +72,7 @@
   }
 }
 
-@media screen and (max-width: 600px) {
+@media screen and (max-width: 1000px) {
   .A3hotList {
     width: 100%;
     height: 50%;