Merge remote-tracking branch 'origin/2024鹅状元' into 2024鹅状元

# Conflicts:
#	pages/login/login.vue

pages/login/login.vue

@@ -4,7 +4,7 @@
 		<view class="ezy-login-wrap">
 			<view class="login-body-box">
 				<view class="login-title-img"></view>
-				<view class="yzm-show">验证码已发送至：{{loginData.phoneNumber}}</view>
+				<view class="yzm-show">验证码已发送至：{{loginData.phoneNumber}}</view>
 
 				<view class="phone-input-box">
 					<input class="phone-input" type="text" v-model="loginData.yzmNumber" placeholder="请输入验证码"
@@ -31,10 +31,9 @@
 		login,
 		sendCode
 	} from "@/api/login.js"
-	import sliderDialog from './sliderDialog.vue'
-	import cacheManager from '@/utils/cacheManager.js';
-	import {useXuekeNianji} from "@/utils/cacheManager.js"
-		
+	import sliderDialog from './sliderDialog.vue'
+	import cacheManager ,{useXuekeNianji}from "@/utils/cacheManager.js";
+
 	const {	updateXueke, getXueke} = useXuekeNianji();	
 	export default {
 		data() {
@@ -54,20 +53,20 @@
 				sliderFlag: false,
 
 			}
-		},   
-		components: {
-			sliderDialog
+		},   
+		components: {
+			sliderDialog
         },
 		onLoad(options) {
 			this.loginInit(options);
 		},
 		onReady() {},
-		methods: {
+		methods: {
 			emitFun(data){
 				this.sliderFlag =false;
 				this.startCountdown();
-				this.sliderData =data;
-				this.getYzmBtn();
+				this.sliderData =data;
+				this.getYzmBtn();
 			},
 			loginInit(options) {
 				this.loginData.phoneNumber = options.telNum;
@@ -92,10 +91,8 @@
 					code: this.loginData.yzmNumber,
 				}
 				login(req).then(res => {
-					if (res.code == 0) {
-						// 暂时写死
-						res.data.cardId = 1
-						cacheManager.set('auth',res.data)
+					if (res.code == 0) {
+						cacheManager.set('auth',res.data)
 						if (res.data.cardId == 0 ) {
 							uni.redirectTo({
 								url: `/pages/selectGradesTerms/index`
@@ -103,7 +100,7 @@
 						} else {
 							updateXueke(res.data.nianji,res.data.cardId)
 							uni.redirectTo({
-								url: `/pages/study/index?nianji=${res.data.nianji}&cardId=${res.data.cardId}&zhangId=${cacheManager.get('auth').zhangId}`
+								url: `/pages/study/index`
 							})
 						}
 					}

pages/study/index.vue

@@ -37,16 +37,13 @@
 	import {
 		toast
 	} from "../../utils/common";
-	import cacheManager from "../../utils/cacheManager.js";
-	import {
-		useXuekeNianji
-	} from "@/utils/cacheManager.js"
-
+	import cacheManager ,{useXuekeNianji}from "@/utils/cacheManager.js";
 	const {
 		updateXueke,
 		getXueke
 	} = useXuekeNianji();
-	const eggDialogRef = ref(null);
+	const eggDialogRef = ref(null);
+	const catalogueRef = ref(null);
 	const selectZhang = ref(null);
 	let infoData = reactive({
 		jieList: [],
@@ -60,25 +57,30 @@
 	});
 	onLoad(() => {
 		// 获取路由参数
-		//会员 取auth
-		selectZhang.value = cacheManager.get('auth');
-
-		console.log(selectZhang.value);
-		if (cacheManager.get('auth')) {
-			// 已登录
-			// 选择年级进入调用此接口
-			//options.flag == 'selectGrades'
-			getZhangInfo()
-			// 蛋
-			// eggDialogRef.value.eggShow();
-		} else {
-			// 未登录 游客
-			getCommonZhang()
-
+
+		init()
 
-		}
 	})
-
+
+	function init(){
+		if (cacheManager.get('auth')) {
+			//会员 取auth
+			selectZhang.value = cacheManager.get('auth');
+			
+			console.log(selectZhang.value);
+			// 已登录
+			// 选择年级进入调用此接口
+			//options.flag == 'selectGrades'
+			getZhangInfo()
+			// 蛋
+			// eggDialogRef.value.eggShow();
+		} else {
+			// 未登录 游客 
+			getCommonZhang()
+	
+		}
+	}
+	
 	function getZhangInfo(data) {
 		let req = {
 			nianji: selectZhang.value.nianji,
@@ -106,11 +108,12 @@
 		})
 	}
 
-	function getCommonZhang(data) {
+	function getCommonZhang(data) {
+		
 		let req = {
-			nianji: selectZhang.value.nianji,
-			cardId: selectZhang.value.cardId,
-			zhangId: selectZhang.value.zhangId,
+			nianji: getXueke().nianji,
+			cardId: getXueke().cardId,
+			zhangId: selectZhang.value? selectZhang.value.zhangId :0,
 		}
 		getCommonZhangInfo(req).then(res => {
 			infoData.jieList = res.data.jieList
@@ -121,7 +124,7 @@
 			infoData.cardId = res.data.cardId
 			infoData.zhangId = res.data.zhangId
 			infoData.zhangName = res.data.zhangName
-
+			//getNewData()
 		})
 	}
 
@@ -193,7 +196,7 @@
 
 	function handleChangeZhang(data) {
 		selectZhang.value = data;
-		getZhangInfo(true)
+		init()
 	}
 
 	function goKaoshi(data) {

pages/study/product/shuxue.vue

@@ -35,6 +35,11 @@
 		getCurrentInstance,
 		onMounted
 	} from "vue";
+	import cacheManager ,{useXuekeNianji}from "@/utils/cacheManager.js";
+	const {
+		updateXueke,
+		getXueke
+	} = useXuekeNianji();
 	const $emit = defineEmits(['clickGradeTerm', 'onLeft', 'onRight', 'handleCheckCatalogue'])
 	const props = defineProps({
 		options: {
@@ -87,12 +92,17 @@
 
 	function onSwipeLeft(event) {
 		console.log('11111');
-		$emit('onLeft');
+		if (cacheManager.get('auth')) {
+			$emit('onLeft');
+		}
 	}
 
 	function onSwipeRight(event) {
 		console.log('22222');
-		$emit('onRight');
+		if (cacheManager.get('auth')) {
+			$emit('onRight');
+		}
+
 	}
 
 	function onTouchEnd(event) {