lanxin 2 dienas atpakaļ
vecāks
revīzija
baff6bbba3

+ 5 - 1
Hot/src/assets/base.css

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

+ 3 - 2
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>
@@ -386,6 +386,7 @@ export default {
             & > img {
               width: 100%;
               height: 100%;
+              pointer-events: none;
               object-fit: contain;
             }
           }

BIN
Scene/public/images/marker.png


BIN
Scene/public/images/marker1.png


BIN
Scene/public/images/reticule.png


BIN
Scene/public/images/reticule1.png


+ 20 - 0
Scene/src/pages/A1home/index.tsx

@@ -14,6 +14,26 @@ function A1home() {
       document.head.appendChild(script)
       script.onload = () => {
         setLodingJs(lodingJs + 1)
+        if (lodingJs === scriptArr.length - 1) {
+          const checkAndToggleVolume = () => {
+            const dom = document.querySelector('#volume a') as HTMLAnchorElement | null
+            if (dom) {
+              const img = dom.querySelector('img') as HTMLImageElement | null
+              if (img && img.src.includes('btn_on')) {
+                console.log('检测到静音状态,自动点击开启')
+                dom.click()
+              }
+            } else {
+              // 没找到就继续等
+              setTimeout(checkAndToggleVolume, 1000)
+            }
+          }
+
+          // 初始检查 + 每秒检查一次(最多等 30 秒)
+          checkAndToggleVolume()
+          const timer = setInterval(checkAndToggleVolume, 1000)
+          setTimeout(() => clearInterval(timer), 30000)
+        }
       }
     }
   }, [lodingJs])

+ 4 - 2
Scene/src/pages/A2main/index.module.scss

@@ -76,11 +76,13 @@
           height: 45px;
         }
       }
-
+      #gui-modes-inside {
+        margin-left: 18px;
+      }
       //针对第一个按钮
       #play,
       #pause {
-        margin-left: 18px;
+        margin-left: 50px;
       }
     }
 

+ 8 - 7
Scene/src/pages/A2main/index.tsx

@@ -134,6 +134,11 @@ function A2main() {
 
         <div className='pinBottom left'>
           <div id='gui-modes-map' className='ui-icon double active'>
+            <div data-original-title='全景漫游' id='gui-modes-inside' rel='tooltip'>
+              <img className='icon icon-inside' src={`images/inside${state3d === 'panorama' ? '_active' : ''}.png`} alt='' />
+              {/* 鼠标移入 */}
+              <div className='hoveImg'>全景漫游</div>
+            </div>
             <div id='play' className='ui-icon' rel='tooltip' data-original-title='播放'>
               {/* eslint-disable-next-line jsx-a11y/anchor-is-valid */}
               <a style={{ width: '100%', height: '100%' }}>
@@ -183,11 +188,7 @@ function A2main() {
               <div className='hoveImg'>热点列表</div>
             </div>
 
-            <div data-original-title='全景漫游' id='gui-modes-inside' rel='tooltip'>
-              <img className='icon icon-inside' src={`images/inside${state3d === 'panorama' ? '_active' : ''}.png`} alt='' />
-              {/* 鼠标移入 */}
-              <div className='hoveImg'>全景漫游</div>
-            </div>
+
             <div data-original-title='迷你模型' id='gui-modes-dollhouse' rel='tooltip'>
               <img className='icon icon-inside' src={`images/dollhouse${state3d === 'dollhouse' ? '_active' : ''}.png`} alt='' />
               {/* 鼠标移入 */}
@@ -263,10 +264,10 @@ function A2main() {
               <div className='hoveImg'>分享</div>
             </div>
 
-            <div className='A2_view_box'>
+            {/* <div className='A2_view_box'>
               <img src={require('@/assets/img/view.png')} alt='' />
               <div className='hoveImg'>浏览量{viewNum}</div>
-            </div>
+            </div> */}
 
             <div id='vr' className='ui-icon wide hidden' style={{ display: 'none' }}>
               {/* eslint-disable-next-line jsx-a11y/anchor-is-valid */}