Merge branch 'dev' into x_12.2

src/components/courseTree/CourseTree.vue

@@ -1153,10 +1153,12 @@ export default {
     },
     isLastVideo() {
       try {
-        let { sectionId, chapterId } = this.sectionItem;
+        let { sectionId, chapterId, courseId } = this.sectionItem;
         let lastVideo = this.allSectionList.slice(-1)[0];
         return (
-          sectionId == lastVideo.sectionId && chapterId == lastVideo.chapterId
+          sectionId == lastVideo.sectionId &&
+          chapterId == lastVideo.chapterId &&
+          courseId == lastVideo.courseId
         );
       } catch (error) {
         return false;

src/pages/bank-list/index.vue

@@ -141,7 +141,7 @@ export default {
     this.params.goodsName = this.$route.query.searchKey || "";
     // this.params.searchKey = this.$route.query.searchKey || "";
     this.params.educationTypeId = this.$route.query.educationId || "";
-    this.params.projectId = this.$route.query.projectId || "";
+    // this.params.projectId = this.$route.query.projectId || "";
     this.params.businessId = this.$route.query.businessId || "";
     if (this.params.businessId) {
       this.getSubjectList();

src/pages/course-list/index.vue

@@ -177,7 +177,7 @@ export default {
     this.params.goodsName = this.$route.query.searchKey || "";
     // this.params.searchKey = this.$route.query.searchKey || "";
     this.params.educationTypeId = this.$route.query.educationId || "";
-    this.params.projectId = this.$route.query.projectId || "";
+    // this.params.projectId = this.$route.query.projectId || "";
     this.params.businessId = this.$route.query.businessId || "";
     if (this.params.businessId) {
       this.getSubjectList();

src/pages/live-list/index.vue

@@ -178,7 +178,7 @@ export default {
     this.params.goodsName = this.$route.query.searchKey || "";
     // this.params.searchKey = this.$route.query.searchKey || "";
     this.params.educationTypeId = this.$route.query.educationId || "";
-    this.params.projectId = this.$route.query.projectId || "";
+    // this.params.projectId = this.$route.query.projectId || "";
     this.params.businessId = this.$route.query.businessId || "";
     if (this.params.businessId) {
       this.getSubjectList();