Merge branch 'pc-master' of https://git.lihe-control.com/xiaomeng/wszhyWx into pc-master

pull/50/head
孙萌 2023-11-21 16:51:51 +08:00
commit ca3731837d
1 changed files with 5 additions and 5 deletions

View File

@ -220,7 +220,7 @@ export default {
left_: 2, left_: 2,
popContentList: [], popContentList: [],
popContentCurrent: 0, popContentCurrent: 1,
// //
autoPlay: false, //false true autoPlay: false, //false true
@ -666,8 +666,8 @@ export default {
localStorage.setItem("autoPlay", JSON.stringify(this.autoPlay)); localStorage.setItem("autoPlay", JSON.stringify(this.autoPlay));
this.timer2 = setInterval(() => { this.timer2 = setInterval(() => {
this.popContentCurrent++; this.popContentCurrent++;
if (this.popContentCurrent > 7) { if (this.popContentCurrent > 6) {
this.popContentCurrent = 0; this.popContentCurrent = 1;
// this.$router.push({ path: "/largeScreen" }); // this.$router.push({ path: "/largeScreen" });
} }
}, 3000); }, 3000);
@ -711,8 +711,8 @@ export default {
this.timer2 = setInterval(() => { this.timer2 = setInterval(() => {
this.popContentCurrent++; this.popContentCurrent++;
console.log('this.popContentCurrent', this.popContentCurrent); console.log('this.popContentCurrent', this.popContentCurrent);
if (this.popContentCurrent > 7) { if (this.popContentCurrent > 6) {
this.popContentCurrent = 0; this.popContentCurrent = 1;
// this.$router.push({ path: "/largeScreen" }); // this.$router.push({ path: "/largeScreen" });
} }
}, 3000); }, 3000);