소스 검색

修复测试bug

chenxiong 3 년 전
부모
커밋
454bf4cca1

+ 5 - 4
pages/course/index.vue

@@ -327,7 +327,7 @@ export default {
 		border: 2rpx solid #EEEEEE;
 		border-radius: 16rpx;
 		margin-top: 15rpx;
-		font-size: 32rpx;
+		font-size: 30rpx;
 		white-space: nowrap; 
 	}
 	.activeStys{
@@ -340,6 +340,7 @@ export default {
 		height: 66rpx;
 		line-height: 66rpx;
 		color: #666;
+		font-size: 30rpx;
 		padding:0 30rpx;
 		margin-top: 15rpx;
 		white-space: nowrap;
@@ -367,14 +368,14 @@ export default {
 		.lzs {
 			width:200rpx;
 			height: 100%;
-			overflow: scroll;
+			overflow-y: scroll;
 		}
 		
 		.rzs {
-			margin-left:10rpx;
+			margin-left:40rpx;
 			flex:1;
 			height: 100%;
-			overflow: scroll;
+			overflow-y: scroll;
 		}
 	}
 	.contentZ::-webkit-scrollbar {

+ 1 - 1
pages2/bank/detail.vue

@@ -73,7 +73,7 @@
 							<text style="margin-left:34rpx;">{{ item1.name }}</text>
 						</view>
 						<view v-if="item1.showList" >
-							<view class="article" :class="{active:showTest(article.examId)}"  :key="index3" v-for="(article,index2) in item1.list">
+							<view class="article" :class="{active:showTest(article.examId)}"  :key="index2" v-for="(article,index2) in item1.list">
 								<view class="flex_auto">{{item1.name}}</view>
 								<navigator  hover-class="none" :url="'/pages2/bank/questionBankTest?id='+article.majorId+'&num='+showTest(article.examId).num">
 									<view class="btn"  v-if="showTest(article.examId)">试做</view>

+ 51 - 18
pages2/bank/questionBank.vue

@@ -81,11 +81,11 @@
 								<view class="pad_8 answer">
 									<view>
 										正确答案:
-										<text v-for="ansItem in bank.ans">{{ ast[ansItem - 1] }}</text>
+										<text v-for="(ansItem,ansIndex) in bank.ans" :key="ansIndex">{{ ast[ansItem - 1] }}</text>
 									</view>
 									<view>
 										我的答案:
-										<text v-for="quesItem in bank.ques">{{ ast[quesItem - 1] }}</text>
+										<text v-for="(quesItem,quesIndex) in bank.ques" :key="quesIndex">{{ ast[quesItem - 1] }}</text>
 									</view>
 								</view>
 								<view class="pad_8 answerInfos">
@@ -137,7 +137,7 @@
 									</view>
 									<view class="textarea"><textarea v-model="bank.ansText.text" placeholder="在此输入答案"></textarea></view>
 									<view class="imgs">
-										<view class="img" v-for="(img, imgIndex) in bank.ansText.imageList">
+										<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>
@@ -146,7 +146,7 @@
 								<view class="ans_submit answerInfos" v-if="bank.ques">
 									<view class="answerTitle">我的答案:</view>
 									{{ bank.ques.text }}
-									<view class="imgs"><image class="img" v-for="ques in bank.ques.imageList" :src="$method.splitImgHost(ques, true)"></image></view>
+									<view class="imgs"><image class="img" :key="quesIndex" v-for="(ques,quesIndex) in bank.ques.imageList" :src="$method.splitImgHost(ques, true)"></image></view>
 								</view>
 							</view>
 							<view v-if="bank.ques">
@@ -187,7 +187,7 @@
 										</view>
 									</view>
 									<view v-if="bank.ques[ansIndex]">
-										<view v-for="(option, childIndex) in ansItem.optionsList" :key="index" class="lisSty">
+										<view v-for="(option, childIndex) in ansItem.optionsList" :key="childIndex" class="lisSty">
 											<text
 												:class="{
 													right: option.optionsId == bank.ques[ansIndex] || option.optionsId == bank.ans[ansIndex],
@@ -237,11 +237,11 @@
 										<view class="pad_8 answer">
 											<view>
 												正确答案:
-												<text v-for="ansItem1 in bank.ans[ansIndex]">{{ ast[ansItem1 - 1] }}</text>
+												<text :key="ansItemIndex1" v-for="(ansItem1,ansItemIndex1) in bank.ans[ansIndex]">{{ ast[ansItem1 - 1] }}</text>
 											</view>
 											<view>
 												我的答案:
-												<text v-for="quesItem in bank.ques[ansIndex]">{{ ast[quesItem - 1] }}</text>
+												<text :key="quesItemIndex"  v-for="(quesItem,quesItemIndex) in bank.ques[ansIndex]">{{ ast[quesItem - 1] }}</text>
 											</view>
 										</view>
 										<view class="pad_8 answerInfos">
@@ -295,7 +295,7 @@
 											</view>
 											<view class="textarea"><textarea v-model="ansItem.ansText.text" placeholder="在此输入答案"></textarea></view>
 											<view class="imgs">
-												<view class="img" v-for="(img, imgIndex) in ansItem.ansText.imageList">
+												<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>
@@ -305,7 +305,7 @@
 											<view class="answerTitle">答案我的</view>
 											{{ bank.ques[ansIndex].text }}
 											<view class="imgs">
-												<image class="img" v-for="ques in bank.ques[ansIndex].imageList" :src="$method.splitImgHost(ques, true)"></image>
+												<image class="img" v-for="(ques,quesIndex) in bank.ques[ansIndex].imageList" :key="quesIndex" :src="$method.splitImgHost(ques, true)"></image>
 											</view>
 										</view>
 									</view>
@@ -490,6 +490,23 @@ export default {
 			for (var k in globalData.bankData) {
 				this[k] = globalData.bankData[k];
 			}
+
+			this.timer = setInterval(() => {
+				if (this.lastTime <= 0) {
+					clearInterval(this.timer);
+					uni.showToast({
+						icon:'none',
+						title:'考试时间到,自动交卷',
+						duration:1000
+					})
+
+					setTimeout(() => {
+						this.submit();
+					}, 1000);
+					return;
+				}
+				this.lastTime--;
+			}, 1000);
 		} else {
 			this.goodsQuestionList();
 			this.bankExam();
@@ -504,6 +521,7 @@ export default {
 		if (this.needBack) {
 			let app = getApp();
 			app.globalData.bankData = this.$data;
+			clearInterval(this.timer);
 			uni.navigateTo({
 				url: '/pages2/bank/questionBank?id=' + this.id + '&goodsid=' + this.goodsId + '&isback=true'
 			});
@@ -643,6 +661,7 @@ export default {
 		 */
 		leaveNow() {
 			this.needBack = false;
+			this.isSubmit = true;
 			uni.navigateBack({
 				delta: 1
 			});
@@ -778,6 +797,8 @@ export default {
 					recordId: this.recordId,
 					rightQuestionNum: number,
 					status: 1,
+					moduleExamId:this.moduleId || 0,
+					chapterExamId:this.chapterId || 0,
 					doQuestionIds:doQuestionIds.join(','),
 					rightQuestionIds:rightQuestionIds.join(','),
 					doQuestionNum: doQuestionNum,
@@ -796,6 +817,8 @@ export default {
 				
 				//错题集id提交(客观题)
 				this.$api.examWrongRecord({
+						moduleExamId:this.moduleId || 0,
+						chapterExamId:this.chapterId || 0,
 						examId: this.id,
 						goodsId: this.goodsId,
 						questionIds: doWrongQuestionIds,
@@ -911,6 +934,8 @@ export default {
 						goodsId: this.goodsId,
 						recordId: this.recordId,
 						rightQuestionNum: number,
+						moduleExamId:this.moduleId || 0,
+						chapterExamId:this.chapterId || 0,
 						status: 0,
 						doQuestionNum: doQuestionNum,
 						historyExamJson: JSON.stringify(this.questionList)
@@ -1009,15 +1034,15 @@ export default {
 						this.timer = setInterval(() => {
 							if (this.lastTime <= 0) {
 								clearInterval(this.timer);
-								uni.showModal({
-									title: '提示',
-									content: '考试时间到,自动交卷',
-									confirmText: '确定',
-									showCancel: false,
-									success: res => {
-										this.submit();
-									}
-								});
+								uni.showToast({
+									icon:'none',
+									title:'考试时间到,自动交卷',
+									duration:1000
+								})
+
+								setTimeout(() => {
+									this.submit();
+								}, 1000);
 								return;
 							}
 							this.lastTime--;
@@ -1104,6 +1129,8 @@ export default {
 					.examWrongRecord({
 						examId: this.id,
 						goodsId: this.goodsId,
+						moduleExamId:this.moduleId || 0,
+						chapterExamId:this.chapterId || 0,
 						questionIds: [this.questionList[bindex].questionId],
 						recordId: this.recordId
 					})
@@ -1166,6 +1193,8 @@ export default {
 					.examWrongRecord({
 						examId: this.id,
 						goodsId: this.goodsId,
+						moduleExamId:this.moduleId || 0,
+						chapterExamId:this.chapterId || 0,
 						questionIds: [this.questionList[bindex].questionId],
 						recordId: this.recordId
 					})
@@ -1212,6 +1241,8 @@ export default {
 					.examWrongRecord({
 						examId: this.id,
 						goodsId: this.goodsId,
+						moduleExamId:this.moduleId || 0,
+						chapterExamId:this.chapterId || 0,
 						questionIds:[this.questionList[bindex].questionId],
 						recordId: this.recordId
 					})
@@ -1422,6 +1453,8 @@ export default {
 					recordId: this.recordId,
 					rightQuestionNum: number,
 					status: 1,
+					moduleExamId:this.moduleId || 0,
+					chapterExamId:this.chapterId || 0,
 					doQuestionIds:doQuestionIds.join(','),
 					rightQuestionIds:rightQuestionIds.join(','),
 					doQuestionNum: doQuestionNum,

+ 13 - 9
pages2/bank/questionBankExplain.vue

@@ -71,10 +71,10 @@
 							<view v-if="bank.ques">
 								<view class="pad_8 answer">
 									<view>正确答案:
-										<text v-for="ansItem in bank.ans">{{ast[ansItem-1]}}</text>
+										<text :key="ansItemIndex" v-for="(ansItem,ansItemIndex) in bank.ans">{{ast[ansItem-1]}}</text>
 									</view>
 									<view v-if="!explain">我的答案:
-										<text v-for="quesItem in bank.ques">{{ast[quesItem-1]}}</text>
+										<text :key="quesItemIndex" v-for="(quesItem,quesItemIndex) in bank.ques">{{ast[quesItem-1]}}</text>
 									</view>
 								</view>
 								<view class="pad_8 answerInfos">
@@ -131,7 +131,7 @@
 										<textarea v-model="bank.ansText.text" placeholder="在此输入答案"></textarea>
 									</view>
 									<view class="imgs">
-										<view class="img" v-for="(img,imgIndex) in bank.ansText.imageList" >
+										<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>
@@ -141,7 +141,7 @@
 									<view class="answerTitle">我的答案:</view>
 									{{bank.ques.text}}
 									<view class="imgs">
-										<image class="img" v-for="ques in bank.ques.imageList" :src="$method.splitImgHost(ques,true)"></image>
+										<image class="img" v-for="(ques,quesIndex) in bank.ques.imageList" :key="quesIndex" :src="$method.splitImgHost(ques,true)"></image>
 									</view>
 								</view>
 							</view>
@@ -174,7 +174,7 @@
 										</view>
 									</view>
 									<view v-if="bank.ques[ansIndex]">
-										<view v-for="(option, childIndex) in ansItem.optionsList" :key="index" class="lisSty">
+										<view v-for="(option, childIndex) in ansItem.optionsList" :key="childIndex" class="lisSty">
 											<text :class="{right:(option.optionsId == bank.ques[ansIndex]) || (option.optionsId == bank.ans[ansIndex]),wrong:(option.optionsId == bank.ques[ansIndex]) && (bank.ques[ansIndex] != bank.ans[ansIndex])}"  class="activeTI">{{ ast[childIndex] }}</text>
 											<rich-text :nodes="option.content"></rich-text>
 										</view>
@@ -212,10 +212,10 @@
 									<view v-if="bank.ques[ansIndex]">
 										<view class="pad_8 answer">
 											<view>正确答案:
-												<text v-for="ansItem1 in bank.ans[ansIndex]">{{ast[ansItem1-1]}}</text>
+												<text :key="ansItemIndex1" v-for="(ansItem1,ansItemIndex1) in bank.ans[ansIndex]">{{ast[ansItem1-1]}}</text>
 											</view>
 											<view v-if="!explain">我的答案:
-												<text v-for="quesItem in bank.ques[ansIndex]">{{ast[quesItem-1]}}</text>
+												<text :key="quesItemIndex" v-for="(quesItem,quesItemIndex) in bank.ques[ansIndex]">{{ast[quesItem-1]}}</text>
 											</view>
 										</view>
 										<view class="pad_8 answerInfos">
@@ -268,7 +268,7 @@
 												<textarea v-model="ansItem.ansText.text" placeholder="在此输入答案"></textarea>
 											</view>
 											<view class="imgs">
-												<view class="img" v-for="(img,imgIndex) in ansItem.ansText.imageList" >
+												<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>
@@ -278,7 +278,7 @@
 											<view class="answerTitle">答案我的</view>
 											{{bank.ques[ansIndex].text}}
 											<view class="imgs">
-												<image class="img" v-for="ques in bank.ques[ansIndex].imageList" :src="$method.splitImgHost(ques,true)"></image>
+												<image class="img" :key="quesIndex" v-for="(ques,quesIndex) in bank.ques[ansIndex].imageList" :src="$method.splitImgHost(ques,true)"></image>
 											</view>
 										</view>
 									</view>
@@ -618,6 +618,8 @@ export default {
 				})
 				
 				this.$api.examRecordEdit({
+					moduleExamId:this.moduleId || 0,
+					chapterExamId:this.chapterId || 0,
 					examId:this.id,
 					goodsId:this.goodsId,
 					recordId: this.recordId,
@@ -783,6 +785,8 @@ export default {
 				recordId: this.recordId,
 				rightQuestionNum:number,
 				status:1,
+				moduleExamId:this.moduleId || 0,
+				chapterExamId:this.chapterId || 0,
 				doQuestionIds:doQuestionIds.join(','),
 				rightQuestionIds:rightQuestionIds.join(','),
 				doQuestionNum: doQuestionNum,

+ 13 - 9
pages2/bank/questionBankExplainDetail.vue

@@ -74,10 +74,10 @@
 							<view v-if="bank.ques">
 								<view class="pad_8 answer">
 									<view>正确答案:
-										<text v-for="ansItem in bank.ans">{{ast[ansItem-1]}}</text>
+										<text :key="ansItemIndex" v-for="(ansItem,ansItemIndex) in bank.ans">{{ast[ansItem-1]}}</text>
 									</view>
 									<view v-if="!explain">我的答案:
-										<text v-for="quesItem in bank.ques">{{ast[quesItem-1]}}</text>
+										<text :key="quesItemIndex" v-for="(quesItem,quesItemIndex) in bank.ques">{{ast[quesItem-1]}}</text>
 									</view>
 								</view>
 								<view class="pad_8 answerInfos">
@@ -134,7 +134,7 @@
 										<textarea v-model="bank.ansText.text" placeholder="在此输入答案"></textarea>
 									</view>
 									<view class="imgs">
-										<view class="img" v-for="(img,imgIndex) in bank.ansText.imageList" >
+										<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>
@@ -144,7 +144,7 @@
 									<view class="answerTitle">我的答案:</view>
 									{{bank.ques.text}}
 									<view class="imgs">
-										<image class="img" v-for="ques in bank.ques.imageList" :src="$method.splitImgHost(ques,true)"></image>
+										<image class="img" :key="quesIndex" v-for="(ques,quesIndex) in bank.ques.imageList" :src="$method.splitImgHost(ques,true)"></image>
 									</view>
 								</view>
 							</view>
@@ -177,7 +177,7 @@
 										</view>
 									</view>
 									<view v-if="bank.ques[ansIndex]">
-										<view v-for="(option, childIndex) in ansItem.optionsList" :key="index" class="lisSty">
+										<view v-for="(option, childIndex) in ansItem.optionsList" :key="childIndex" class="lisSty">
 											<text :class="{right:(option.optionsId == bank.ques[ansIndex]) || (option.optionsId == bank.ans[ansIndex]),wrong:(option.optionsId == bank.ques[ansIndex]) && (bank.ques[ansIndex] != bank.ans[ansIndex])}"  class="activeTI">{{ ast[childIndex] }}</text>
 											<rich-text :nodes="option.content"></rich-text>
 										</view>
@@ -215,10 +215,10 @@
 									<view v-if="bank.ques[ansIndex]">
 										<view class="pad_8 answer">
 											<view>正确答案:
-												<text v-for="ansItem1 in bank.ans[ansIndex]">{{ast[ansItem1-1]}}</text>
+												<text :key="ansItemIndex1" v-for="(ansItem1,ansItemIndex1) in bank.ans[ansIndex]">{{ast[ansItem1-1]}}</text>
 											</view>
 											<view v-if="!explain">我的答案:
-												<text v-for="quesItem in bank.ques[ansIndex]">{{ast[quesItem-1]}}</text>
+												<text :key="quesItemIndex" v-for="(quesItem,quesItemIndex) in bank.ques[ansIndex]">{{ast[quesItem-1]}}</text>
 											</view>
 										</view>
 										<view class="pad_8 answerInfos">
@@ -271,7 +271,7 @@
 												<textarea v-model="ansItem.ansText.text" placeholder="在此输入答案"></textarea>
 											</view>
 											<view class="imgs">
-												<view class="img" v-for="(img,imgIndex) in ansItem.ansText.imageList" >
+												<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>
@@ -281,7 +281,7 @@
 											<view class="answerTitle">答案我的</view>
 											{{bank.ques[ansIndex].text}}
 											<view class="imgs">
-												<image class="img" v-for="ques in bank.ques[ansIndex].imageList" :src="$method.splitImgHost(ques,true)"></image>
+												<image class="img" :key="quesIndex" v-for="(ques,quesIndex) in bank.ques[ansIndex].imageList" :src="$method.splitImgHost(ques,true)"></image>
 											</view>
 										</view>
 									</view>
@@ -828,6 +828,8 @@ export default {
 					recordId: this.recordId,
 					rightQuestionNum:number,
 					status:0,
+					moduleExamId:this.moduleId || 0,
+					chapterExamId:this.chapterId || 0,
 					doQuestionNum: doQuestionNum,
 					historyExamJson:JSON.stringify(this.questionList)
 				}).then(res => {
@@ -987,6 +989,8 @@ export default {
 				recordId: this.recordId,
 				rightQuestionNum:number,
 				status:1,
+				moduleExamId:this.moduleId || 0,
+				chapterExamId:this.chapterId || 0,
 				doQuestionIds:doQuestionIds.join(','),
 				rightQuestionIds:rightQuestionIds.join(','),
 				doQuestionNum: doQuestionNum,

+ 9 - 9
pages2/bank/questionBankTest.vue

@@ -69,10 +69,10 @@
 							<view v-if="bank.ques">
 								<view class="pad_8 answer">
 									<view>正确答案:
-										<text v-for="ansItem in bank.ans">{{ast[ansItem-1]}}</text>
+										<text :key="ansItemIndex" v-for="(ansItem,ansItemIndex) in bank.ans">{{ast[ansItem-1]}}</text>
 									</view>
 									<view>我的答案:
-										<text v-for="quesItem in bank.ques">{{ast[quesItem-1]}}</text>
+										<text :key="quesItemIndex" v-for="(quesItem,quesItemIndex) in bank.ques">{{ast[quesItem-1]}}</text>
 									</view>
 								</view>
 								<view class="pad_8 answerInfos">
@@ -125,7 +125,7 @@
 										<textarea v-model="bank.ansText.text" placeholder="在此输入答案"></textarea>
 									</view>
 									<view class="imgs">
-										<view class="img" v-for="(img,imgIndex) in bank.ansText.imageList" >
+										<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>
@@ -135,7 +135,7 @@
 									<view class="answerTitle">我的答案:</view>
 									{{bank.ques.text}}
 									<view class="imgs">
-										<image class="img" v-for="ques in bank.ques.imageList" :src="$method.splitImgHost(ques,true)"></image>
+										<image class="img" :key="quesIndex" v-for="(ques,quesIndex) in bank.ques.imageList" :src="$method.splitImgHost(ques,true)"></image>
 									</view>
 								</view>
 							</view>
@@ -166,7 +166,7 @@
 										</view>
 									</view>
 									<view v-if="bank.ques[ansIndex]">
-										<view v-for="(option, childIndex) in ansItem.optionsList" :key="index" class="lisSty">
+										<view v-for="(option, childIndex) in ansItem.optionsList" :key="childIndex" class="lisSty">
 											<text :class="{right:(option.optionsId == bank.ques[ansIndex]) || (option.optionsId == bank.ans[ansIndex]),wrong:(option.optionsId == bank.ques[ansIndex]) && (bank.ques[ansIndex] != bank.ans[ansIndex])}"  class="activeTI">{{ ast[childIndex] }}</text>
 											<rich-text :nodes="option.content"></rich-text>
 										</view>
@@ -204,10 +204,10 @@
 									<view v-if="bank.ques[ansIndex]">
 										<view class="pad_8 answer">
 											<view>正确答案:
-												<text v-for="ansItem1 in bank.ans[ansIndex]">{{ast[ansItem1-1]}}</text>
+												<text :key="ansItemIndex1" v-for="(ansItem1,ansItemIndex1) in bank.ans[ansIndex]">{{ast[ansItem1-1]}}</text>
 											</view>
 											<view>我的答案:
-												<text v-for="quesItem in bank.ques[ansIndex]">{{ast[quesItem-1]}}</text>
+												<text :key="quesItemIndex" v-for="(quesItem,quesItemIndex) in bank.ques[ansIndex]">{{ast[quesItem-1]}}</text>
 											</view>
 										</view>
 										<view class="pad_8 answerInfos">
@@ -260,7 +260,7 @@
 												<textarea v-model="ansItem.ansText.text" placeholder="在此输入答案"></textarea>
 											</view>
 											<view class="imgs">
-												<view class="img" v-for="(img,imgIndex) in ansItem.ansText.imageList" >
+												<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>
@@ -270,7 +270,7 @@
 											<view class="answerTitle">我的答案:</view>
 											{{bank.ques[ansIndex].text}}
 											<view class="imgs">
-												<image class="img" v-for="ques in bank.ques[ansIndex].imageList" :src="$method.splitImgHost(ques,true)"></image>
+												<image class="img" :key="quesIndex" v-for="(ques,quesIndex) in bank.ques[ansIndex].imageList" :src="$method.splitImgHost(ques,true)"></image>
 											</view>
 										</view>
 									</view>

+ 2 - 2
pages2/bank/question_detail.vue

@@ -170,11 +170,11 @@ export default {
 			    success: (res) => {
 			        if (res.confirm) {
 						uni.navigateTo({
-							url:'/pages2/bank/questionBank?id=' +examId +'&goodsid=' +goodsId +'&moduleId=0&chapterId=' +chapterExamId
+							url:'/pages2/bank/questionBank?id=' +examId +'&goodsid=' +goodsId +'&moduleId='+moduleId+'&chapterId=' +chapterExamId
 						})
 			        } else if (res.cancel) {
 						uni.navigateTo({
-							url:'/pages2/bank/questionBankExplain?isHistory=1&recordId='+recordId +'&id=' +examId +'&goodsid=' +goodsId +'&moduleId=0&chapterId=' +chapterExamId
+							url:'/pages2/bank/questionBankExplain?isHistory=1&recordId='+recordId +'&id=' +examId +'&goodsid=' +goodsId +'&moduleId='+moduleId+'&chapterId=' +chapterExamId
 						})
 			            console.log('查看上次答题');
 			        }

+ 11 - 9
pages2/bank/question_statistics.vue

@@ -38,15 +38,12 @@
 
 						<template v-if="item1.showList">
 							<view v-for="(item2, index2) in item1.list" :key="index2">
-								<view class="section" @click="changeItem(index1, item2.chapterExamId, item1.type)">
+								<view class="section" @click="changeItem(item1.majorId,index1, item2.chapterExamId, item1.type,index2)">
 									<!-- <image src="/static/icon/up1.png" class="icon_up" v-if="!item2.showList"></image>
 									<image src="/static/icon/down1.png" class="icon_up" v-if="item2.showList"></image> -->
 									<u-icon name="arrow-up" color="#999" size="24" v-if="item2.showList"></u-icon>
 									<u-icon name="arrow-down" color="#999" size="24" v-if="!item2.showList"></u-icon>
-									<text
-										style="margin-left:34rpx;font-size: 24rpx;
-		color:#666;"
-									>
+									<text style="margin-left:34rpx;font-size: 24rpx;color:#666;">
 										{{ item2.name }}
 									</text>
 								</view>
@@ -94,7 +91,7 @@
 					</template>
 
 					<template v-if="item1.type == 2">
-						<view class="section" @click="changeItem(index1, item1.majorId, item1.type)">
+						<view class="section" @click="changeItem(0,index1, item1.majorId, item1.type)">
 							<!-- <image src="/static/icon/up1.png" class="icon_up" v-if="!item1.showList"></image>
 							<image src="/static/icon/down1.png" class="icon_up" v-if="item1.showList"></image> -->
 							<u-icon name="arrow-up" color="#999" size="24" v-if="item1.showList"></u-icon>
@@ -102,7 +99,7 @@
 							<text style="margin-left:34rpx;font-size: 24rpx;color:#666;">{{ item1.name }}</text>
 						</view>
 						<view v-if="item1.showList">
-							<view class="article" :key="index3" v-for="(article, index2) in item1.list">
+							<view class="article" :key="index2" v-for="(article, index2) in item1.list">
 								<view class="flex-auto">
 									<view class="tit">{{ article.name }}</view>
 									<view class="desc">
@@ -327,6 +324,7 @@ export default {
 
 			this.$api
 				.goodsChapterDolist({
+					goodsId: this.id,
 					moduleExamId: id
 				})
 				.then(res => {
@@ -334,7 +332,7 @@ export default {
 					this.$set(this.bankList[index], 'list', res.data.data);
 				});
 		},
-		changeItem(index1, id, type) {
+		changeItem(moduleExamId,index1, id, type,index2) {
 			if (type == 1) {
 				if (this.bankList[index1].list[index2].list) {
 					this.$set(this.bankList[index1].list[index2], 'showList', !this.bankList[index1].list[index2].showList);
@@ -342,7 +340,9 @@ export default {
 				}
 
 				this.$api
-					.goodsExamList({
+					.goodsExamDolist({
+						goodsId: this.id,
+						moduleExamId: moduleExamId,
 						chapterExamId: id
 					})
 					.then(res => {
@@ -357,6 +357,8 @@ export default {
 
 				this.$api
 					.goodsExamDolist({
+						goodsId: this.id,
+						moduleExamId: moduleExamId,
 						chapterExamId: id
 					})
 					.then(res => {

+ 3 - 3
pages2/bank/wrongById.vue

@@ -26,10 +26,10 @@
 					<view class="bt">
 						<view class="left">错题数<text class="num">{{item.wrongQuestionNum}}</text></view>
 						<view class="right">
-							<navigator  hover-class="none" :url="'/pages2/subject/wrongBank?id='+item.examId">
+							<navigator  hover-class="none" :url="'/pages2/subject/wrongBank?examId='+item.examId">
 								<view class="btn">重做</view>
 							</navigator>
-							<navigator  hover-class="none" :url="'/pages2/subject/wrongBank?id='+item.examId+'&explain=1'">
+							<navigator  hover-class="none" :url="'/pages2/subject/wrongBank?examId='+item.examId+'&explain=1'">
 								<view class="btn">解析</view>
 							</navigator>
 							<!-- <view class="btn">解析</view> -->
@@ -290,7 +290,7 @@ page {
 }
 .wrongList{
 	margin-top:20rpx;
-	.item{;
+	.item{
 		background: #FFFFFF;
 		border-radius: 16rpx;
 		padding: 0 30rpx;

+ 5 - 5
pages2/class/detail.vue

@@ -43,7 +43,7 @@
 			
 			<!--目录 -->
 			<view v-show="current == 0">
-				<view class="menuBox" v-for="(item, index) in menuList">
+				<view class="menuBox" v-for="(item, index) in menuList" :key="index">
 					<!--模块 -->
 					<view v-if="item.type == 1"><courseModule :courseId="courseId" :goodsId="goodsId" :gradeId="gradeId" :isBuy="true" :menuItem="item" :levelId="item.menuId"></courseModule></view>
 					<!--章 -->
@@ -62,10 +62,10 @@
 					</view>
 					<view style="color: #007AFF;font-size: 30rpx;font-weight: bold;width: 15%;text-align: center;" @click="postNote">提交</view>
 				</view>
-				<view v-for="(item, index) in noteList">
+				<view v-for="(item, index) in noteList" :key="index">
 					<view class="dateBox">{{ $method.timestampToTime(item.dateNote) }}</view>
 					<view class="noteBox">
-						<view v-for="(item1, index1) in item.userNotes" style="margin-top: 30rpx;" @click="jumpNote(item1)">
+						<view v-for="(item1, index1) in item.userNotes" :key="index1" style="margin-top: 30rpx;" @click="jumpNote(item1)">
 							<view style="display: flex;">
 								<view>
 									<view>
@@ -91,7 +91,7 @@
 					</view>
 					<view class="btn" @click="postContent">提交</view>
 				</view>
-				<view v-for="(item, index) in answerList" style="background-color: #FFFFFF;margin-bottom: 20rpx;">
+				<view v-for="(item, index) in answerList" :key="index" style="background-color: #FFFFFF;margin-bottom: 20rpx;">
 					<view class="chat_box" @click.stop="clearCtx">
 						<view style="display: flex;">
 							<view><image :src="$method.splitImgHost(item.avatar)" style="width: 64rpx;height: 64rpx;"></image></view>
@@ -114,7 +114,7 @@
 			</view>
 			<!--目录 -->
 			<view v-show="current == 3" >
-				<view class="menuBox" v-for="(item, index) in reMenuList">
+				<view class="menuBox" v-for="(item, index) in reMenuList" :key="index">
 					<!--模块 -->
 					<view v-if="item.type == 1"><courseModule :courseId="courseId" :gradeId="gradeId" :isRebuild="true" :isBuy="true" :menuItem="item" :levelId="item.menuId"></courseModule></view>
 					<!--章 -->

+ 42 - 24
pages2/class/questionBank.vue

@@ -81,11 +81,11 @@
 								<view class="pad_8 answer">
 									<view>
 										正确答案:
-										<text v-for="ansItem in bank.ans">{{ ast[ansItem - 1] }}</text>
+										<text v-for="(ansItem,ansItemIndex) in bank.ans" :key="ansItemIndex">{{ ast[ansItem - 1] }}</text>
 									</view>
 									<view>
 										我的答案:
-										<text v-for="quesItem in bank.ques">{{ ast[quesItem - 1] }}</text>
+										<text v-for="(quesItem,quesItemIndex) in bank.ques" :key="quesItemIndex">{{ ast[quesItem - 1] }}</text>
 									</view>
 								</view>
 								<view class="pad_8 answerInfos">
@@ -137,7 +137,7 @@
 									</view>
 									<view class="textarea"><textarea v-model="bank.ansText.text" placeholder="在此输入答案"></textarea></view>
 									<view class="imgs">
-										<view class="img" v-for="(img, imgIndex) in bank.ansText.imageList">
+										<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>
@@ -146,7 +146,7 @@
 								<view class="ans_submit answerInfos" v-if="bank.ques">
 									<view class="answerTitle">我的答案:</view>
 									{{ bank.ques.text }}
-									<view class="imgs"><image class="img" v-for="ques in bank.ques.imageList" :src="$method.splitImgHost(ques, true)"></image></view>
+									<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">
@@ -187,7 +187,7 @@
 										</view>
 									</view>
 									<view v-if="bank.ques[ansIndex]">
-										<view v-for="(option, childIndex) in ansItem.optionsList" :key="index" class="lisSty">
+										<view v-for="(option, childIndex) in ansItem.optionsList" :key="childIndex" class="lisSty">
 											<text
 												:class="{
 													right: option.optionsId == bank.ques[ansIndex] || option.optionsId == bank.ans[ansIndex],
@@ -237,11 +237,11 @@
 										<view class="pad_8 answer">
 											<view>
 												正确答案:
-												<text v-for="ansItem1 in bank.ans[ansIndex]">{{ ast[ansItem1 - 1] }}</text>
+												<text :key="ansItemIndex1" v-for="(ansItem1,ansItemIndex1) in bank.ans[ansIndex]">{{ ast[ansItem1 - 1] }}</text>
 											</view>
 											<view>
 												我的答案:
-												<text v-for="quesItem in bank.ques[ansIndex]">{{ ast[quesItem - 1] }}</text>
+												<text :key="quesItemIndex" v-for="(quesItem,quesItemIndex) in bank.ques[ansIndex]">{{ ast[quesItem - 1] }}</text>
 											</view>
 										</view>
 										<view class="pad_8 answerInfos">
@@ -295,7 +295,7 @@
 											</view>
 											<view class="textarea"><textarea v-model="ansItem.ansText.text" placeholder="在此输入答案"></textarea></view>
 											<view class="imgs">
-												<view class="img" v-for="(img, imgIndex) in ansItem.ansText.imageList">
+												<view class="img" :key="imgIndex" v-for="(img, imgIndex) in ansItem.ansText.imageList">
 													<text @click="deleteImgChild(imgIndex, bankIndex, ansIndex)">x</text>
 													<image :src="$method.splitImgHost(img, true)"></image>
 												</view>
@@ -305,7 +305,7 @@
 											<view class="answerTitle">答案我的</view>
 											{{ bank.ques[ansIndex].text }}
 											<view class="imgs">
-												<image class="img" v-for="ques in bank.ques[ansIndex].imageList" :src="$method.splitImgHost(ques, true)"></image>
+												<image class="img" :key="quesIndex" v-for="(ques,quesIndex) in bank.ques[ansIndex].imageList" :src="$method.splitImgHost(ques, true)"></image>
 											</view>
 										</view>
 									</view>
@@ -509,6 +509,23 @@ export default {
 			for (var k in globalData.bankData) {
 				this[k] = globalData.bankData[k];
 			}
+
+			this.timer = setInterval(() => {
+				if (this.lastTime <= 0) {
+					clearInterval(this.timer);
+					uni.showToast({
+						icon:'none',
+						title:'考试时间到,自动交卷',
+						duration:1000
+					})
+
+					setTimeout(() => {
+						this.submit();
+					}, 1000);
+					return;
+				}
+				this.lastTime--;
+			}, 1000);
 		} else {
 			this.goodsQuestionList();
 			this.bankExam();
@@ -523,6 +540,7 @@ export default {
 		if (this.needBack) {
 			let app = getApp();
 			app.globalData.bankData = this.$data;
+			clearInterval(this.timer);
 			uni.navigateTo({
 				url: '/pages2/bank/questionBank?id=' + this.id + '&goodsid=' + this.goodsId + '&isback=true'
 			});
@@ -868,8 +886,8 @@ export default {
 
 			this.$api
 				.bankRecordEdit({
-					chapterId:this.chapterId,
-					moduleId:this.moduleId,
+					chapterId:this.chapterId || 0,
+					moduleId:this.moduleId || 0,
 					examId: this.id,
 					goodsId: this.goodsId,
 					recordId:this.recordId,
@@ -990,8 +1008,8 @@ export default {
 
 				this.$api
 					.bankRecordEdit({
-						chapterId:this.chapterId,
-						moduleId:this.moduleId,
+						chapterId:this.chapterId || 0,
+						moduleId:this.moduleId || 0,
 						gradeId:this.gradeId,
 						examId: this.id,
 						courseId:this.courseId,
@@ -1053,15 +1071,15 @@ export default {
 						this.timer = setInterval(() => {
 							if (this.lastTime <= 0) {
 								clearInterval(this.timer);
-								uni.showModal({
-									title: '提示',
-									content: '考试时间到,自动交卷',
-									confirmText: '确定',
-									showCancel: false,
-									success: res => {
-										this.submit();
-									}
-								});
+								uni.showToast({
+									icon:'none',
+									title:'考试时间到,自动交卷',
+									duration:1000
+								})
+
+								setTimeout(() => {
+									this.submit();
+								}, 1000);
 								return;
 							}
 							this.lastTime--;
@@ -1409,8 +1427,8 @@ export default {
 			//交卷
 			this.$api
 				.bankRecordEdit({
-					moduleId:this.moduleId,
-					chapterId:this.chapterId,
+					moduleId:this.moduleId || 0,
+					chapterId:this.chapterId || 0,
 					gradeId:this.gradeId,
 					examId: this.id,
 					goodsId: this.goodsId,

+ 3 - 8
pages2/course/detail.vue

@@ -28,7 +28,7 @@
 					</view>
 					<view style="display: flex;justify-content: space-between;margin-top: 13rpx;">
 						<view class="noteTag"><image src="/static/icon/wk_icon1.png" class="wk_icon"></image>
-						共 <text class="blackFont">{{detail.subjectNum}}</text> 科 {{detail.classHours}}</text> 学时</view>
+						共 <text class="blackFont">{{detail.subjectNum}} 科 {{detail.classHours}}</text> 学时</view>
 						
 					</view>
 				</view>
@@ -40,18 +40,13 @@
 			
 		</view>
 		<view style="padding: 20rpx;position: relative;top: 680rpx;" v-show="current==0">
-<<<<<<< HEAD
-			<view class="content">
-				<view v-html="detail.mobileDetailHtml" style="width: 100%;overflow: hidden;"></view>
-=======
 			<view class="content" style="padding: 10rpx;">
 				<view v-html="detail.mobileDetailHtml" style="width: 100%;"></view>
->>>>>>> 50b8991b1bbfc147f6098874fb80946439feb3c1
 			</view>
 		</view>
 		<view style="padding: 20rpx;padding-bottom: 100rpx;position: relative;top: 680rpx;" v-show="current==1">
 			<view >
-				<view v-for="(item,index) in courseList" >
+				<view v-for="(item,index) in courseList" :key="index" >
 					<view class="courseItemBox" >
 						<view class="courseItem" @click="openCourse(item)">
 							<view class="courseName">{{item.courseName}}</view>
@@ -61,7 +56,7 @@
 							</view>
 						</view>
 						<view v-show="!item.down">
-							<view v-for="(itemM,indexM) in menuList" >
+							<view v-for="(itemM,indexM) in menuList"  :key="indexM">
 								<courseModule v-if="itemM.type==1" :menuItem="itemM"></courseModule>
 								<courseChapter v-if="itemM.type==2" :isBuy="false" :menuItem="itemM"></courseChapter>
 								<courseSection v-if="itemM.type==3" :isBuy="false" :menuItem="itemM"></courseSection>

+ 3 - 3
pages2/order/confirm_list.vue

@@ -17,7 +17,7 @@
 					<view v-if="detail.templateType!=null&&detail.goodsType==1">
 						<u-line color="#D6D6DB" />
 						<view v-if="detail.templateType=='class'" style="display: flex;justify-content: space-between;align-items: center;height: 50rpx;" @click="openPopup(0)">
-							<view style="color: #666666;font-size: 24rpx;">{{gradeIndex<0?'选择班级':gradeList[gradeIndex].className}}</view>
+							<view style="color: #666666;font-size: 24rpx;">{{gradeIndex < 0 ?'选择班级':gradeList[gradeIndex].className}}</view>
 							<view><u-icon name="arrow-right" color="#999999" size="28"></u-icon></view>
 						</view>
 						<view v-if="detail.templateType=='apply'"  style="display: flex;justify-content: space-between;align-items: center;height: 50rpx;" @click="openPopup(1)">
@@ -35,7 +35,7 @@
 			</view>
 		</view>
 		
-		<u-popup v-model="show" mode="bottom"border-radius="40">
+		<u-popup v-model="show" mode="bottom" border-radius="40">
 			<view class="popup_box">
 				<view style="margin-bottom: 20rpx;">
 					<view class="line1"></view>
@@ -74,7 +74,7 @@
 				</view>
 			</view>
 		</u-popup>
-		<u-popup v-model="show1" mode="bottom"border-radius="40">
+		<u-popup v-model="show1" mode="bottom" border-radius="40">
 			<view class="popup_box">
 				<view style="margin-bottom: 20rpx;">
 					<view class="line1"></view>

+ 1 - 1
pages2/order/confirm_pay.vue

@@ -5,7 +5,7 @@
 				<view class="box2">
 					<view class="title2">支付信息</view>
 					<u-line color="#D6D6DB" />
-					<view style="padding:10rpx 30rpx;" v-for="(item,index) in shoppingCartList">
+					<view style="padding:10rpx 30rpx;" v-for="(item,index) in shoppingCartList" :key="index">
 						<view class="list_item">
 							<view class="txt_left">商品名称</view>
 							<view class="txt_right">{{item.goodsName}}</view>

+ 1 - 1
pages2/order/index.vue

@@ -5,7 +5,7 @@
 		</view>
 		<view style="padding-top: 96rpx;">
 			<view v-if="!order.length" class="noData">您暂无相关订单哦~</view>
-			<view v-else v-for="(item, index) in order" style="padding: 20rpx 20rpx 0rpx 20rpx" class="lisChild">
+			<view v-else v-for="(item, index) in order" :key="index" style="padding: 20rpx 20rpx 0rpx 20rpx" class="lisChild">
 				<view class="item">
 					<view style="display: flex;justify-content: space-between;align-items: center;height: 50rpx;" @click="openPopup(index)">
 						<view style="color: #666666;font-size: 24rpx;">订单编号:{{ item.orderSn }}</view>

+ 1 - 1
pages2/plan/index.vue

@@ -40,7 +40,7 @@
 				<view style="width: 100%;display: flex;justify-content: center;" v-else>
 					<image class="date_line_close" @click="close_calendar" src="/static/close_card.png"></image>
 				</view>
-				<view v-for="(item, index) in workList">
+				<view v-for="(item, index) in workList" :key="index">
 					<view style="margin-left: 30rpx;margin-top: 10rpx;display: flex;align-items: center;" @click="jumpDetail(item)">
 						<text class="date_t2">{{ item.goodsName }}</text>
 						<view class="circle_num" style="margin-left: 20rpx;">{{ item.chapterNum }}</view>

+ 9 - 9
pages2/subject/collectBank.vue

@@ -69,10 +69,10 @@
 							<view v-if="bank.ques">
 								<view class="pad_8 answer">
 									<view>正确答案:
-										<text v-for="ansItem in bank.ans">{{ast[ansItem-1]}}</text>
+										<text v-for="(ansItem,ansItemIndex) in bank.ans" :key="ansItemIndex">{{ast[ansItem-1]}}</text>
 									</view>
 									<view v-if="!explain">我的答案:
-										<text v-for="quesItem in bank.ques">{{ast[quesItem-1]}}</text>
+										<text v-for="(quesItem,quesItemIndex) in bank.ques" :key="quesItemIndex">{{ast[quesItem-1]}}</text>
 									</view>
 								</view>
 								<view class="pad_8 answerInfos">
@@ -125,7 +125,7 @@
 										<textarea v-model="bank.ansText.text" placeholder="在此输入答案"></textarea>
 									</view>
 									<view class="imgs">
-										<view class="img" v-for="(img,imgIndex) in bank.ansText.imageList" >
+										<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>
@@ -135,7 +135,7 @@
 									<view class="answerTitle">我的答案:</view>
 									{{bank.ques.text}}
 									<view class="imgs">
-										<image class="img" v-for="ques in bank.ques.imageList" :src="$method.splitImgHost(ques,true)"></image>
+										<image class="img" :key="quesIndex" v-for="(ques,quesIndex) in bank.ques.imageList" :src="$method.splitImgHost(ques,true)"></image>
 									</view>
 								</view>
 							</view>
@@ -166,7 +166,7 @@
 										</view>
 									</view>
 									<view v-if="bank.ques[ansIndex]">
-										<view v-for="(option, childIndex) in ansItem.optionsList" :key="index" class="lisSty">
+										<view v-for="(option, childIndex) in ansItem.optionsList" :key="childIndex" class="lisSty">
 											<text :class="{right:(option.optionsId == bank.ques[ansIndex]) || (option.optionsId == bank.ans[ansIndex]),wrong:(option.optionsId == bank.ques[ansIndex]) && (bank.ques[ansIndex] != bank.ans[ansIndex])}"  class="activeTI">{{ ast[childIndex] }}</text>
 											<rich-text :nodes="option.content"></rich-text>
 										</view>
@@ -204,10 +204,10 @@
 									<view v-if="bank.ques[ansIndex]">
 										<view class="pad_8 answer">
 											<view>正确答案:
-												<text v-for="ansItem1 in bank.ans[ansIndex]">{{ast[ansItem1-1]}}</text>
+												<text v-for="(ansItem1,ansItemIndex1) in bank.ans[ansIndex]" :key="ansItemIndex1">{{ast[ansItem1-1]}}</text>
 											</view>
 											<view v-if="!explain">我的答案:
-												<text v-for="quesItem in bank.ques[ansIndex]">{{ast[quesItem-1]}}</text>
+												<text v-for="(quesItem,quesItemIndex) in bank.ques[ansIndex]" :key="quesItemIndex">{{ast[quesItem-1]}}</text>
 											</view>
 										</view>
 										<view class="pad_8 answerInfos">
@@ -260,7 +260,7 @@
 												<textarea v-model="ansItem.ansText.text" placeholder="在此输入答案"></textarea>
 											</view>
 											<view class="imgs">
-												<view class="img" v-for="(img,imgIndex) in ansItem.ansText.imageList" >
+												<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>
@@ -270,7 +270,7 @@
 											<view class="answerTitle">答案我的</view>
 											{{bank.ques[ansIndex].text}}
 											<view class="imgs">
-												<image class="img" v-for="ques in bank.ques[ansIndex].imageList" :src="$method.splitImgHost(ques,true)"></image>
+												<image class="img" :key="quesIndex" v-for="(ques,quesIndex) in bank.ques[ansIndex].imageList" :src="$method.splitImgHost(ques,true)"></image>
 											</view>
 										</view>
 									</view>

+ 1 - 1
pages2/subject/wrong.vue

@@ -318,7 +318,7 @@ page {
 }
 .wrongList{
 	margin-top:20rpx;
-	.item{;
+	.item{
 		background: #FFFFFF;
 		border-radius: 16rpx;
 		padding: 0 30rpx;

+ 7 - 7
pages2/subject/wrongTypeBank.vue

@@ -125,7 +125,7 @@
 										<textarea v-model="bank.ansText.text" placeholder="在此输入答案"></textarea>
 									</view>
 									<view class="imgs">
-										<view class="img" v-for="(img,imgIndex) in bank.ansText.imageList" >
+										<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>
@@ -135,7 +135,7 @@
 									<view class="answerTitle">我的答案:</view>
 									{{bank.ques.text}}
 									<view class="imgs">
-										<image class="img" v-for="ques in bank.ques.imageList" :src="$method.splitImgHost(ques,true)"></image>
+										<image class="img" :key="quesIndex" v-for="(ques,quesIndex) in bank.ques.imageList" :src="$method.splitImgHost(ques,true)"></image>
 									</view>
 								</view>
 							</view>
@@ -166,7 +166,7 @@
 										</view>
 									</view>
 									<view v-if="bank.ques[ansIndex]">
-										<view v-for="(option, childIndex) in ansItem.optionsList" :key="index" class="lisSty">
+										<view v-for="(option, childIndex) in ansItem.optionsList" :key="childIndex" class="lisSty">
 											<text :class="{right:(option.optionsId == bank.ques[ansIndex]) || (option.optionsId == bank.ans[ansIndex]),wrong:(option.optionsId == bank.ques[ansIndex]) && (bank.ques[ansIndex] != bank.ans[ansIndex])}"  class="activeTI">{{ ast[childIndex] }}</text>
 											<rich-text :nodes="option.content"></rich-text>
 										</view>
@@ -204,10 +204,10 @@
 									<view v-if="bank.ques[ansIndex]">
 										<view class="pad_8 answer">
 											<view>正确答案:
-												<text v-for="ansItem1 in bank.ans[ansIndex]">{{ast[ansItem1-1]}}</text>
+												<text :key="ansItemIndex1" v-for="(ansItem1,ansItemIndex1) in bank.ans[ansIndex]">{{ast[ansItem1-1]}}</text>
 											</view>
 											<view v-if="!explain">我的答案:
-												<text v-for="quesItem in bank.ques[ansIndex]">{{ast[quesItem-1]}}</text>
+												<text :key="quesItemIndex" v-for="(quesItem,quesItemIndex) in bank.ques[ansIndex]">{{ast[quesItem-1]}}</text>
 											</view>
 										</view>
 										<view class="pad_8 answerInfos">
@@ -260,7 +260,7 @@
 												<textarea v-model="ansItem.ansText.text" placeholder="在此输入答案"></textarea>
 											</view>
 											<view class="imgs">
-												<view class="img" v-for="(img,imgIndex) in ansItem.ansText.imageList" >
+												<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>
@@ -270,7 +270,7 @@
 											<view class="answerTitle">答案我的</view>
 											{{bank.ques[ansIndex].text}}
 											<view class="imgs">
-												<image class="img" v-for="ques in bank.ques[ansIndex].imageList" :src="$method.splitImgHost(ques,true)"></image>
+												<image class="img" :key="quesIndex" v-for="(ques,quesIndex) in bank.ques[ansIndex].imageList" :src="$method.splitImgHost(ques,true)"></image>
 											</view>
 										</view>
 									</view>