tremble 3 years ago
parent
commit
124887e280

+ 1 - 1
public/static/css/main.css

@@ -3898,7 +3898,7 @@ a.hasHover:hover, a:active {
     width: 100%;
     height: 200px;
     position: fixed;
-    bottom: -102%;
+    bottom: -102vh;
     left: 0;
     overflow: hidden;
     pointer-events: none;

File diff suppressed because it is too large
+ 0 - 1606
public/static/js/Hot - 副本.js


File diff suppressed because it is too large
+ 861 - 832
public/static/js/Hot.js


+ 2 - 1
public/static/js/manage.js

@@ -85,6 +85,7 @@ var settings = {
   /* flytimeDistanceMultiplier:150, 
     flyTime:750,  */
   tourRotTime: 2, //默认停留2秒
+  hotFastTran:true,
   dontExamHot:true,
   transparentBg: true,
   bgImg: './static/images/bg.jpg',
@@ -1497,7 +1498,7 @@ var SoundManager = {
 
   play: function(name, src, currentTime) {
     var object = this.list.find((e) => e.name == name);
-    if (object) {
+    if (object && this.currentAudio == object) {
       if (this.currentAudio) {
         this.pause(this.currentAudio.name, false, true);
       }

+ 10 - 10
src/data/booth.js

@@ -180,22 +180,16 @@ let Booth = [
         panoId: "56", //对应点位id
       },
       {
-        name: "阿里巴巴",
-        id: "two_5", //標識符
-        firstView: "&firstView=pano:55,qua:0.000005299056315894425,0.9999920129457036,-0.0037380036034126993,0.0014176054111985092", //初始視角
-        panoId: "55", //对应点位id
-      },
-      {
         name: "腾讯",
         id: "two_6", //標識符
         firstView: "&firstView=pano:54,qua:-0.008873964832209471,-0.7084323396930969,-0.008908743686554824,0.7056667118810684", //初始視角
         panoId: "54", //对应点位id
       },
       {
-        name: "抖音",
-        id: "two_7", //標識符
-        firstView: "&firstView=pano:53,qua:-0.014404299027762694,0.7011861590425292,0.01417175579765879,0.712691831959207", //初始視角
-        panoId: "53", //对应点位id
+        name: "阿里巴巴",
+        id: "two_5", //標識符
+        firstView: "&firstView=pano:55,qua:0.000005299056315894425,0.9999920129457036,-0.0037380036034126993,0.0014176054111985092", //初始視角
+        panoId: "55", //对应点位id
       },
       {
         name: "360集团",
@@ -204,6 +198,12 @@ let Booth = [
         panoId: "52", //对应点位id
       },
       {
+        name: "抖音",
+        id: "two_7", //標識符
+        firstView: "&firstView=pano:53,qua:-0.014404299027762694,0.7011861590425292,0.01417175579765879,0.712691831959207", //初始視角
+        panoId: "53", //对应点位id
+      },
+      {
         name: "蚂蚁集团",
         id: "two_9", //標識符
         firstView: "&firstView=pano:51,qua:0.005074596891426324,0.892212106128233,-0.010028461171687,0.4514767281237285", //初始視角

+ 15 - 2
src/pages/mobilescene/index.vue

@@ -31,13 +31,14 @@
         <rmenu :currentPanoid="currentPanoid" :isShowfunc="isShowfunc" :menuType="menuType" :tourStatus="tourStatus" @opencp="handlecp" />
         <vmenu :tourStatus="tourStatus" @play="startTour" /> -->
         <vsearch :currentPanoid="currentPanoid" @closeSearch="closeSearch" v-if="showSearch" />
-        <roundMenu v-show="!isClear" @showSearch="showSearch = true" @play="startTour" />
 
         <div v-if="isClear" @click.stop="clicktoClear" class="isClear">
           <img :src="require('@/assets/images/proj2022/icon/clear_active@2x.png')" alt="" />
           <span>恢复</span>
         </div>
       </div>
+      <roundMenu :class="!showViewMode && !tourStatus && !isClear ? 'ronundShow' : 'ronundHide'" @showSearch="showSearch = true" @play="startTour" />
+
     </div>
 
     <birdview :hideClose="true" @close="(mode = ''), (showViewMode = false)" v-if="mode == 'birdview'" />
@@ -375,7 +376,7 @@ export default {
       flex-direction: column;
       justify-content: center;
       text-align: center;
-      >img{
+      > img {
         width: 50px;
         height: 50px;
       }
@@ -444,4 +445,16 @@ export default {
     }
   }
 }
+
+.ronundShow {
+  opacity: 1;
+  pointer-events: auto;
+  transition: ease all 0.5s;
+}
+
+.ronundHide {
+  transition: ease all 0.5s;
+  opacity: 0;
+  pointer-events: none;
+}
 </style>

+ 1 - 1
src/pages/scene/components/content.vue

@@ -168,7 +168,7 @@ export default {
       }
     }
     .cbody {
-      width: 80%;
+      width: 90%;
       margin: 0 auto;
       padding: 20px 30px;
       .ctitle {

+ 12 - 2
src/pages/scene/index.vue

@@ -15,8 +15,7 @@
         </div>
 
       </div>
-      <roundMenu v-show="!tourStatus && !isClear"/>
-
+      <roundMenu :class="!tourStatus && !isClear?'ronundShow':'ronundHide'" />
 
       <scene v-if="showScene" />
     </div>
@@ -379,5 +378,16 @@ export default {
   }
 }
 
+.ronundShow{
+  opacity: 1;
+  pointer-events: auto;
+  transition: ease all .5s;
+}
+
+.ronundHide{
+  transition: ease all .5s;
+  opacity: 0;
+  pointer-events: none;
+}
 
 </style>

+ 1 - 1
src/pages/scenePage/index.vue

@@ -329,7 +329,7 @@ export default {
 
 @media screen and (max-width: 1000px) {
   .hiddenzhangxiang {
-    bottom: -140px !important;
+    bottom: -120px !important;
   }
 }
 </style>