pc-master #250

Merged
xiaomeng merged 13 commits from pc-master into portal 2025-06-11 01:58:21 +00:00
Showing only changes of commit f605de093f - Show all commits

View File

@ -1268,12 +1268,12 @@ export default {
let that = this;
this.autoPlay = true;
localStorage.setItem("autoPlay", JSON.stringify(this.autoPlay));
var num=this.listNumber.find(item => item.id == that.limitUserId)
var num=this.listNumber.find(item => item.id == that.limitUserId).num
clearInterval(this.timer2) && this.timer2;
var maxNum=num?num:0
this.timer2 = setInterval(() => {
that.popContentCurrent++;
if (that.popContentCurrent >= maxNum) {
if (that.popContentCurrent > maxNum) {
that.popContentCurrent = 1;
}
}, 3000);
@ -1329,13 +1329,14 @@ export default {
if (this.autoPlay) {
clearInterval(this.timer2) && this.timer2;
console.log(this.limitUserId);
var num=this.listNumber.find(item => item.id == that.limitUserId)
var num=this.listNumber.find(item => item.id == that.limitUserId).num
var maxNum=num?num:0
this.timer2 = setInterval(() => {
that.popContentCurrent++;
if (that.popContentCurrent >= maxNum) {
if (that.popContentCurrent > maxNum) {
that.popContentCurrent = 1;
}
console.log( that.popContentCurrent);
}, 3000);
}