Merge branch 'master-v32-xwx' into 'master'

杭州-大屏-业务轮播



See merge request !188

@@ -53,7 +53,7 @@ export default {
             }
             }
             proxy.timer=setInterval(function (){
             proxy.timer=setInterval(function (){
                 proxy.preOrNext(0);
                 proxy.preOrNext(0);
-            },10000)
+            },20000)
         }
         }
         const preOrNext=(val)=>{
         const preOrNext=(val)=>{
             console.log("click",val)
             console.log("click",val)
@@ -66,6 +66,7 @@ export default {
                 if(index+1==listArray.length){
                 if(index+1==listArray.length){
                     proxy.checkId=listArray[0]
                     proxy.checkId=listArray[0]
                     if(val==0){
                     if(val==0){
+
                         proxy.preNext()
                         proxy.preNext()
 
 
                     }else{
                     }else{
@@ -77,7 +78,7 @@ export default {
                         }else{
                         }else{
 
 
                             // proxy.checkId=listArray[index+1]
                             // proxy.checkId=listArray[index+1]
-                            proxy.preNext()
+                            proxy.clickNext()
                         }
                         }
                     }
                     }
 
 
@@ -86,25 +87,23 @@ export default {
                     if(val=='left'){
                     if(val=='left'){
                         if(index==0){
                         if(index==0){
                             proxy.checkId=listArray[listArray.length-1]
                             proxy.checkId=listArray[listArray.length-1]
-                            proxy.clickNext()
+                            proxy.preNext()
                         }else{
                         }else{
                             proxy.checkId=listArray[index-1]
                             proxy.checkId=listArray[index-1]
                             if(index%5==0){
                             if(index%5==0){
                                 proxy.preNext()
                                 proxy.preNext()
                             }
                             }
+
                         }
                         }
                     }else{
                     }else{
                         if(index>=4){
                         if(index>=4){
+                            if ((index+1)%5==0){
                                 proxy.clickNext()
                                 proxy.clickNext()
+                            }
 
 
                         }
                         }
                         proxy.checkId=listArray[index+1]
                         proxy.checkId=listArray[index+1]
-
                     }
                     }
-
-
-
-
                 }
                 }
 
 
                 proxy.clickTabs(proxy.checkId)
                 proxy.clickTabs(proxy.checkId)
@@ -142,14 +141,24 @@ export default {
             proxy.prePage();
             proxy.prePage();
         }
         }
         const nextPage= ()=>{
         const nextPage= ()=>{
-            if (proxy.currentPage == proxy.pageNum - 1) return;
+            if (proxy.currentPage == proxy.pageNum ){
+                return;
+            }else if (proxy.currentPage == 2){
+                proxy.currentPage=0;
+            }else{
                 proxy.currentPage++;
                 proxy.currentPage++;
+            }
+
 
 
         }
         }
         const prePage=()=>{
         const prePage=()=>{
-            if (proxy.currentPage == 0) return;
+            if(proxy.currentPage==0){
+                proxy.currentPage=2;
+            }else {
                 proxy.currentPage--;
                 proxy.currentPage--;
             }
             }
+
+        }
         const clickTabs=(val)=>{
         const clickTabs=(val)=>{
             proxy.checkId=val;
             proxy.checkId=val;
             busId.value=val
             busId.value=val
@@ -170,7 +179,7 @@ export default {
         dataShow: function(){
         dataShow: function(){
             let start = this.currentPage*this.pageSize;
             let start = this.currentPage*this.pageSize;
             let end = Math.min((this.currentPage+1)*this.pageSize, this.listArray.length)
             let end = Math.min((this.currentPage+1)*this.pageSize, this.listArray.length)
-            return this.listArray.slice(start, end)
+            return this.listArray.slice(start, end);
         },
         },
         isDiv:function (){
         isDiv:function (){
             let length=this.dataShow.length;
             let length=this.dataShow.length;