选择年级

pages/selectGradesTerms/index.vue

@@ -31,6 +31,10 @@
 	import {
 		onLoad
 	} from "@dcloudio/uni-app";
+	
+	import {useXuekeNianji} from "@/utils/cacheManager.js"
+		
+	const {	updateXueke, getXueke} = useXuekeNianji();	
 
 	function useSelectGrade() {
 
@@ -43,7 +47,8 @@
 			const {
 				nianji,
 				xueke
-			} = options;
+			} = getXueke();
+			
 			data.activeNianji = nianji;
 			data.activeXueke = xueke;
 		});
@@ -60,7 +65,7 @@
 
 			if (!data.activeXueke) {
 				uni.showToast({
-					title: "请选择学期",
+					title: "请选择学科",
 					duration: 2000,
 				});
 				return;
@@ -78,9 +83,14 @@
 		function goDAOToStudy({
 			nianji,
 			xueke,
-			text
 		}) {
-			uni.redirectTo({
+			updateXueke(data.activeNianji, data.activeXueke)
+			// 数序
+			data.activeXueke == 1 && uni.redirectTo({
+				url: `/pages/study/index?xueke=${data.activeXueke}&nianji=${data.activeNianji}&flag=selectGrades`
+			})
+			// 英语
+			data.activeXueke == 2 && uni.redirectTo({
 				url: `/pages/study/index?xueke=${data.activeXueke}&nianji=${data.activeNianji}&flag=selectGrades`
 			})
 		}
@@ -89,7 +99,7 @@
 			...toRefs(data),
 
 			// 方法
-			handleConfirm, // 选择年级+学期
+			handleConfirm, // 选择年级+学科
 		};
 	}
 

utils/cacheManager.js

@@ -94,4 +94,23 @@ const cacheManager = (function() {
 	};
 })();
 
-export default cacheManager;
+export default cacheManager;
+
+
+export function useXuekeNianji() {
+	const code = 'NianjiAndXueke';
+	// 学科
+	function updateXueke(nianji, xueke) {
+		cacheManager.set(code, { nianji,xueke })
+	}
+	
+	// 获取学科年级
+	function getXueke() {
+		return cacheManager.get(code)
+	}
+	
+	return {
+		updateXueke,
+		getXueke
+	}
+}