调整跳转

pages/selectGradesTerms/index.vue

@@ -26,7 +26,8 @@
 	} from "vue";
 	import {
 		nianji_list,
-		xueke_list
+		xueke_list,
+		SHUXUE,YINGYU
 	} from "@/utils/constant.js";
 	import {
 		onLoad
@@ -86,11 +87,11 @@
 		}) {
 			updateXueke(data.activeNianji, data.activeXueke)
 			// 数序
-			data.activeXueke == 1 && uni.redirectTo({
+			data.activeXueke == SHUXUE && uni.redirectTo({
 				url: `/pages/study/index?xueke=${data.activeXueke}&nianji=${data.activeNianji}&flag=selectGrades`
 			})
 			// 英语
-			data.activeXueke == 2 && uni.redirectTo({
+			data.activeXueke == YINGYU && uni.redirectTo({
 				url: `/pages/study/index?xueke=${data.activeXueke}&nianji=${data.activeNianji}&flag=selectGrades`
 			})
 		}

pages/unitTest/index.vue

@@ -59,6 +59,7 @@
 	import {
 		getAuth
 	} from '@/utils/auth.js';
+	import { SHUXUE,YINGYU } from "@/utils/constant.js"
 
 	const {
 		count,
@@ -98,11 +99,11 @@
 		}))
 		
 		// 数学	
-		xueke.value == 1 && uni.redirectTo({
+		xueke.value == SHUXUE && uni.redirectTo({
 			url: `/pages/study/index?nianji=${nianji.value}&xueke=${xueke.value}&zhangId=${data.zhangId}`
 		})
 		// 英语
-		xueke.value == 2 && uni.redirectTo({
+		xueke.value == YINGYU && uni.redirectTo({
 			url: `/pages/study/index?nianji=${nianji.value}&xueke=${xueke.value}&zhangId=${data.zhangId}`
 		})
 	}
@@ -111,11 +112,11 @@
 	
 	function handleBack() {
 		// 数学
-		xueke.value == 1 && uni.redirectTo({
+		xueke.value == SHUXUE && uni.redirectTo({
 			url: `/pages/study/index?nianji=${nianji.value}&xueke=${xueke.value}&zhangId=${zhangId.value}`
 		})
 		// 英语
-		xueke.value == 1 && uni.redirectTo({
+		xueke.value == YINGYU && uni.redirectTo({
 			url: `/pages/study/index?nianji=${nianji.value}&xueke=${xueke.value}&zhangId=${zhangId.value}`
 		})
 	}

pages/unitTest/useUnit.js

@@ -15,7 +15,7 @@ import {
 	toast
 } from "@/utils/common.js"
 import * as httpUnit from "@/api/unitTest.js"
-import {getXueke} from "@/utils/cacheManager.js"
+import cacheManager, {useXuekeNianji,useUnitTestTishi} from "@/utils/cacheManager.js"
 	
 
 function useJifen() {
@@ -39,9 +39,14 @@ function useJifen() {
 }
 
 export function useExam() {
+	// 缓存
+	const {getXueke} = useXuekeNianji();
+	const { updateTishi, getTishi} = useUnitTestTishi();
+
 	const {	showTishi, handleCloseTishi, handleShowTishi} = useTishiLeftRight()
 	const {rightAnswer,wrongAnswer,jifen, updateJifen} = useJifen();
-	const {getXueke} = getXueke();
+
+	
 	const data = reactive({
 		count: 0, // 已答题数
 		total: 0, // 总题数
@@ -52,8 +57,8 @@ export function useExam() {
 		nianji: null,
 		xueke: null,
 	})
-	const {xueke} = getXueke();
 	onLoad((options) => {
+		const { xueke } = getXueke();
 		const {
 			jieId,zhangId,nianji
 		} = options;
@@ -143,12 +148,12 @@ function useTishiLeftRight() {
 	const showTishi = ref(false);
 	// 大鹅关闭追加缓存 --- 单独针对当前手机的缓存提示
 	function handleCloseTishi() {
-		uni.setStorageSync('isShowTishi','has');
+		updateTishi();
 		showTishi.value = false;
 	}
 	// 大鹅显示追加缓存 --- 单独针对当前手机的缓存提示
 	function handleShowTishi() {
-		const isNotShow = Boolean(uni.getStorageSync('isShowTishi'));
+		const isNotShow = Boolean(getTishi());
 		showTishi.value = !isNotShow;
 	}
 	

utils/cacheManager.js

@@ -96,17 +96,21 @@ const cacheManager = (function() {
 
 export default cacheManager;
 
+// 单元测试 引导大鹅提示 缓存Key
+export const SHOW_UNIT_TEST_TISHI = 'SHOW_UNIT_TEST_TISHI';
+// 年级学科 缓存Key
+export const NIANJI_XUEKE = 'SHOW_UNIT_TEST_TISHI';
 
+// 学科年级业务缓存
 export function useXuekeNianji() {
-	const code = 'NianjiAndXueke';
 	// 学科
 	function updateXueke(nianji, xueke) {
-		cacheManager.set(code, { nianji,xueke })
+		cacheManager.set(NIANJI_XUEKE, { nianji,xueke })
 	}
 	
 	// 获取学科年级
 	function getXueke() {
-		return cacheManager.get(code)
+		return cacheManager.get(NIANJI_XUEKE)
 	}
 	
 	return {
@@ -114,3 +118,11 @@ export function useXuekeNianji() {
 		getXueke
 	}
 }
+
+// 单元测试大鹅提示缓存
+export function useUnitTestTishi() {
+	return {
+		updateTishi:() => cacheManager.set(SHOW_UNIT_TEST_TISHI,'has'),
+		getTishi: () => cacheManager.get(SHOW_UNIT_TEST_TISHI);
+	}
+}

utils/constant.js

@@ -24,15 +24,17 @@
 		id: 6
 	},
 ];
-
+export const SHUXUE = 1; // 数学
+export const YINGYU = 1; // 英语
  
 export const xueke_list = [
 	{
 		label: "数学",
-		id: 1
+		id: SHUXUE
 	},
 	{
 		label: "英语",
-		id:2
+		id: YINGYU
 	}
-]
+]
+