Merge branch 'master' of http://192.168.0.115:3000/chenzhiguang/zhengzhou_university

# Conflicts:
#	src/views/gui/newguide.vue

src/views/gui/newguide.vue

@@ -14,8 +14,9 @@
           :key="i"
           
         >
-          <div :class="{'slActive':false,hoverCls:hoverIdx===i}">
+          <div :class="{'slActive':guideActive === i,hoverCls:hoverIdx===i}">
             <img @click="gotoLight(item)" @mouseleave="hoverOutHandle(item,i)" @mouseenter="hoverHandle(item,i)" :src="item.thumbnail_signed_src" :alt="item.name" />
+ 
           </div>
         </swiper-slide>
       </swiper>
@@ -109,6 +110,7 @@ export default {
         list: [],
       },
       hoverIdx:'',
+      guideActive:'',
       swiperOptions: {
         slidesPerView: "auto",
         autoplay: false,
@@ -149,7 +151,16 @@ export default {
     this.$nextTick(() => {
       window.addEventListener("loadfinish", () => {
         this.guide = window.player.model.images;
-        console.log(window.player);
+
+        console.log(this.guide);
+
+         //监听导览状态
+          window.player.on('onplayStatus', (data)=>{
+            this.guideActive = data.destinationItem
+            //if (!data.tourIsPlaying) {
+            //  this.guideActive=''
+            //}
+          })
       });
     });
   },