|
@@ -1697,11 +1697,10 @@ export default {
|
|
let { data } = res.data;
|
|
let { data } = res.data;
|
|
if (!data.sectionId) {
|
|
if (!data.sectionId) {
|
|
data = this.menuAllList[0];
|
|
data = this.menuAllList[0];
|
|
- } else {
|
|
|
|
- if (data.learning == 1 && this.orderNum == 2) {
|
|
|
|
- let next = this.menuAllList.find((e) => e.studyStatus != 1);
|
|
|
|
- next && (data = next);
|
|
|
|
- }
|
|
|
|
|
|
+ }
|
|
|
|
+ if (data.learning == 1 && this.orderNum == 2) {
|
|
|
|
+ let next = this.menuAllList.find((e) => e.studyStatus != 1);
|
|
|
|
+ next && (data = next);
|
|
}
|
|
}
|
|
this.initPlayVideo(data);
|
|
this.initPlayVideo(data);
|
|
});
|
|
});
|
|
@@ -2403,7 +2402,7 @@ export default {
|
|
},
|
|
},
|
|
// 随机前后五分钟
|
|
// 随机前后五分钟
|
|
commonConfig(totalVideoTime, fixS) {
|
|
commonConfig(totalVideoTime, fixS) {
|
|
- console.log("🚀 ~ file: detail.vue:2407 ~ commonConfig ~ fixS:", fixS)
|
|
|
|
|
|
+ console.log("🚀 ~ file: detail.vue:2407 ~ commonConfig ~ fixS:", fixS);
|
|
let photoList = [0];
|
|
let photoList = [0];
|
|
// 固定间隔时间取
|
|
// 固定间隔时间取
|
|
if (fixS) {
|
|
if (fixS) {
|
|
@@ -3186,7 +3185,10 @@ export default {
|
|
}
|
|
}
|
|
//开始播放
|
|
//开始播放
|
|
this.timer && clearInterval(this.timer);
|
|
this.timer && clearInterval(this.timer);
|
|
- if (this.playSecIsLearn && (this.erJianErZao|| this.jjShiGongYuan || this.photoNum > 0)) {
|
|
|
|
|
|
+ if (
|
|
|
|
+ this.playSecIsLearn &&
|
|
|
|
+ (this.erJianErZao || this.jjShiGongYuan || this.photoNum > 0)
|
|
|
|
+ ) {
|
|
this.clearPauseTimer();
|
|
this.clearPauseTimer();
|
|
this.isReach = false;
|
|
this.isReach = false;
|
|
this.timer = setInterval(this.timeEvent, 1000); //定时器
|
|
this.timer = setInterval(this.timeEvent, 1000); //定时器
|
|
@@ -3938,8 +3940,11 @@ export default {
|
|
}
|
|
}
|
|
//开始播放
|
|
//开始播放
|
|
this.timer && clearInterval(this.timer);
|
|
this.timer && clearInterval(this.timer);
|
|
- if (this.playSecIsLearn && (this.erJianErZao|| this.jjShiGongYuan || this.photoNum > 0)) {
|
|
|
|
- this.clearPauseTimer();
|
|
|
|
|
|
+ if (
|
|
|
|
+ this.playSecIsLearn &&
|
|
|
|
+ (this.erJianErZao || this.jjShiGongYuan || this.photoNum > 0)
|
|
|
|
+ ) {
|
|
|
|
+ this.clearPauseTimer();
|
|
this.isReach = false;
|
|
this.isReach = false;
|
|
this.timer = setInterval(this.timeEvent, 1000); //定时器
|
|
this.timer = setInterval(this.timeEvent, 1000); //定时器
|
|
}
|
|
}
|