修复测试bug

pages2/bank/questionBankExplain.vue

@@ -37,10 +37,10 @@
 									<view class="flex_auto">{{ item.content }}</view>
 								</view>
 							</view> 
-							<view v-if="bank.ques">
+							<view v-if="bank.ques || allExplain || wrongExplain">
 								<view class="pad_8 answer">
 									<view>正确答案：{{ast[bank.ans-1]}}</view>
-									<view v-if="!explain">我的答案：{{ast[bank.ques-1]}}</view>
+									<view v-if="!explain">我的答案：{{ast[bank.ques-1] || ''}}</view>
 								</view>
 								<view class="pad_8 answerInfos">
 									<view class="answerTitle">答案解析</view>
@@ -60,7 +60,7 @@
 									<view class="flex_auto">{{ item.content }}</view>
 								</view>
 							</view>
-							<view v-if="!bank.ques" class="submit_checkbox" @click="checkboxSubmit(bankIndex)">
+							<view v-if="!bank.ques && !allExplain && !explain && !wrongExplain" class="submit_checkbox" @click="checkboxSubmit(bankIndex)">
 								确认答案
 							</view>
 							<view v-if="bank.ques">
@@ -69,7 +69,7 @@
 									<view class="flex_auto">{{ item.content }}</view>
 								</view>
 							</view> 
-							<view v-if="bank.ques">
+							<view v-if="bank.ques || allExplain || wrongExplain">
 								<view class="pad_8 answer">
 									<view>正确答案：
 										<text :key="ansItemIndex" v-for="(ansItem,ansItemIndex) in bank.ans">{{ast[ansItem-1]}}</text>
@@ -102,10 +102,10 @@
 									{{ item }}
 								</view>
 							</view> 
-							<view v-if="bank.ques">
+							<view v-if="bank.ques || allExplain || wrongExplain">
 								<view class="pad_8 answer">
 									<view>正确答案：{{ast[bank.ans]}}</view>
-									<view v-if="!explain">我的答案：{{ast[bank.ques]}}</view>
+									<view v-if="!explain">我的答案：{{ast[bank.ques] || ''}}</view>
 								</view>
 								<view class="pad_8 answerInfos">
 									<view class="answerTitle">答案解析</view>
@@ -123,30 +123,30 @@
 						<view class="pad_8 titBox">
 							<view class="ans">
 								<view class="ans_input" v-if="!bank.ques">
-									<view class="top flex">
+									<view class="top flex" v-if="!allExplain && !explain && !wrongExplain">
 										<image :data-index="bankIndex" class="icon" @click="chooseImg(bankIndex)" src="/static/camera.png" mode=""></image>
 										<view class="progress">{{bank.ansText.imageList.length || '0'}}/4</view>
 										<view class="submit"  :class="{disabled:!bank.ansText.text && hasImgs(bank)}" @click="submitAns(bankIndex)" >确认答案</view>
 									</view>
-									<view class="textarea">
+									<view class="textarea" v-if="!allExplain && !explain  && !wrongExplain">
 										<textarea v-model="bank.ansText.text" placeholder="在此输入答案"></textarea>
 									</view>
-									<view class="imgs">
+									<view class="imgs" v-if="!allExplain && !explain && !wrongExplain">
 										<view class="img" v-for="(img,imgIndex) in bank.ansText.imageList" :key="imgIndex">
 											<text @click="deleteImg(imgIndex,bankIndex)">x</text>
 											<image :src="$method.splitImgHost(img, true)"></image>
 										</view>
 									</view>
 								</view>
-								<view class="ans_submit answerInfos" v-if="bank.ques && !explain">
+								<view class="ans_submit answerInfos" v-if="(bank.ques && !explain) || allExplain || wrongExplain">
 									<view class="answerTitle">我的答案:</view>
-									{{bank.ques.text}}
+									{{bank.ques.text || ''}}
 									<view class="imgs">
 										<image class="img" v-for="(ques,quesIndex) in bank.ques.imageList" :key="quesIndex" :src="$method.splitImgHost(ques,true)"></image>
 									</view>
 								</view>
 							</view>
-							<view v-if="bank.ques">
+							<view v-if="bank.ques || allExplain || explain || wrongExplain">
 								<view class="pad_8 answerInfos">
 									<view class="answerTitle">答案解析:</view>
 									<view class="answerContent">
@@ -180,10 +180,10 @@
 											<rich-text :nodes="option.content"></rich-text>
 										</view>
 									</view> 
