合并解决冲突

components/course/courseChapter.vue

@@ -26,9 +26,8 @@
             :levelId="levelId + '-' + itemM.sectionId"
             :testType="2"
             :ChapterSectionExam='sectionExam'
-            :menuAllList="menuAllList"
-            @togoBack='togoBack()'
           ></courseSection>
+          <!-- @togoBack='togoBack()' -->
           <u-line v-if="indexM < list.length - 1"></u-line>
         </view>
         <!-- 章卷 -->
@@ -170,9 +169,9 @@ export default {
   methods: {
     ...mapMutations(["updateChapterOpen"]),
     // 调用节的方法
-    togoBack(value) {
-      this.$refs.ChapterSection[0].ChapterExam()
-    },
+    // togoBack(value) {
+    //   this.$refs.ChapterSection[0].ChapterExam()
+    // },
     goodsTodayStudySectionNum() {
       return new Promise((resolve) => {
         this.$api

components/course/courseSection.vue

@@ -240,7 +240,12 @@ export default {
 			
 		},
 		toDoSectionExam() {
-			this.$emit('togoBack', 1)
+			// this.$emit('togoBack', 1)
+			if (this.testType == 3) {
+				this.ModuleExam()
+			} else {
+				this.ChapterExam()
+			}
 		},
 		checkTest() {
 			let data = this.testType == 3 ? this.moduleSectionExam : this.ChapterSectionExam
@@ -309,7 +314,7 @@ export default {
 			})
 		},
 		getVideo(){
-			console.log('点击节', this.newMenuAllList);
+			console.log('this.menuItem:', this.menuItem);
 			if(this.clickLock) {
 				return;
 			}

pages3/polyv/detail.vue

@@ -191,10 +191,9 @@
                 :levelId="'0-0-' + item.menuId"
                 :goodsType='1'
                 :testType="3"
-                :menuAllList="menuAllList"
-                @togoBack="togoBack($event)"
               ></courseSection
             ></view>
+            <!-- @togoBack="togoBack($event)" -->
           </view>
         </view>
         <!--讲义 -->
@@ -809,9 +808,9 @@ export default {
   methods: {
     ...mapMutations(["updateChapterOpen","updateLiveLast"]),
     // 调用节的方法
-    togoBack(value) {
-      this.$refs.MoudleSection[0].ModuleExam()
-    },
+    // togoBack(value) {
+    //   this.$refs.MoudleSection[0].ModuleExam()
+    // },
     // 新增微信公众号模板消息点击数据
     clickOfficial() {
       this.$http({