fix

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/BDLG/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/showa/js/loadCAD.js

@@ -48,6 +48,7 @@ window.grendCAD = (function grendCAD() {
         border-radius: 5px; 
         background-image: url('./images/map_1.png');
         background-size: cover;
+        visibility: visible;
         path {
           opacity: 0;
         }
@@ -83,6 +84,7 @@ window.grendCAD = (function grendCAD() {
             border-radius: 5px;
             background-image: url('./images/map_1.png');
             background-size: cover;
+            visibility: hidden ;
             path {
               opacity: 0;
             }
@@ -141,7 +143,6 @@ window.grendCAD = (function grendCAD() {
         $img.style.display = $img.style.display === 'block' ? 'none' : 'block'
       })
 
-      $layer.style.visibility = 'hidden'
       window.cad = structureCAD({
         data: {
           block: [],
@@ -165,7 +166,6 @@ window.grendCAD = (function grendCAD() {
       if (point && dire) {
         window.cad.setSign(point, dire)
       }
-      $layer.style.visibility = 'visible'
     })
   }
 })()

src/assets/styles/base.css

@@ -161,12 +161,8 @@ body,
 }
 @media screen and (max-width: 1000px) {
   html .cad {
-    width: 120px;
-    height: 120px;
-  }
-}
-@media screen and (max-width: 1000px) {
-  html .cad {
+    width: 140px;
     top: 20px;
+    height: 85px;
   }
-}
+}

src/pages/A2main/index.module.scss

@@ -28,7 +28,6 @@
       background: url(../../assets/img/bottomBar.png) no-repeat center;
       background-size: contain;
       background-color: transparent;
-      left: 20px;
       display: flex;
       align-items: center;
       padding-bottom: 20px;
@@ -77,6 +76,7 @@
       align-items: center;
       gap: 38px;
       .likeBox,
+      .A2_map_box,
       #volume,
       #gui-fullscreen,
       #gui-fullscreen-exit,
@@ -111,8 +111,7 @@
     // 只有在全景漫游下其他按钮才能点
     .pinBottom-containerNo {
       #play,
-      #pause,
-      .A2hotIcon {
+      #pause {
         opacity: 0.5 !important;
         pointer-events: none !important;
       }
@@ -120,6 +119,7 @@
 
     // 点赞
     .likeBox,
+    .A2_map_box,
     .A2_share_box,
     .A2_view_box {
       float: left;
@@ -294,17 +294,17 @@
         height: 20px;
         top: 30px;
         font-size: 10px;
+        color: #fff;
+        text-shadow: 0 0 5px rgba(253, 251, 178, 0.8), 0 0 10px rgba(253, 251, 178, 0.6);
       }
       #gui-modes-map {
-        background: url(../../assets/img/border-left.png) no-repeat;
-        background-size: 100% 100%;
         display: flex;
         justify-content: flex-end;
         align-items: center;
         flex-direction: column;
         gap: 30px;
         margin: 0;
-        padding: 47px 0px;
+        padding: 30px 0px;
         width: 55px;
         #play,
         #pause,
@@ -327,7 +327,7 @@
       }
 
       .pinBottom {
-        width: calc(100% - 35px) !important;
+        width: 100% !important;
         align-items: flex-end !important;
         justify-content: space-between !important;
         background: transparent !important;
@@ -339,16 +339,14 @@
       }
 
       .rightViewContainer {
-        width: 55px;
-        padding: 17px 0;
-        background: url(../../assets/img/border-right.png) no-repeat;
-        background-size: 100% 100%;
+        width: 65px;
         display: flex;
         justify-content: flex-end;
         flex-direction: column;
         align-items: center;
         gap: 30px;
         .likeBox,
+        .A2_map_box,
         #volume,
         #gui-fullscreen,
         #gui-fullscreen-exit,

src/pages/A2main/index.tsx

@@ -10,6 +10,7 @@ import classNames from 'classnames'
 import A3hotList from '../A3hotList'
 import { message } from 'antd'
 import http from '@/utils/http'
+import isMobile from '@/utils/isMobile'
 const imgArrTemp = ['like.png', 'likeAc.png']
 const imgArr = imgArrTemp.map(item => require(`@/assets/img/${item}`))
 
@@ -70,13 +71,15 @@ function A2main() {
       message.success('链接已复制到剪贴板')
     }
   }
+  const cad: HTMLElement | null = document.querySelector('.cad')
   const hiddenMap = (isShow: boolean) => {
-    const cad: any = document.querySelector('.cad')
     if (cad) {
       cad.style.visibility = isShow ? 'hidden' : 'visible'
     }
   }
 
+  // 是移动端隐藏地图
+
   return (
     <div className={styles.A2main} id='gui' style={{ display: 'none' }}>
       <A21vrOff />
@@ -195,6 +198,22 @@ function A2main() {
               <div className='hoveImg'>音乐开关</div>
             </div>
 
+            {/* 地图 */}
+            <div
+              className='A2_map_box'
+              style={!isMobile() ? { display: 'none' } : {}}
+              onClick={() => {
+                if (!cad?.style.visibility) {
+                  hiddenMap(true)
+                }
+                const isShow = cad?.style.visibility === 'hidden'
+                hiddenMap(!isShow)
+              }}
+            >
+              <img src={require('@/assets/img/map.png')} alt='' />
+              <div className='hoveImg'>地图</div>
+            </div>
+
             {/* 点赞 */}
             <div className='likeBox' onClick={likeFu}>
               <img src={like ? imgArr[1] : imgArr[0]} alt='' />

src/pages/A4base/components/index.module.scss

@@ -173,7 +173,8 @@
         width: 40px;
         height: 80px !important;
         & button {
-          background: url('../image/scroll3.png') no-repeat center center;
+          background: url('../image/scroll3.png') no-repeat;
+          background-size: cover;
           width: 40px;
           height: 40px;
         }

src/pages/A5Mobile/components/index.module.scss

@@ -130,7 +130,7 @@
           opacity: 1;
         }
         .date7 {
-          transform: translate(-65%, -93%);
+          transform: translate(-45%, -93%);
         }
         .btn7 {
           transform: translate(-50%, 110%);