zc

pages_safetyEducationExamination/utils/index.js

@@ -36,11 +36,24 @@ export async function goToExamPage(item, callbacks = {}) {
 			url: `/pages_safetyEducationExamination/views/webViewPage/courseLearning?courseId=${item.courseId}&examId=${item.examId}`,
 		});
 	} else if (item.conditionType == 3) {
+		console.log('item',item)
+		const pages = getCurrentPages();
+		const currentPage = pages[pages.length - 1];
+		const currentRoute = currentPage.route; 
 		if (item.mockExamId) {
 			const examData = encodeURIComponent(JSON.stringify(item));
 			uni.navigateTo({
-				url: `/pages_safetyEducationExamination/views/exam/mockExamInfo?examData=${examData}`,
+				url: `/pages_safetyEducationExamination/views/exam/mockExamPlay?examId=${item.examId}&attemptId=${item.mockExamId}`,
 			});
+			// if(currentRoute == 'pages_safetyEducationExamination/views/exam/mockExamInfo' || currentRoute == 'pages_safetyEducationExamination/views/exam/onlineExamInfo'){
+			// 	uni.navigateTo({
+			// 		url: `/pages_safetyEducationExamination/views/exam/mockExamPlay?examId=${item.examId}&attemptId=${item.mockExamId}`,
+			// 	});
+			// }else{
+			// 	uni.navigateTo({
+			// 		url: `/pages_safetyEducationExamination/views/exam/mockExamInfo?examData=${examData}`,
+			// 	});
+			// }
 		} else {
 			try {
 				const { data } = await examUserExamStart({ examId: item.examId, examScene: 2 });
@@ -48,8 +61,17 @@ export async function goToExamPage(item, callbacks = {}) {
 					const filled = { ...item, attemptId: data.data.attemptId };
 					const examData = encodeURIComponent(JSON.stringify(filled));
 					uni.navigateTo({
-						url: `/pages_safetyEducationExamination/views/exam/mockExamInfo?examData=${examData}`,
+						url: `/pages_safetyEducationExamination/views/exam/mockExamPlay?examId=${item.examId}&attemptId=${data.data.attemptId}`,
 					});
+					// if(currentRoute == 'pages_safetyEducationExamination/views/exam/mockExamInfo'){
+					// 	uni.navigateTo({
+					// 		url: `/pages_safetyEducationExamination/views/exam/mockExamPlay?examId=${item.examId}&attemptId=${data.data.attemptId}`,
+					// 	});
+					// }else{
+					// 	uni.navigateTo({
+					// 		url: `/pages_safetyEducationExamination/views/exam/mockExamInfo?examData=${examData}`,
+					// 	});
+					// }
 				} else {
 					uni.showToast({ title: data.message || '获取模拟试卷失败', icon: 'none' });
 				}

pages_safetyEducationExamination/views/exam/mockExamInfo.vue

@@ -51,6 +51,9 @@
 
 <script>
 	import {
+		goToExamPage,
+	} from '@/pages_safetyEducationExamination/utils/index.js'
+	import {
 		parseTime
 	} from '@/component/public.js'
 
@@ -85,9 +88,10 @@
 				}
 			},
 			startMockExam() {
-				uni.navigateTo({
-					url: `/pages_safetyEducationExamination/views/exam/mockExamPlay?examId=${this.examData.examId}&mockExamId=${this.examData.mockExamId || ''}&attemptId=${this.examData.attemptId || ''}`
-				});
+				goToExamPage(this.examData);
+				// uni.navigateTo({
+				// 	url: `/pages_safetyEducationExamination/views/exam/mockExamPlay?examId=${this.examData.examId}&mockExamId=${this.examData.mockExamId || ''}&attemptId=${this.examData.attemptId || ''}`
+				// });
 			}
 		}
 	}

pages_safetyEducationExamination/views/exam/mockExamPlay.vue

@@ -231,6 +231,7 @@
 			},
 		},
 		onLoad(options) {
+			console.log('options',options)
 			this.examId = options.examId || ''
 			this.attemptId = options.attemptId || ''
 			if (!this.attemptId) {
@@ -468,20 +469,13 @@
 						desc: '本次模拟考试成绩有效',
 						canRetake: false,
 					}
-				} else if (resp.canContinueExam === 1) {
+				} else {
 					this.resultData = {
 						title: '本次模拟考试不及格',
 						score: score,
 						desc: `未达及格线 ${this.examInfo.passScore} 分，可重新考试`,
 						canRetake: true,
 					}
-				} else {
-					this.resultData = {
-						title: '本次模拟考试不及格',
-						score: score,
-						desc: '未达及格线',
-						canRetake: false,
-					}
 				}
 			},
 			async retakeExam() {