Merge branch 'dev' into 145

src/components/courseTree/CourseTree.vue

@@ -240,15 +240,21 @@
                         {{ chapter.name }}
                       </div>
                       <template>
-                        <div
-                          class="btn btn--green"
-                          v-if="chapter.learning == 1"
+                        <div class="btn" v-if="chapter.rebuild > 0">待重修</div>
+                        <template v-else>
+                          <div
+                            class="btn btn--green"
+                            v-if="chapter.learning == 1"
+                          >
+                            合格
+                          </div>
+                          <div
+                            class="btn btn--red"
+                            v-if="chapter.learning == 0"
+                          >
+                            不及格(需重考)
+                          </div></template
                         >
-                          合格
-                        </div>
-                        <div class="btn btn--red" v-if="chapter.learning == 0">
-                          不及格(需重考)
-                        </div>
                       </template>
                     </template>
                   </div>
@@ -1016,7 +1022,6 @@ export default {
       });
     },
     toPlay(section) {
-      console.log(section, 777);
       this.$emit("getResource", section, this.rebuild);
     },
     //获取商品双师资模板

src/pages/course-exam/index.vue

@@ -2567,6 +2567,7 @@ export default {
           chapterId: this.chapterId,
           courseId: this.courseId,
           moduleId: this.moduleId,
+          type:this.type,
           examId: this.examId,
         })
         .then((res) => {