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

SuperTwo762/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.0.44:8110/";
+var g_Prefix="http://192.168.0.44:8110/";
 // var g_Prefix=window.location.href.substring(0,window.location.href.indexOf("/index.html")+1);
-var g_Prefix=window.location.origin+'/';
+// var g_Prefix=window.location.origin+'/';
 
 var s = window.location.href.split('/');
 s.pop();

SuperTwo791/js/myShow.js

@@ -1,8 +1,8 @@
 var g_ProjectName=window.location.pathname.substring(window.location.pathname.indexOf("/")+1,window.location.pathname.lastIndexOf("/"));
-// var g_Prefix="http://192.168.0.44:8110/";
+var g_Prefix="http://192.168.0.44:8110/";
 // var g_Prefix="https://super.4dage.com/";
 // var g_Prefix=window.location.href.substring(0,window.location.href.indexOf("/index.html")+1);
-var g_Prefix=window.location.origin+'/';
+// var g_Prefix=window.location.origin+'/';
 
 var s = window.location.href.split('/');
 s.pop();

code/src/pages/index/index.vue

@@ -33,7 +33,7 @@ import bg from '@/components/background'
 
 
 // http://192.168.0.44:8110/
-let temp = ''
+let temp = 'http://192.168.0.44:8110/'
 const outKey = "791"
 const inKey = "762"
 

hotspot/src/views/Home.vue

@@ -19,7 +19,7 @@
                     <h3 id="shoujititle"  v-html="data.title"></h3>
 
       <div
-        v-if="!isMobile && videoLength"
+        v-if="!isMobile && data[active].length > 1"
         @click="slideto('slidePrev')"
         class="swiper-button-prev"
       >
@@ -58,7 +58,7 @@
         <div class="swiper-pagination" slot="pagination"></div>
       </swiper>
       <div
-        v-if="!isMobile &&videoLength"
+        v-if="!isMobile && data[active].length > 1"
         @click="slideto('slideNext')"
         class="swiper-button-next"
       >
@@ -106,8 +106,9 @@ export default {
   name: "Home",
   data() {
     return {
+      //右侧按钮节流
+      myTimer:null,
       myFim:[],
-      videoLength:true,
       loadAuto: false,
       audio: "",
       m: this.$route.query.m,
@@ -199,7 +200,7 @@ export default {
     },
     async getData() {
       // http://192.168.0.44:8110
-      let url = `/data/${
+      let url = `http://192.168.0.44:8110/data/${
         this.id
       }/hot/js/data.js?time=${Math.random()}`;
       let result = (await this.$http.get(url)).data;
@@ -207,10 +208,12 @@ export default {
 
 
     //进页面只让iframe加载2个
-      // console.log(9999999,this.data.model);
+      console.log(9999999,this.data.model.length);
       if(this.data.model){
-        this.myFim[0]=this.data.model[0]
-        this.myFim[1]=this.data.model[1]
+        for(let i =0;i<this.data.model.length;i++){
+          if(i==0||i==1) this.myFim[i]=this.data.model[i]
+          else this.myFim[i]=''
+        }
       }
       // this.myFim=this.data.model
 
@@ -241,33 +244,40 @@ export default {
       return 'http://192.168.0.44:8110'+item;
     },
     slideto(action) {
-      this.swiper[action]();
+      
+      if(this.myTimer!==null) return
+        this.myTimer=setTimeout(() => {
+          this.swiper[action]();
+          
+          //点击的时候才加载，防止一次运行过多iframe标签导致页面崩溃
+            let myFim =document.querySelectorAll('.swiper-wrapper .swiper-slide')
+            let myFimCente =document.querySelector('.swiper-wrapper .swiper-slide-next iframe')
+          myFim.forEach((v,i)=>{
+            //拿到右侧屏幕的iframe
+            if(v.className.includes('swiper-slide-next') && i>1) {
+              if(myFimCente.src===''){
+                myFimCente.src =this.fixUrl(this.data.model[i])
+              }
+              }
+          })
+
+
+
+            this.myTimer=null
+        }, 500);
 
       
-      //点击的时候才加载，防止一次运行过多iframe标签导致页面崩溃
-      let myFim =document.querySelectorAll('.swiper-wrapper .swiper-slide')
-      let myFimCente =document.querySelectorAll('.swiper-wrapper .swiper-slide-next iframe')
-      myFim.forEach((v,i)=>{
-        //拿到当前在屏幕中间的iframe
-        if(v.className.includes('swiper-slide-next') && i>1) {
-          // console.log(myFimCente[0].src);
-          if(myFimCente[0].src.includes('undefined')){
-            myFimCente[0].src =this.fixUrl(this.data.model[i])
-          }
-          }
-      })
     },
   },
   mounted() {
-    // 进页面获取视频个数
-    setTimeout(() => {
-      let videos =document.querySelectorAll('.slide video')
-      let Imgs =document.querySelectorAll('.slide img')
-      let iframes = document.querySelectorAll('.slide iframe')
-      // console.log(11111,iframes);
-      if(videos.length===1 || Imgs.length===1 ||iframes.length===1) this.videoLength = false
+    // // 进页面获取视频个数
+    // setTimeout(() => {
+    //   let videos =document.querySelectorAll('.slide video')
+    //   let Imgs =document.querySelectorAll('.slide img')
+    //   let iframes = document.querySelectorAll('.slide iframe')
+    //   if(videos.length===1 || Imgs.length===1 ||iframes.length===1) this.videoLength = false
       
-    }, 100);
+    // }, 100);
     this.getData();
     document.addEventListener(
       "WeixinJSBridgeReady",