tremble 4 years ago
parent
commit
fad78bec28

+ 0 - 2
web/public/static/js/main_2020_show.js

@@ -4903,8 +4903,6 @@ window.Modernizr = function(n, e, t) {
                         g_tourAudio.src = ""
                         var musicInfo = this.model.heroLocations[this.destinationItem[0]].musicInfo
                         if(musicInfo && musicInfo.music){
-                            
-                            
                             if(e!='noMusic'){
                                 var o = musicInfo.music.includes(g_Prefix.slice(-10)) ? musicInfo.music :  g_Prefix + musicInfo.music;
                                 g_tourAudio.src = manage.dealURL(o);

+ 2 - 2
web/public/static/js/myShow.js

@@ -1,7 +1,7 @@
 var g_ProjectName=window.location.pathname.substring(window.location.pathname.indexOf("/")+1,window.location.pathname.lastIndexOf("/"));
-// var g_Prefix="http://192.168.1.101:8080/";
+var g_Prefix="http://8.135.106.227:8009/";
 // https://super.4dage.com/
-var g_Prefix=window.location.origin+'/';
+// var g_Prefix=window.location.origin+'/';
 
 var s = window.location.href.split('/');
 s.pop();

+ 2 - 2
web/src/pages/Home.vue

@@ -244,10 +244,10 @@ export default {
         isShow:false,
         isShowFile:false,
         isFade:true,
-        showWelcome:true,
+        showWelcome:false,
         showLoingVideo: false,
         fileCode:'',
-        loading:true
+        loading:false
       }
   }
 }

+ 5 - 4
web/src/views/gui/newguide.vue

@@ -13,7 +13,9 @@
           v-for="(item, i) in mapData"
           :key="i"
         >
-          <div :class="{'slActive':item.activemin<=guideActive&& item.activemax>=guideActive,hoverCls: item.toIdx===hoverIdx}">
+          <div :class="{'slActive':guideActive==item.toIdx,hoverCls: item.toIdx===hoverIdx}">
+          <!-- <div :class="{'slActive':item.activemin<=guideActive&& item.activemax>=guideActive,hoverCls: item.toIdx===hoverIdx}"> -->
+
             <img @click="gotoLight(item)" @mouseleave="hoverOutHandle(item,i)" @mouseenter="hoverHandle(item,i)" :src="(item.locations?item.locations[0].thumbnail_signed_src : item.thumbnail_signed_src)" :alt="item.name" />
             <span :title="item.name">{{item.name}}</span>
           </div>
@@ -146,7 +148,6 @@ export default {
     },
     hoverHandle(item,i){
       this.hoverIdx = item.toIdx;
-      console.log(item);
       player.model.emit('tourThumbImgHover',item.toIdx)
     },
     hoverOutHandle(item,i){ 
@@ -201,7 +202,7 @@ export default {
         }]
         this.guide.list.forEach((item,i)=>{
           let tmp = fixArr.find(sub=>sub.idx ==i)
-          if (tmp) {
+          if (true) {
             this.mapData.push({
               ...item,
               ...tmp,
@@ -209,11 +210,11 @@ export default {
             })
           }
         })
-        console.log(this.mapData);
          //监听导览状态
           window.player.on('onplayStatus', (data)=>{
             this.guideActive = data.destinationItem && data.destinationItem[0]
             this.swiper && this.swiper.slideTo(this.guideActive)
+
             //if (!data.tourIsPlaying) {
             //  this.guideActive=''
             //}