Merge branch '2024鹅状元' of https://gogs.mtavip.com/wangguoyu/uniProject into 2024鹅状元

components/chengji/chengji.vue

@@ -79,6 +79,8 @@
 		}
 	})
 
+	const emits = defineEmits(['back'])
+
 	const current = ref(0)
 	const popupRef = ref(null)
 	const jiexiRef = ref(null);
@@ -95,9 +97,7 @@
 
 	function handleBack() {
 		// 从 单元测试 到 岛 的路由参数
-		uni.navigateTo({
-			url: `/pages/study/index?nianji=${props.nianji}&xueqi=${props.xueqi}&zhangId=${props.zhangId}&jieId=${props.jieId}`
-		})
+		emits('back')
 	}
 
 	function showAnswerResult(item) {

pages.json

@@ -74,6 +74,13 @@
 			{
 				"navigationStyle": "custom"
 			}
+		},
+		{
+			"path" : "pages/wrong/index",
+			"style" : 
+			{
+				"navigationStyle": "custom"
+			}
 		}
 	],
 	 "tabBar": {

pages/unitTest/index.vue

@@ -27,7 +27,7 @@
 		
 
 		<!-- 答卷 -->
-		<chengji ref="chengjiRef" :list="list" :jieId="jieId" :zhangId="zhangId"
+		<chengji ref="chengjiRef" :list="list" :jieId="jieId" :zhangId="zhangId" @back="handleBack"
 			:nianji="nianji" :xueke="xueke"></chengji>
 
 		<!-- 分数弹窗 -->
@@ -59,6 +59,7 @@
 	import {
 		getAuth
 	} from '@/utils/auth.js';
+
 	const {
 		count,
 		total,
@@ -96,13 +97,25 @@
 			zhangId:  zhangId.value
 		}))
 		
-		uni.navigateTo({
+		// 数学	
+		xueke.value == 1 && uni.navigateTo({
+			url: `/pages/study/index?nianji=${nianji.value}&xueke=${xueke.value}&zhangId=${data.zhangId}`
+		})
+		// 英语
+		xueke.value == 2 && uni.navigateTo({
 			url: `/pages/study/index?nianji=${nianji.value}&xueke=${xueke.value}&zhangId=${data.zhangId}`
 		})
 	}
 	
+	
+	
 	function handleBack() {
-		uni.navigateTo({
+		// 数学
+		xueke.value == 1 && uni.navigateTo({
+			url: `/pages/study/index?nianji=${nianji.value}&xueke=${xueke.value}&zhangId=${zhangId.value}`
+		})
+		// 英语
+		xueke.value == 1 && uni.navigateTo({
 			url: `/pages/study/index?nianji=${nianji.value}&xueke=${xueke.value}&zhangId=${zhangId.value}`
 		})
 	}

pages/unitTest/useUnit.js

@@ -15,6 +15,8 @@ import {
 	toast
 } from "@/utils/common.js"
 import * as httpUnit from "@/api/unitTest.js"
+import {getXueke} from "@/utils/cacheManager.js"
+	
 
 function useJifen() {
 	const data = reactive({
@@ -39,6 +41,7 @@ function useJifen() {
 export function useExam() {
 	const {	showTishi, handleCloseTishi, handleShowTishi} = useTishiLeftRight()
 	const {rightAnswer,wrongAnswer,jifen, updateJifen} = useJifen();
+	const {getXueke} = getXueke();
 	const data = reactive({
 		count: 0, // 已答题数
 		total: 0, // 总题数
@@ -49,10 +52,10 @@ export function useExam() {
 		nianji: null,
 		xueke: null,
 	})
-	
+	const {xueke} = getXueke();
 	onLoad((options) => {
 		const {
-			jieId,zhangId,nianji,xueke
+			jieId,zhangId,nianji
 		} = options;
 		data.jieId = jieId; // 需要路由参数 节Id
 		data.zhangId = zhangId;// 需要路由参数 章Id

pages/wrong/index.vue

@@ -0,0 +1,13 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script setup>
+	
+</script>
+
+<style>
+	       
+</style>