update

pages/study/index.vue

@@ -90,8 +90,12 @@
 	}
 
 	function goKaoshi() {
+		let nextZhangId = selectZhang.value.nextZhang.zhangId;
+		let zhangId = selectZhang.value.zhangId;
+		let nianji = routeParams.value.nianji;
+		let xueqi = routeParams.value.xueqi;
 		uni.navigateTo({
-			url: `/pages/unitTest/index?jieId=1&nextZhangId=${selectZhang.value.nextZhang.zhangId}&zhangId=${selectZhang.value.zhangId}`
+			url: `/pages/unitTest/index?jieId=1&nextZhangId=${nextZhangId}&zhangId=${zhangId}&nianji=${nianji}&xueqi=${xueqi}`
 		})
 	}
 

pages/unitTest/index.vue

@@ -19,7 +19,7 @@
 
 		<!-- 答卷 -->
 		<chengji ref="chengjiRef" :list="list" :jieId="jieId" :zhangId="zhangId" :nextZhangId="nextZhangId"
-			:nianji="nianji"></chengji>
+			:nianji="nianji" :xueqi="xueqi"></chengji>
 
 		<!-- 分数弹窗 -->
 		<uniPointsVue ref="uniPointsRef" @checkAnswer="checkAnswer" @goStudy="goStudyContinue"></uniPointsVue>
@@ -75,10 +75,11 @@
 	function sendDataToStudyPage() {
 		// 设置 从单元测试 到 岛 的路由参数
 		setStudyStorage({
-			zhangId: zhangId.value,
 			nianji: nianji.value,
+			xueqi: xueqi.value,
+			zhangId: zhangId.value,
 			jieId: jieId.value,
-			nextZhangId: nextZhangId.value
+			nextZhangId: nextZhangId.value,
 		});
 	}
 

pages/unitTest/useUnit.js

@@ -48,18 +48,19 @@ export function useExam() {
 		zhangId: null,
 		nextZhangId: null,
 		nianji: null,
+		xueqi: null,
 	})
 	
 	onLoad((options) => {
 		const {
-			jieId,zhangId,nextZhangId,nianji
+			jieId,zhangId,nextZhangId,nianji,xueqi
 		} = options;
 		data.jieId = jieId; // 需要路由参数 节Id
 		data.zhangId = zhangId;// 需要路由参数 章Id
 		data.nextZhangId = nextZhangId; // 需要下一张id 来执行返回页面
 		data.nianji = nianji; // 需要年纪Id 来执行返回页面
-		
-		uni.$on('from.pages.study.index',(val) => {console.log('cccc',val)})
+		data.xueqi = xueqi; // 需要年纪Id 来执行返回页面
+	
 		
 		// 初始化页面数据
 		initPage();