-									<view v-if="bank.ques[ansIndex]">
+									<view v-if="bank.ques[ansIndex] || allExplain || wrongExplain">
 										<view class="pad_8 answer">
 											<view>正确答案：{{ast[bank.ans[ansIndex]-1]}}</view>
-											<view v-if="!explain">我的答案：{{ast[bank.ques[ansIndex]-1]}}</view>
+											<view v-if="!explain">我的答案：{{ast[bank.ques[ansIndex]-1] || ''}}</view>
 										</view>
 										<view class="pad_8 answerInfos">
 											<view class="answerTitle">答案解析</view>
@@ -201,7 +201,7 @@
 											<rich-text :nodes="option.content"></rich-text>
 										</view>
 									</view>
-									<view v-if="!bank.ques[ansIndex]" class="submit_checkbox" @click="checkboxSubmitChild(bankIndex,ansIndex)">
+									<view v-if="!bank.ques[ansIndex] && !allExplain && !explain && !wrongExplain" class="submit_checkbox" @click="checkboxSubmitChild(bankIndex,ansIndex)">
 										确认答案
 									</view>
 									<view v-if="bank.ques && bank.ques[ansIndex]">
@@ -210,7 +210,7 @@
 											<rich-text :nodes="option.content"></rich-text>
 										</view>
 									</view> 
-									<view v-if="bank.ques[ansIndex]">
+									<view v-if="bank.ques[ansIndex]  || allExplain || explain || wrongExplain">
 										<view class="pad_8 answer">
 											<view>正确答案：
 												<text :key="ansItemIndex1" v-for="(ansItem1,ansItemIndex1) in bank.ans[ansIndex]">{{ast[ansItem1-1]}}</text>
@@ -241,10 +241,10 @@
 											{{ option }}
 										</view>
 									</view> 
-									<view v-if="bank.ques[ansIndex]">
+									<view v-if="bank.ques[ansIndex] || allExplain || explain || wrongExplain">
 										<view class="pad_8 answer">
 											<view>正确答案：{{ast[bank.ans[ansIndex]]}}</view>
-											<view v-if="!explain">我的答案：{{ast[bank.ques[ansIndex]]}}</view>
+											<view v-if="!explain">我的答案：{{ast[bank.ques[ansIndex]] || ''}}</view>
 										</view>
 										<view class="pad_8 answerInfos">
 											<view class="answerTitle">答案解析</view>
@@ -260,30 +260,30 @@
 								<template v-if="ansItem.type == 5">
 									<view class="ans">
 										<view class="ans_input" v-if="!bank.ques[ansIndex]">
-											<view class="top flex">
+											<view class="top flex" v-if="!allExplain && !explain && !wrongExplain">
 												<image class="icon" @click="chooseImgChild(bankIndex,ansIndex)" src="/static/08-10_032.jpg" mode=""></image>
 												<view class="progress">{{ansItem.ansText.imageList.length || '0'}}/4</view>
 												<view class="submit" :class="{disabled:!ansItem.ansText.text && hasImgs(ansItem)}"   @click="submitAnsChild(bankIndex,ansIndex)">确认答案</view>
 											</view>
-											<view class="textarea">
+											<view class="textarea" v-if="!allExplain && !explain && !wrongExplain">
 												<textarea v-model="ansItem.ansText.text" placeholder="在此输入答案"></textarea>
 											</view>
-											<view class="imgs">
+											<view class="imgs" v-if="!allExplain && !explain && !wrongExplain">
 												<view class="img" v-for="(img,imgIndex) in ansItem.ansText.imageList" :key="imgIndex">
 													<text @click="deleteImgChild(imgIndex,bankIndex,ansIndex)">x</text>
 													<image :src="$method.splitImgHost(img, true)"></image>
 												</view>
 											</view>
 										</view>
-										<view class="ans_submit answerInfos" v-if="bank.ques[ansIndex] && !explain">
+										<view class="ans_submit answerInfos" v-if="(bank.ques[ansIndex] && !explain)  || allExplain || wrongExplain">
 											<view class="answerTitle">答案我的</view>
-											{{bank.ques[ansIndex].text}}
+											{{bank.ques[ansIndex].text || ''}}
 											<view class="imgs">
 												<image class="img" :key="quesIndex" v-for="(ques,quesIndex) in bank.ques[ansIndex].imageList" :src="$method.splitImgHost(ques,true)"></image>
 											</view>
 										</view>
 									</view>
-									<view v-if="bank.ques[ansIndex]">
+									<view v-if="bank.ques[ansIndex] || allExplain || explain || wrongExplain">
 										<view class="pad_8 answerInfos">
 											<view class="answerTitle">答案解析</view>
 											<view class="answerContent">
