修复测试bug

pages2/bank/questionBank.vue

@@ -434,8 +434,8 @@
 					<view class="btnsty btns2" @click="showpopups = false">继续做题</view>
 				</view>
 				<view class="classFootsty" v-if="cgType === 7">
-					<view class="btnsty btns1" @click="showpopups = false">下次继续</view>
-					<view class="btnsty btns2" @click="backPages">结束做题</view>
+					<view class="btnsty btns1" @click="backPages">下次继续</view>
+					<view class="btnsty btns2" @click="submit">结束做题</view>
 				</view>
 				<view class="classFootsty" v-if="cgType === 8">
 					<view class="btnsty btns1" @click="backPages()">下次继续</view>
@@ -521,7 +521,7 @@ export default {
 					uni.showToast({
 						icon:'none',
 						mask:true,
-						title:'考试时间到，自动交卷',
+						title:'考试时间已到，系统将自动交卷',
 						duration:10000
 					})
 

pages2/bank/questionBankContinue.vue

@@ -371,8 +371,8 @@
 					<view class="btnsty btns2" @click="showpopups = false">继续做题</view>
 				</view>
 				<view class="classFootsty" v-if="cgType === 7">
-					<view class="btnsty btns1" @click="showpopups = false">下次继续</view>
-					<view class="btnsty btns2" @click="backPages">结束做题</view>
+					<view class="btnsty btns1" @click="backPages">下次继续</view>
+					<view class="btnsty btns2" @click="submit">结束做题</view>
 				</view>
 				<view class="classFootsty" v-if="cgType === 8">
 					<view class="btnsty btns1" @click="backPages()">下次继续</view>

pages2/class/questionBank.vue

@@ -412,6 +412,8 @@
 							? `您还有${lastCount}道题未作答， 现在继续作答，还是下次继续？`
 							: cgType === 6
 							? `您还有${lastCount}道题未作答， 您确定要交卷吗？`
+							: cgType == 9
+							? `您已完成所有题目，快去交卷吧！？` 
 							: ''
 					}}
 				</view>
@@ -427,6 +429,10 @@
 					<view class="btnsty btns1" @click="leaveNow()">下次继续</view>
 					<view class="btnsty btns2" @click="showpopups = false">继续作答</view>
 				</view>
+				<view class="classFootsty" v-if="cgType === 9">
+					<view class="btnsty btns1" @click="showpopups = false">暂不交卷</view>
+					<view class="btnsty btns2" @click="submit">立即交卷</view>
+				</view>
 			</view>
 		</u-popup>
 		<u-mask :show="photoPopup" >
@@ -578,7 +584,7 @@ export default {
 				if (self.goodsDetail.goodsPhotoExamConfig) {
 					let goodsPhotoExamConfig = JSON.parse(self.goodsDetail.goodsPhotoExamConfig);
 					if (goodsPhotoExamConfig.photograph > 0) {
-						self.needPhoto = true;
+						// self.needPhoto = true;
 					}
 				}
 				
@@ -826,6 +832,16 @@ export default {
 
 			return count;
 		},
+		/**
+		 * 是否做完所有题目
+		 */
+		isDoOver() {
+			let questionOverNum = this.questionOverNum(true); //获取已经回答的题目数(包括简答和案例)
+			if(this.questionList.length == questionOverNum) { //全部做完弹窗
+				this.cgType = 9;
+				this.showpopups = true;
+			}
+		},
 		/**
 		 * 暂不交卷
 		 */
@@ -1249,6 +1265,7 @@ export default {
 		radioSelect(optionsId, bindex) {
 			if (this.questionList[bindex].ques) return;
 			this.$set(this.questionList[bindex], 'ques', optionsId);
+			this.isDoOver()
 		},
 
 		/**
@@ -1257,6 +1274,7 @@ export default {
 		radioSelectChild(optionsId, ansIndex, bindex) {
 			if (this.questionList[bindex].ques[ansIndex]) return;
 			this.$set(this.questionList[bindex].ques, ansIndex, optionsId);
+			this.isDoOver()
 		},
 
 		/**
@@ -1286,6 +1304,7 @@ export default {
 			});
 
 			this.$set(this.questionList[bindex], 'ques', arr);
+			this.isDoOver()
 
 			let isWrong = this.questionList[bindex].ques.some((quesItem, quesIndex) => {
 				return this.questionList[bindex].ques[quesIndex] != this.questionList[bindex].ans[quesIndex];
@@ -1305,6 +1324,7 @@ export default {
 			});
 
 			this.$set(this.questionList[bindex].ques, ansIndex, arr);
+			this.isDoOver()
 		},
 
 		/**
@@ -1315,6 +1335,7 @@ export default {
 		judgeSelect(index, bindex) {
 			if (this.questionList[bindex].ques) return;
 			this.$set(this.questionList[bindex], 'ques', index + '');
+			this.isDoOver()
 		},
 
 		/**
@@ -1326,6 +1347,7 @@ export default {
 		judgeSelectChild(ansindex, childindex, bindex) {
 			if (this.questionList[bindex].ques[ansindex]) return;
 			this.$set(this.questionList[bindex].ques, ansindex, childindex + '');
+			this.isDoOver()
 		},
 
 		openFooterTab() {
@@ -1707,6 +1729,7 @@ export default {
 				imageList: this.questionList[bankindex].ansText.imageList,
 				text: this.questionList[bankindex].ansText.text
 			});
+			this.isDoOver()
 		},
 
 		/**
@@ -1728,6 +1751,7 @@ export default {
 				imageList: this.questionList[bankindex].jsonStr[ansindex].ansText.imageList,
 				text: this.questionList[bankindex].jsonStr[ansindex].ansText.text
 			});
+			this.isDoOver()
 		},
 
 		isRight(item, index) {