1

pages/login/login.vue

@@ -32,7 +32,10 @@
 		sendCode
 	} from "@/api/login.js"
 	import sliderDialog from './sliderDialog.vue'
-	import cacheManager from '@/utils/cacheManager.js';
+	import cacheManager from '@/utils/cacheManager.js';
+	import {useXuekeNianji} from "@/utils/cacheManager.js"
+		
+	const {	updateXueke, getXueke} = useXuekeNianji();	
 	export default {
 		data() {
 			return {
@@ -92,7 +95,8 @@
 					if (res.code == 0) {
 						// 暂时写死
 						res.data.cardId = 1
-						cacheManager.set('auth',res.data)
+						cacheManager.set('auth',res.data)
+						updateXueke(res.data.nianji,res.data.cardId)
 						if (res.data.nianji == 0 && res.data.cardId == 0 ) {
 							uni.redirectTo({
 								url: `/pages/selectGradesTerms/index`

pages/study/index.vue

@@ -39,6 +39,14 @@
 		toast
 	} from "../../utils/common";
 	import cacheManager from "../../utils/cacheManager.js";
+	import {
+		useXuekeNianji
+	} from "@/utils/cacheManager.js"
+
+	const {
+		updateXueke,
+		getXueke
+	} = useXuekeNianji();
 	const eggDialogRef = ref(null);
 	const selectZhang = ref(null);
 	let infoData = reactive({
@@ -53,6 +61,7 @@
 	});
 	onLoad(() => {
 		// 获取路由参数
+		//会员 取auth
 		selectZhang.value = cacheManager.get('auth');
 
 		console.log(selectZhang.value);
@@ -61,7 +70,6 @@
 			// 选择年级进入调用此接口
 			//options.flag == 'selectGrades'
 			getZhangInfo()
-
 			// 蛋
 			// eggDialogRef.value.eggShow();
 		} else {
@@ -79,6 +87,7 @@
 			zhangId: selectZhang.value.zhangId,
 		}
 		userZhangInfo(req).then(res => {
+			cacheManager.set('zhangInfo', res.data)
 			infoData.jieList = res.data.jieList
 			infoData.haveFlag = res.data.haveFlag
 			infoData.nianji = res.data.nianji
@@ -87,9 +96,8 @@
 			infoData.cardId = res.data.cardId
 			infoData.zhangId = res.data.zhangId
 			infoData.zhangName = res.data.zhangName
-			gradeTerm.value = translateData(res.data);
 			recordZhangJie()
-			cacheManager.set('zhangInfo', res.data)
+			getNewData()
 			// if (cacheManager.get('zhangInfo')) {
 			//     cacheManager.remove('zhangInfo')
 			//     cacheManager.set('zhangInfo', res.data)
@@ -114,12 +122,7 @@
 			infoData.cardId = res.data.cardId
 			infoData.zhangId = res.data.zhangId
 			infoData.zhangName = res.data.zhangName
-			gradeTerm.value = translateData(res.data);
-			useTabBarHistory().setTabBarStorage({
-				nianji: res.data.nianji,
-				zhangId: res.data.zhangId,
-				cardId: res.data.cardId
-			})
+
 		})
 	}
 
@@ -127,19 +130,55 @@
 
 	function onLeft(event) {
 		console.log('用户左滑了');
+		let req = {
+			nianji: selectZhang.value.nianji,
+			zhangId: selectZhang.value.zhangId,
+			cardId: selectZhang.value.cardId,
+		}
+		userZhangForntInfo(req).then(res => {
+			cacheManager.set('zhangInfo', res.data)
+			infoData.jieList = res.data.jieList
+			infoData.haveFlag = res.data.haveFlag
+			infoData.nianji = res.data.nianji
+			infoData.number = res.data.number
+			infoData.numberStr = res.data.numberStr
+			infoData.cardId = res.data.cardId
+			infoData.zhangId = res.data.zhangId
+			infoData.zhangName = res.data.zhangName
+			recordZhangJie()
+			getNewData()
+		})
 	}
 
 	function onRight(event) {
 		console.log('用户又滑了');
-		// let req = {
+		let req = {
+			nianji: selectZhang.value.nianji,
+			zhangId: selectZhang.value.zhangId,
+			cardId: selectZhang.value.cardId,
+		}
+		userZhangNextInfo(req).then(res => {
+			cacheManager.set('zhangInfo', res.data)
+			infoData.jieList = res.data.jieList
+			infoData.haveFlag = res.data.haveFlag
+			infoData.nianji = res.data.nianji
+			infoData.number = res.data.number
+			infoData.numberStr = res.data.numberStr
+			infoData.cardId = res.data.cardId
+			infoData.zhangId = res.data.zhangId
+			infoData.zhangName = res.data.zhangName
+			recordZhangJie()
+			getNewData()
+		})
+	}
 
-		// }
-		// userZhangNextInfo().then(res => {
+	function getNewData() {
+		selectZhang.value.zhangId = cacheManager.get('zhangInfo').zhangId;
+		selectZhang.value.cardId = cacheManager.get('zhangInfo').cardId;
+		selectZhang.value.nianji = cacheManager.get('zhangInfo').nianji;
 
-		// })
 	}
 
-
 	function recordZhangJie() {
 		let req = {
 			nianji: selectZhang.value.nianji,

utils/cacheManager.js

@@ -99,13 +99,13 @@ export default cacheManager;
 // 单元测试 引导大鹅提示 缓存Key
 export const SHOW_UNIT_TEST_TISHI = 'SHOW_UNIT_TEST_TISHI';
 // 年级学科 缓存Key
-export const NIANJI_XUEKE = 'SHOW_UNIT_TEST_TISHI';
+export const NIANJI_XUEKE = 'SHOW_UNIT_XUEKE';
 
 // 学科年级业务缓存
 export function useXuekeNianji() {
 	// 学科
-	function updateXueke(nianji, xueke) {
-		cacheManager.set(NIANJI_XUEKE, { nianji,xueke })
+	function updateXueke(nianji, cardId) {
+		cacheManager.set(NIANJI_XUEKE, { nianji,cardId })
 	}
 	
 	// 获取学科年级