@@ -302,7 +302,7 @@
 					
 				
 					<view class="footer_btn" v-if="isContinue || !isHistory">
-						<view class="collect" :class="{ show: goodsId ? true : false }" @click="collect(collectList[bankIndex], bankIndex)">
+						<view class="collect" :class="{ show: goodsId &&  !allExplain && !wrongExplain ? true : false }" @click="collect(collectList[bankIndex], bankIndex)">
 							<view v-if="collectList[bankIndex]">
 								<image src="/static/icon/collected.png" mode=""></image>
 								<view>取消收藏</view>
@@ -318,7 +318,7 @@
 							</view>
 							答题卡
 						</view>
-						<view class="collect"  :class="{ show: explain ? false : true }" @click="pdsubmit">
+						<view class="collect"  :class="{ show: explain || allExplain || wrongExplain ? false : true }" @click="pdsubmit">
 							<view>
 								<image src="/static/jj.png" mode=""></image>
 								<view>交卷</view>
@@ -397,7 +397,7 @@ export default {
 			collectList:[],
 			goodsId:'',
 			recordId:'',
-			explain:'',  	//是否显示答案
+			explain:'',  	//是否是解析答案
 			isContinue:'',  //是否继续做题
 			isLastCount: false, //是否有未答题目
 			lastCount: 0, //剩余没有回答的题目数 
@@ -405,18 +405,22 @@ export default {
 			moduleId:'',
 			isHistory:'',  //是否显示历史答题记录
 			isSubmit:false,
+			allExplain:'',  //是否显示全部解析+错题记录
+			wrongExplain:'', //是否是错题解析
 			cgType: 0 //对应设计稿弹窗编码
 		};
 	},
 	onLoad(option){
-		this.id = option.id;
-		this.explain = option.explain;
-		this.isContinue = option.continue;
-		this.goodsId = option.goodsid;
-		this.chapterId = option.chapterId;
-		this.moduleId = option.moduleId;
-		this.recordId = option.recordId;
-		this.isHistory = option.isHistory;
+		this.allExplain = option.allExplain || '';
+		this.id = option.id || '';
+		this.explain = option.explain || '';
+		this.isContinue = option.continue || '';
+		this.goodsId = option.goodsid || '';
+		this.chapterId = option.chapterId || '';
+		this.moduleId = option.moduleId || '';
+		this.recordId = option.recordId || '';
+		this.isHistory = option.isHistory || '';
+		this.wrongExplain = option.wrongExplain || '';
 		
 		let showDialog = uni.getStorageSync('showDialog');
 		
@@ -587,7 +591,7 @@ export default {
 					
 					this.questionList = json;
 				})
-			} else {  //解析
+			} else if(this.explain){  //解析
 				this.$api.goodsQuestionList({
 					examId:this.id
 				}).then(res => {
@@ -677,9 +681,38 @@ export default {
 					
 					this.questionList = res.data.data;
 					this.getCollectInfo(this.current);
-					console.log(this.questionList)
 					
 				})
+			} else if(this.allExplain) {  //全部解析（带错题选项）
+				this.$api.examReport(this.recordId).then(res => {
+					this.questionList = JSON.parse(res.data.data.historyExamJson)
+				})
+			} else if(this.wrongExplain) {
+				this.$api.examReport(this.recordId).then(res => {
+					let questionList = JSON.parse(res.data.data.historyExamJson);
+					
+					questionList.forEach(json => {  //只获取类型1，2，3 单选，多选，判断 ，主观题灭有对错
+						if(json.type == 1 || json.type == 3) {  //单选判断
+							if(json.ans != json.ques) {
+								this.questionList.push(json)
+							}
+						} else if(json.type == 2) { //判断是否全对
+							let isRight =     
+								json.ans.every((quesItem, quesIndex) => {
+									if(json.ques) {
+										return json.ques[quesIndex] == json.ans[quesIndex];
+									} else {
+										return false;
+									}
+									
+								});
+										
+							if (!isRight) {
+								this.questionList.push(json)
+							}
+						}
+					})
+				})
 			}
 			
 		},
