Merge branch 'master' into xqy_youhua

common/request.js

@@ -100,6 +100,9 @@ export const myRequest = (options) => {
 					title: "请求接口失败",
 					icon: 'none'
 				})
+				if (options.url == '/face/certification/CompareFace') {
+					console.log('人脸识别错误---1:', err)
+				}
 				reject(JSON.stringify(err))
 			},
 			complete: () => {

pages2/bank/questionBank.vue

@@ -1813,6 +1813,7 @@ export default {
       }
 
       this.$set(this.questionList[bindex], "ques", arr);
+      this.$u.toast('已确认答案')
       this.isDoOver();
 
       // let isWrong = this.questionList[bindex].ques.some((item, i) => {
@@ -1871,6 +1872,7 @@ export default {
       }
 
       this.$set(this.questionList[bindex].ques, ansIndex, arr);
+      this.$u.toast('已确认答案')
       this.isDoOver();
     },
 

pages2/class/questionBank.vue

@@ -778,7 +778,7 @@
     <u-mask :show="examType != 2 && photoPopup">
       <!-- 播放前拍照start -->
       <view
-        v-if="photoPopup"
+        v-if="examType != 2 && photoPopup"
         :mask-close-able="false"
         style="bottom: 0; position: fixed; width: 100%; z-index: 999"
       >
@@ -899,6 +899,7 @@ export default {
   },
   async onLoad(option) {
     this.examType = option.type
+    console.log('examType:', this.examType)
     this.id = option.id;
     this.goodsId = option.goodsid;
     this.chapterId = option.chapterId;
@@ -1981,6 +1982,7 @@ export default {
       }
 
       this.$set(this.questionList[bindex], "ques", arr);
+      this.$u.toast('已确认答案')
       this.isDoOver();
 
       // let isWrong = this.questionList[bindex].ques.some(
@@ -2023,6 +2025,7 @@ export default {
       }
 
       this.$set(this.questionList[bindex].ques, ansIndex, arr);
+      this.$u.toast('已确认答案')
       this.isDoOver();
     },
 

pages3/polyv/detail.vue

@@ -1125,16 +1125,6 @@ export default {
       
       console.log('findResult:', findResult)
       this.jump(findResult, 1)
-      // return
-      // this.vid = ''
-      // this.hasStart = true
-      // await this.originUnload()
-      // this.reStart = false
-      // this.courseId = item.courseId
-      // this.gradeId = findResult.gradeId
-      // console.log('切换老师', item.courseId, item.gradeId)
-      // this.originOnShow()
-      // this.originMounted()
     },
     // 进入学习
     async jump(item, index, type) {
@@ -2778,7 +2768,6 @@ export default {
 				  this.uploadLock = false;
 				  this.openPhoto();
 				}, 2000);
-				return;
 			}
     },
     reTake() {

pages5/examBank/index.vue

@@ -1794,6 +1794,7 @@ export default {
       }
 
       this.$set(this.questionList[bindex], "ques", arr);
+      this.$u.toast('已确认答案')
       this.isDoOver();
       console.log('this.questionList[bindex]', this.questionList[bindex].ques)
       // let isWrong = this.questionList[bindex].ques.some(
@@ -1833,6 +1834,7 @@ export default {
       }
 
       this.$set(this.questionList[bindex].ques, ansIndex, arr);
+      this.$u.toast('已确认答案')
       this.isDoOver();
     },