|
@@ -790,6 +790,7 @@ export default {
|
|
|
menuAllList: [],
|
|
menuAllList: [],
|
|
|
popupPhotoShow: false,
|
|
popupPhotoShow: false,
|
|
|
curPlayIndex: 0, // 正在播放的节的下标
|
|
curPlayIndex: 0, // 正在播放的节的下标
|
|
|
|
|
+ changeCourseId: 0, // 切换课程的id
|
|
|
};
|
|
};
|
|
|
},
|
|
},
|
|
|
computed: {
|
|
computed: {
|
|
@@ -1020,6 +1021,7 @@ export default {
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
|
console.log('===,== this.goodsTeacher', this.goodsTeacher, 'this.courseId:', this.courseId);
|
|
console.log('===,== this.goodsTeacher', this.goodsTeacher, 'this.courseId:', this.courseId);
|
|
|
|
|
+ console.log('==11', this.goodsTeacher[1].courseList[0].courseId);
|
|
|
})
|
|
})
|
|
|
},
|
|
},
|
|
|
// 原来onshow里面的内容
|
|
// 原来onshow里面的内容
|
|
@@ -1075,7 +1077,8 @@ export default {
|
|
|
this.$store.commit("setPlayChannelId", { playChannelId: 0 });
|
|
this.$store.commit("setPlayChannelId", { playChannelId: 0 });
|
|
|
this.postStudyRecord(0, oldSectionId);
|
|
this.postStudyRecord(0, oldSectionId);
|
|
|
});
|
|
});
|
|
|
- uni.$on("getSection", (item) => {
|
|
|
|
|
|
|
+ uni.$on("getSection", (item, courseId) => {
|
|
|
|
|
+ console.log('item:', item, 'courseId:',courseId, 'this.courseId:', this.courseId);
|
|
|
//清除直播
|
|
//清除直播
|
|
|
this.studyTimer && clearInterval(this.studyTimer)
|
|
this.studyTimer && clearInterval(this.studyTimer)
|
|
|
this.hasStart = false;
|
|
this.hasStart = false;
|
|
@@ -1085,6 +1088,11 @@ export default {
|
|
|
this.sectionItem = item;
|
|
this.sectionItem = item;
|
|
|
this.moduleId = item.moduleId || null
|
|
this.moduleId = item.moduleId || null
|
|
|
this.chapterId = item.chapterId || null
|
|
this.chapterId = item.chapterId || null
|
|
|
|
|
+ this.changeCourseId = courseId
|
|
|
|
|
+ if (courseId != this.courseId) {
|
|
|
|
|
+ this.courseId = courseId
|
|
|
|
|
+ this.studyRecordMenuAllList()
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
this.$store.commit("setPlayChannelId", { playChannelId: 0 });
|
|
this.$store.commit("setPlayChannelId", { playChannelId: 0 });
|
|
|
this.$store.commit("setPlaySectionId", { playSectionId: item.sectionId || item.menuId });
|
|
this.$store.commit("setPlaySectionId", { playSectionId: item.sectionId || item.menuId });
|
|
@@ -1646,7 +1654,7 @@ export default {
|
|
|
},
|
|
},
|
|
|
studyRecordMenuAllList() {
|
|
studyRecordMenuAllList() {
|
|
|
// study/record/menuAllList
|
|
// study/record/menuAllList
|
|
|
- this.$api.studyRecordMenuAllList({
|
|
|
|
|
|
|
+ return this.$api.studyRecordMenuAllList({
|
|
|
courseId:this.courseId,
|
|
courseId:this.courseId,
|
|
|
gradeId:this.gradeId,
|
|
gradeId:this.gradeId,
|
|
|
goodsId:this.goodsId
|
|
goodsId:this.goodsId
|
|
@@ -1654,7 +1662,9 @@ export default {
|
|
|
let nowTime = Number(new Date().getTime()/1000).toFixed(0)
|
|
let nowTime = Number(new Date().getTime()/1000).toFixed(0)
|
|
|
if (res.data.data) {
|
|
if (res.data.data) {
|
|
|
this.menuAllList = res.data.data
|
|
this.menuAllList = res.data.data
|
|
|
- this.livingItem = res.data.data.find(item => item.liveStartTime<=nowTime&&item.liveEndTime>nowTime);
|
|
|
|
|
|
|
+ console.log('请求后的this.menuAllList', this.menuAllList);
|
|
|
|
|
+ this.livingItem = res.data.data.find(item => item.liveStartTime<=nowTime&&item.liveEndTime>nowTime);
|
|
|
|
|
+ return Promise.resolve(this.menuAllList)
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
|
},
|
|
},
|
|
@@ -2726,9 +2736,11 @@ export default {
|
|
|
if (!nextCourse) {
|
|
if (!nextCourse) {
|
|
|
this.allLearnShow()
|
|
this.allLearnShow()
|
|
|
} else {
|
|
} else {
|
|
|
|
|
+ console.log(']]]]]]');
|
|
|
this.courseId = this.goodsTeacher[nextCourse].courseList[0].courseId
|
|
this.courseId = this.goodsTeacher[nextCourse].courseList[0].courseId
|
|
|
|
|
+ console.log('---学完this.courseId:', this.courseId);
|
|
|
await this.studyRecordMenuAllList()
|
|
await this.studyRecordMenuAllList()
|
|
|
- console.log('---- this.menuAllList:', this.menuAllList)
|
|
|
|
|
|
|
+ console.log('---- this.menuAllList:', this.menuAllList,)
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
|
//第二个弹窗
|
|
//第二个弹窗
|