|
@@ -66,6 +66,7 @@
|
|
|
<div slot="label">
|
|
|
<span class="label">{{ tab.label }}</span>
|
|
|
</div>
|
|
|
+ <!-- 章节目录 -->
|
|
|
<template v-if="tab.name == '1'">
|
|
|
<div class="right-box__body">
|
|
|
<div
|
|
@@ -636,6 +637,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</template>
|
|
|
+ <!-- 重修目录 -->
|
|
|
<template v-if="tab.name == '2'">
|
|
|
<div class="right-box__body">
|
|
|
<div
|
|
@@ -2704,7 +2706,7 @@ export default {
|
|
|
courseList: [],
|
|
|
businessData: {},
|
|
|
courseHandoutsData: "",
|
|
|
- menuList: [],
|
|
|
+ // menuList: [],
|
|
|
goodsData: {},
|
|
|
tabList: [],
|
|
|
historyChatMsgList: [],
|
|
@@ -2969,6 +2971,7 @@ export default {
|
|
|
apply_post_disabled: false,
|
|
|
disName: false, // 姓名是否禁止输入
|
|
|
disCard: false, // 身份证是否禁止输入
|
|
|
+ clickSectionItem: {}, // 点击节的内容
|
|
|
};
|
|
|
},
|
|
|
computed: {
|
|
@@ -3026,7 +3029,7 @@ export default {
|
|
|
this.orderGoodsId = this.$route.query.orderGoodsId;
|
|
|
this.gradeId = this.$route.query.gradeId;
|
|
|
this.sectionItem = this.$route.query;
|
|
|
-
|
|
|
+ console.log('this.sectionItem', this.sectionItem)
|
|
|
let isOther = this.$route.query.isOther || "";
|
|
|
|
|
|
if (isOther) {
|
|
@@ -3210,6 +3213,7 @@ export default {
|
|
|
this.playSectionId = res.data.sectionId;
|
|
|
this.vid = res.data.recordingUrl;
|
|
|
this.sectionItem = res.data;
|
|
|
+ console.log('================sectionItem', this.sectionItem)
|
|
|
this.playVideo(res.data);
|
|
|
} else if (res.data.sectionType == 2) {
|
|
|
//直播
|
|
@@ -4798,6 +4802,7 @@ export default {
|
|
|
* 切换科目
|
|
|
*/
|
|
|
courseChange() {
|
|
|
+ console.log('切换科目')
|
|
|
return new Promise((resolve) => {
|
|
|
this.needOpen = true;
|
|
|
this.noteParams = {
|
|
@@ -4985,6 +4990,7 @@ export default {
|
|
|
},
|
|
|
|
|
|
getBuySectionList(chapterId, courseId, moduleId = 0, chapter) {
|
|
|
+ // /course/sectionList 查询章与节关系列表+章卷同级展示
|
|
|
this.$request
|
|
|
.reSectionList({
|
|
|
chapterId: chapterId,
|
|
@@ -5101,7 +5107,8 @@ export default {
|
|
|
* 点击节
|
|
|
*/
|
|
|
async getResource(section) {
|
|
|
- console.log('点击姐姐京津冀', section)
|
|
|
+ console.log('点击节节节', section)
|
|
|
+ this.clickSectionItem = section
|
|
|
//逻辑
|
|
|
if (section.sectionType === 2 && section.liveStartTime && section.liveEndTime) {
|
|
|
if (section.liveStartTime > this.nowTime) {
|
|
@@ -5312,6 +5319,7 @@ export default {
|
|
|
this.chapterId == (section.chapterId || 0)
|
|
|
) {
|
|
|
//切换为同一频道不作为
|
|
|
+ console.log('切换为同一频道不作为')
|
|
|
this.clickLock = false;
|
|
|
return;
|
|
|
}
|
|
@@ -5530,7 +5538,31 @@ export default {
|
|
|
|
|
|
async playVideo(option) {
|
|
|
console.log('asdhsuohfosufgasoug', option)
|
|
|
- if (option.sectionType == 1 || option.sectionType == 3) {
|
|
|
+ if (option.sectionType == 3) {
|
|
|
+ console.log('huifang')
|
|
|
+ // 回放
|
|
|
+ if (Object.keys(this.clickSectionItem).length) { //this.clickSectionItem 判断点击节才跳转, 不判断的话一进来页面到这里就直接跳转了
|
|
|
+ this.$router.push({
|
|
|
+ path: "/living-room/" + option.liveUrl,
|
|
|
+ query: {
|
|
|
+ goodsId: this.goodsId,
|
|
|
+ courseId: this.courseId,
|
|
|
+ gradeId: this.gradeId,
|
|
|
+ orderGoodsId: this.orderGoodsId,
|
|
|
+ sectionId: option.sectionId || option.menuId,
|
|
|
+ chapterId: option.chapterId || 0,
|
|
|
+ moduleId: option.moduleId || 0,
|
|
|
+ sectionType: 3,
|
|
|
+ goodsName: option.name,
|
|
|
+ vid: option.recordingUrl, // 回放vid
|
|
|
+ }
|
|
|
+ })
|
|
|
+ this.clickSectionItem = {}
|
|
|
+ return
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (option.sectionType == 1) {
|
|
|
+ console.log('lubo点击点击点击点击')
|
|
|
//录播
|
|
|
|
|
|
//设置播放的节ID
|
|
@@ -5548,7 +5580,7 @@ export default {
|
|
|
//播放视频
|
|
|
this.showRecordStatus = false; //隐藏播放记录提示
|
|
|
this.sectionItem = option;
|
|
|
- console.log(option, "option");
|
|
|
+ console.log(option, "option=======>sectionItem");
|
|
|
this.isPlayRebuild = option.rebuild;
|
|
|
this.moduleId = option.moduleId || 0;
|
|
|
this.chapterId = option.chapterId || 0;
|
|
@@ -5692,6 +5724,7 @@ export default {
|
|
|
this.postStudyRecord(1);
|
|
|
});
|
|
|
},
|
|
|
+ // 播放视频
|
|
|
loadPlayer() {
|
|
|
var self = this;
|
|
|
const polyvPlayer = window.polyvPlayer;
|
|
@@ -6134,6 +6167,7 @@ export default {
|
|
|
if (status > 0) {
|
|
|
data.status = status;
|
|
|
}
|
|
|
+ // /study/record 学习记录
|
|
|
this.$request
|
|
|
.studyRecord(data)
|
|
|
.then((res) => {
|
|
@@ -6158,6 +6192,7 @@ export default {
|
|
|
* 获取重修列表中是否有相同对象
|
|
|
*/
|
|
|
getSameObj(metaObj) {
|
|
|
+ console.log('看完视频后----', metaObj, this.reMenuList)
|
|
|
let newObj = false;
|
|
|
if (this.reMenuList.length) {
|
|
|
console.log(this.reMenuList, "this.reMenuList");
|
|
@@ -6218,7 +6253,7 @@ export default {
|
|
|
* 刷新父级列表
|
|
|
*/
|
|
|
refreshParentList(sectionItem, rebuildObj) {
|
|
|
- console.log(sectionItem, "sectionItem");
|
|
|
+ console.log(sectionItem, "看完视频==========sectionItem", this.menuList);
|
|
|
console.log(rebuildObj, "rebuildObj");
|
|
|
let self = this;
|
|
|
if (sectionItem.menuId) {
|
|
@@ -6296,6 +6331,7 @@ export default {
|
|
|
let newArr = res.data.filter((item) => {
|
|
|
return item.type != 2;
|
|
|
});
|
|
|
+ if (sectionItem.parent) {
|
|
|
sectionItem.parent.canLearn = newArr.every((item) => {
|
|
|
if (item.learning == 1) {
|
|
|
return true;
|
|
@@ -6307,7 +6343,7 @@ export default {
|
|
|
section.isRebuild = 1;
|
|
|
section.parent = sectionItem.parent;
|
|
|
});
|
|
|
-
|
|
|
+ }
|
|
|
this.menuList.forEach((menu) => {
|
|
|
if (menu.menuId == sectionItem.chapterId) {
|
|
|
menu.list = res.data;
|
|
@@ -6328,6 +6364,7 @@ export default {
|
|
|
let newArr = res.data.filter((item) => {
|
|
|
return item.type != 2;
|
|
|
});
|
|
|
+ if (rebuildObj.parent) {
|
|
|
rebuildObj.parent.canLearn = newArr.every((item) => {
|
|
|
if (item.learning == 1) {
|
|
|
return true;
|
|
@@ -6339,7 +6376,7 @@ export default {
|
|
|
res.data.forEach((section) => {
|
|
|
section.parent = rebuildObj.parent;
|
|
|
});
|
|
|
-
|
|
|
+ }
|
|
|
this.reMenuList.forEach((menu) => {
|
|
|
if (menu.menuId == rebuildObj.chapterId) {
|
|
|
menu.list = res.data;
|
|
@@ -6394,6 +6431,7 @@ export default {
|
|
|
}
|
|
|
} else {
|
|
|
//第三层节有moduleid和chapterid都有
|
|
|
+ console.log('第三层第三层')
|
|
|
this.$request
|
|
|
.reSectionList({
|
|
|
chapterId: sectionItem.chapterId,
|
|
@@ -6405,6 +6443,7 @@ export default {
|
|
|
let newArr = res.data.filter((item) => {
|
|
|
return item.type != 2;
|
|
|
});
|
|
|
+ if (sectionItem.parent) {
|
|
|
sectionItem.parent.canLearn = newArr.every((item) => {
|
|
|
if (item.learning == 1) {
|
|
|
return true;
|
|
@@ -6416,7 +6455,7 @@ export default {
|
|
|
res.data.forEach((section) => {
|
|
|
section.parent = sectionItem.parent;
|
|
|
});
|
|
|
-
|
|
|
+ }
|
|
|
this.menuList.forEach((menu) => {
|
|
|
if (menu.list && menu.list.length) {
|
|
|
menu.list.forEach((chapter) => {
|
|
@@ -6424,13 +6463,16 @@ export default {
|
|
|
chapter.moduleId == sectionItem.moduleId &&
|
|
|
chapter.chapterId == sectionItem.chapterId
|
|
|
) {
|
|
|
+ chapter.learning = res.data[0].learning
|
|
|
console.log(res.data, "res.data");
|
|
|
- console.log(chapter.list, "chapter.list");
|
|
|
chapter.list = res.data;
|
|
|
+ console.log(chapter.list, "chapter.list");
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
});
|
|
|
+
|
|
|
+
|
|
|
});
|
|
|
|
|
|
if (this.menuTab.length > 1 && rebuildObj) {
|
|
@@ -6446,6 +6488,7 @@ export default {
|
|
|
let newArr = res.data.filter((item) => {
|
|
|
return item.type != 2;
|
|
|
});
|
|
|
+ if (sectionItem.parent) {
|
|
|
rebuildObj.parent.canLearn = newArr.every((item) => {
|
|
|
if (item.learning == 1) {
|
|
|
return true;
|
|
@@ -6457,7 +6500,7 @@ export default {
|
|
|
res.data.forEach((section) => {
|
|
|
section.parent = rebuildObj.parent;
|
|
|
});
|
|
|
-
|
|
|
+ }
|
|
|
this.reMenuList.forEach((menu) => {
|
|
|
if (menu.list && menu.list.length) {
|
|
|
menu.list.forEach((chapter) => {
|
|
@@ -6465,6 +6508,7 @@ export default {
|
|
|
chapter.moduleId == rebuildObj.moduleId &&
|
|
|
chapter.chapterId == rebuildObj.chapterId
|
|
|
) {
|
|
|
+ chapter.learning = res.data[0].learning
|
|
|
chapter.list = res.data;
|
|
|
}
|
|
|
});
|
|
@@ -6594,9 +6638,11 @@ export default {
|
|
|
*/
|
|
|
getMenuList() {
|
|
|
let self = this;
|
|
|
+ // /course/menuList
|
|
|
this.$request
|
|
|
.reMenuList({ courseId: this.courseId, gradeId: this.gradeId })
|
|
|
.then(async (res) => {
|
|
|
+ console.log('--asfsdgshfduofhdug', res.rows, this.menuList)
|
|
|
for (let i = 0; i < res.rows.length; i++) {
|
|
|
let item = res.rows[i];
|
|
|
item.id = item.menuId;
|
|
@@ -6607,6 +6653,7 @@ export default {
|
|
|
item.parent = this.menuList;
|
|
|
}
|
|
|
self.menuList = res.rows;
|
|
|
+ console.log('==============self.menuList===', res.rows, self.menuList)
|
|
|
if ((this.sectionItem.recordingUrl||this.sectionItem.liveUrl) && this.needOpenNew) {
|
|
|
this.needOpenNew = false;
|
|
|
if (this.sectionItem.sectionType == 1) {
|
|
@@ -6856,6 +6903,7 @@ export default {
|
|
|
},
|
|
|
getAnswerList() {
|
|
|
let self = this;
|
|
|
+ // /app/answer/list 查询答疑列表
|
|
|
this.$request
|
|
|
.answerList({ courseId: this.courseId, goodsId: this.goodsId })
|
|
|
.then((res) => {
|