@@ -776,6 +809,10 @@ export default {
 		 * @param {Object} e单选点击
 		 */
 		radioSelectChild(optionsId,ansIndex,bindex) {
+			
+			if(this.allExplain || this.wrongExplain || this.explain) {
+				return;
+			}
 			if(this.questionList[bindex].ques[ansIndex]) return;
 			this.$set(this.questionList[bindex].ques,ansIndex,optionsId)
 			
@@ -786,7 +823,9 @@ export default {
 		 * @param {Object} 多选点击
 		 */
 		checkboxSelect(optionsId,bindex,index) {
-			
+			if(this.allExplain || this.wrongExplain || this.explain) {
+				return;
+			}
 			this.$set(this.questionList[bindex].jsonStr[index],'checked',!this.questionList[bindex].jsonStr[index].checked)
 		},
 		
@@ -794,7 +833,9 @@ export default {
 		 * @param {Object} 多选点击
 		 */
 		checkboxSelectChild(bindex,ansIndex,childIndex) {
-			
+			if(this.allExplain || this.wrongExplain || this.explain) {
+				return;
+			}
 			this.$set(this.questionList[bindex].jsonStr[ansIndex].optionsList[childIndex],'checked',!this.questionList[bindex].jsonStr[ansIndex].optionsList[childIndex].checked)
 		},
 		
@@ -984,12 +1025,18 @@ export default {
 		},
 		
 		judgeSelect(index,bindex) {
+			if(this.allExplain || this.wrongExplain || this.explain) {
+				return;
+			}
 			if(this.questionList[bindex].ques) return;
 			this.$set(this.questionList[bindex],'ques',index+'')
 			
 		},
 		
 		judgeSelectChild(ansindex,childindex,bindex) {
+			if(this.allExplain || this.wrongExplain || this.explain) {
+				return;
+			}
 			if(this.questionList[bindex].ques[ansindex]) return;
 			this.$set(this.questionList[bindex].ques,ansindex,childindex+'')
 		},

pages2/bank/question_report.vue

@@ -31,14 +31,14 @@
 			<view class="dis_fst" v-if="!hideBtns">
 				<navigator
 					:url="
-						'/pages2/subject/wrongBank?isFromReport=1&explain=1&id=' + reportdata.recordId+'&examId='+examData.examId
+						'/pages2/bank/questionBankExplain?wrongExplain=1&recordId=' + reportdata.recordId+'&id='+examData.examId
 					"
 				>
 					<view class="btnACs" v-if="wrongRecordWrongNum != 0">错题解析</view>
 				</navigator>
 				<navigator
 					:url="
-						'/pages2/bank/questionBankExplain?explain=1&id=' +
+						'/pages2/bank/questionBankExplain?allExplain=1&id=' +
 							reportdata.examId +
 							'&goodsid=' +
 							reportdata.goodsId +
@@ -46,7 +46,7 @@
 							reportdata.moduleExamId +
 							'&chapterId=' +
 							reportdata.chapterExamId +
-							''
+							'&recordId='+ reportdata.recordId
 					"
 				>
 					<view class="btnACs">全部解析</view>

pages2/class/questionBank.vue

@@ -836,7 +836,7 @@ export default {
 						number++;
 					} else {
 						let checkboxScore = item.score;  //获取单题总分数
-						item.ques.forEach((ques,quesIndex) => {
+						item.ques && item.ques.forEach((ques,quesIndex) => {
 							//选错一个全扣
 							if(item.ques) {
 								if(item.ans.indexOf(item.ques[quesIndex]) == -1) {
@@ -1187,7 +1187,7 @@ export default {
 				})
 				.then(res => {
 					this.recordId = res.data.data;
-					self.photoPopup = true; //拍照
+					// self.photoPopup = true; //拍照
 				});
 			
 		},
@@ -1354,7 +1354,7 @@ export default {
 						rightQuestionIds.push(item.questionId)
 					} else {
 						let checkboxScore = item.score;  //获取单题总分数
-						item.ques.forEach((ques,quesIndex) => {
+						item.ques && item.ques.forEach((ques,quesIndex) => {
 							//选错一个全扣
 							if(item.ques) {
 								if(item.ans.indexOf(item.ques[quesIndex]) == -1) {
@@ -1459,6 +1459,7 @@ export default {
 						uni.showToast({
 							title: '交卷成功',
 							duration: 1000,
+							mask:true,
 							icon: 'none'
 						});
 

pages2/order/index.vue

@@ -104,7 +104,7 @@ export default {
 				console.log(item)
 				if(item.goodsType == 1) { //网课
 					uni.navigateTo({
-						url:'/pages2/wd/course?id='+item.goodsId
+						url:'/pages2/wd/course?gid='+item.gradeId+'&id='+item.goodsId
 					})
 				} else if(item.goodsType == 2) { //题库
 					uni.navigateTo({