样式修改

Hot/src/assets/base.css

@@ -25,6 +25,11 @@ body {
 .viewer-close {
   display: none !important;
 }
+.viewer-canvas {
+  & > img {
+    pointer-events: none;
+  }
+}
 
 @media screen and (max-width: 800px) {
   .viewer-footer {

Hot/src/views/Home.vue

@@ -29,8 +29,8 @@
               </div>
               <!-- 图片页面 -->
               <div class="imgBox" v-else-if="myType === 'img'">
-                <div class="smImgBox">
-                  <img v-lazy="urlToFitFu(item)" alt="" @click="lookImg(urlToFitFu(item))" />
+                <div class="smImgBox" @click="lookImg(urlToFitFu(item))">
+                  <img v-lazy="urlToFitFu(item)" alt="" />
                 </div>
               </div>
             </div>
@@ -61,6 +61,7 @@
       </div>
     </div>
     <!-- 查看图片 -->
+
     <viewer class="viewerCla" ref="viewer" :images="lookPics">
       <img :src="lookPics[0]" alt="" />
     </viewer>
@@ -383,6 +384,7 @@ export default {
             & > img {
               width: 100%;
               height: 100%;
+              pointer-events: none;
               object-fit: contain;
             }
           }
@@ -522,6 +524,7 @@ export default {
       .myTitle {
         font-size: 16px;
         margin: 8px 0;
+        padding: 0;
       }
       .mainCon {
         border-radius: 0;
@@ -569,7 +572,7 @@ export default {
           margin-top: -5px;
           width: 100%;
           padding: 10px 15px 0px 15px;
-          max-height: 200px;
+          max-height: 48%;
 
           .flooTxtBox {
             padding: 0;

Scene/public/js/Hot.js

@@ -56,7 +56,7 @@ window.initHot = function (model) {
     ;-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/shandongMuseum/shyg/hot')
-    // return src.replace('https://www.4dmodel.com/SuperTwo/hot_online1', 'http://localhost:8080')
+    // return src.replace('https://www.4dmodel.com/SuperTwo/hot_online1', 'http://192.168.0.78:8080')
     // return src
   }
   var removeSrcPostMark = function (url) {
@@ -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
           }
@@ -920,21 +920,24 @@ window.initHot = function (model) {
       }
       const minPlayedTime = Math.min(video.duration / 10, 0.1) //到这个时间说明加载成功
       if (!video.hasInitedOpacity) {
-        setTimeout(e => {
-          //console.log('trychangeOpa ',this.sid,video.currentTime)
-          if (video.currentTime > minPlayedTime) {
-            this.material_.opacity = 1
-            video.hasInitedOpacity = true
-            //console.log('changeOpaWhenPlay',this.sid)
-          } else {
-            if (!video.paused) {
-              //再次尝试
-              return setTimeout(() => {
-                this.changeOpaWhenPlay(video)
-              }, 500)
+        setTimeout(
+          e => {
+            //console.log('trychangeOpa ',this.sid,video.currentTime)
+            if (video.currentTime > minPlayedTime) {
+              this.material_.opacity = 1
+              video.hasInitedOpacity = true
+              //console.log('changeOpaWhenPlay',this.sid)
+            } else {
+              if (!video.paused) {
+                //再次尝试
+                return setTimeout(() => {
+                  this.changeOpaWhenPlay(video)
+                }, 500)
+              }
             }
-          }
-        }, minPlayedTime * 1000 + 500)
+          },
+          minPlayedTime * 1000 + 500
+        )
       }
     }
 
@@ -1135,29 +1138,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 () {
+          ;((window.loaddingSuccess = function () {
             s = !0
           }),
             setTimeout(function e() {
               if (s) {
                 var t = document.querySelector('#id1').contentWindow.document
-                t.querySelector('video') &&
+                ;(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()
+                  t.querySelector('audio') && t.querySelector('audio').play())
               } else setTimeout(e, 300)
-            }, 800)
+            }, 800))
         }
       }
 
@@ -1203,7 +1206,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)
       }
     }
@@ -1542,7 +1545,8 @@ window.initHot = function (model) {
     originModelCount = hotGroup.children.filter(e => !!e.info.objSrc).length
     if (originPhotoCount == 0) Hot.allPhotoLoaded = true
     if (originModelCount == 0) Hot.allModelLoaded = true
-    if (Hot.allModelLoaded && Hot.allPhotoLoaded) Hot.whenAllFileLoaded && Hot.whenAllFileLoaded() //所有加载完毕
+    if (Hot.allModelLoaded && Hot.allPhotoLoaded)
+      Hot.whenAllFileLoaded && Hot.whenAllFileLoaded() //所有加载完毕
     else {
       Hot.load()
     }

Scene/src/pages/A2main/index.module.scss

@@ -179,7 +179,7 @@
     #thumb-container {
       width: 100% !important;
       display: flex;
-      justify-content: flex-start;
+      justify-content: center;
       align-items: center;
       gap: 10px;
       .thumbImg {

Scene/src/pages/A2main/index.tsx

@@ -113,7 +113,7 @@ function A2main() {
                 <img src='images/play.png' alt='' />
               </a>
               {/* 鼠标移入 */}
-              <div className='hoveImg'>开始漫游</div>
+              <div className='hoveImg'>自动漫游</div>
             </div>
             <div id='pause' className='ui-icon' rel='tooltip' style={{ display: 'none' }}>
               {/* eslint-disable-next-line jsx-a11y/anchor-is-valid */}

Scene/src/pages/A3hotList/index.module.scss

@@ -42,6 +42,7 @@
         justify-content: center;
         width: 100%;
         height: fit-content;
+        text-align: center;
         padding: 4px 3px;
         cursor: pointer;
         &:hover {

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

@@ -9,6 +9,7 @@
   transition: all 0.5s;
   background: url('./image/bg.png') repeat center center;
   background-size: 100% 100%;
+  pointer-events: none;
   > div {
     position: absolute;
     top: 50%;
@@ -53,9 +54,9 @@
     }
 
     .A4base-pic1 {
-      transform: translate(-178%, 43%);
+      transform: translate(-191%, 24%);
       width: 530px;
-      height: 304px;
+      height: 359px;
     }
     .A4base-pic2 {
       transform: translate(48%, -321%);
@@ -63,6 +64,7 @@
       height: 140px;
     }
     .A4base-time {
+      display: none;
       transform: translate(207%, 115%);
       width: 322px;
       height: 206px;
@@ -72,6 +74,7 @@
       width: 184px;
       height: 61px;
       cursor: pointer;
+      pointer-events: auto;
     }
   }
 }

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

@@ -9,6 +9,7 @@
   transition: all 0.5s;
   background: url('./image/bg.png') no-repeat center center;
   background-size: 100% 100%;
+  pointer-events: none;
   > div {
     position: absolute;
     top: 50%;
@@ -35,8 +36,9 @@
       width: 85%;
     }
     .button {
+      pointer-events: auto;
       cursor: pointer;
-      transform: translate(-50%, 180px);
+      transform: translate(-50%, 210px);
       width: 150px;
     }
   }