参数调整

pages/unitTest/useUnit.js

@@ -67,8 +67,6 @@ export function useExam() {
 		list: [], // 试题列表
 		jieId: null, // 节Id
 		zhangId: null,
-		nianji: null,
-		xueke: null,
 		haveFlag: false, // 是否有下一章
 		activeZhang: null,
 		studyFlag: 0, // 是否是第一次答题
@@ -84,8 +82,6 @@ export function useExam() {
 
 		data.jieId = jieId; // 需要路由参数 节Id
 		data.zhangId = zhangId; // 需要路由参数 章Id
-		data.nianji = nianji; // 需要年纪Id 来执行返回页面
-		data.xueke = cardId; // 需要年纪Id 来执行返回页面
 		data.activeZhang = getZhangInfoByJieId(cacheZhangInfo.zhangList,jieId);
 		data.haveFlag = data.activeZhang.curZhang ? data.activeZhang.curZhang.haveFlag: 0;
 		data.studyFlag = data.activeZhang.curZhang ? data.activeZhang.curZhang.jieList[data.activeZhang.curZhang.jieList.length-1].studyFlag: 0;

pages/wrong/index.vue

@@ -65,8 +65,8 @@
 			</view>
 		</view>
 
-		<cuoti ref="wrongRef" :cardId="cardId" :list="data.wrongList" @back="handleBackFromCuoti"></cuoti>
-		<CustomTabBar :cardId="cardId+''" :nianji="nianji" :zhangId="zhangId"></CustomTabBar>
+		<cuoti ref="wrongRef" :subjectId="subjectId" :list="data.wrongList" @back="handleBackFromCuoti"></cuoti>
+		<CustomTabBar></CustomTabBar>
 	</view>
 </template>
 
@@ -89,7 +89,7 @@
 
 	const zhangId = ref(null);
 	const nianji = ref(null);
-	const cardId = ref(null);
+	const subjectId = ref(null);
 
 	const wrongRef = ref(null);
 
@@ -121,7 +121,7 @@
 		},
 		wrongList: [],
 	})
-	cardId.value = data.current+1;
+	subjectId.value = data.current+1;
 	function handleBack() {
 		uni.redirectTo({
 			url: '/pages/my/index'
@@ -137,7 +137,7 @@
 	function onChangeTab(e) {
 		if (data.current !== e.currentIndex) {
 			data.current = e.currentIndex;
-			cardId.value = data.current+1;
+			subjectId.value = data.current+1;
 			if (data.current == 0) {
 				data.shuxue.page = 0
 			} else if (data.current == 1) {
@@ -151,7 +151,7 @@
 		const opt = {
 			page: 1,
 			size: 10, // 固定查询10条
-			cardId: data.current + 1 // 前台索引加1为学科cardId
+			subjectId: data.current + 1 // 前台索引加1为学科cardId
 		}
 
 		if (code == 0) {
@@ -214,7 +214,7 @@
 		const opt = {
 			page: 1,
 			size: 10, // 固定查询10条
-			cardId: data.current + 1 // 前台索引加1为学科cardId
+			subjectId: data.current + 1 // 前台索引加1为学科cardId
 		}
 
 		if (code == 0) {
@@ -300,7 +300,7 @@
 
 	function getCuotiData(item) {
 		getWrongInfo({
-			cardId: data.current + 1,
+			subjectId: data.current + 1,
 			cdate: item.cdate
 		}).then(res => {
 			formatListToUse(res.data)