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

App.vue

@@ -8,8 +8,10 @@
 	} from "@/utils/common";
 	import cacheManager from "@/utils/cacheManager.js";
 	export default {
+			
 		// creat by wgy 0619  生命周期 钩子  
 		onLaunch: function() {
+			// #ifdef APP-PLUS
 			if (cacheManager.get('auth')) {
 				uni.reLaunch({
 					url: `/pages/study/index`,
@@ -29,7 +31,7 @@
 					}
 				});
 			}
-			
+					// #endif
 		},
 		onShow: function() {
 

pages/my/index.vue

@@ -207,7 +207,7 @@
 		if(loginFlag.value){
 			// 非游客
 			uni.redirectTo({
-				url: `/pages/pay/svip?cardId=${cardId}`
+				url: `/pages/pay/svip?cardId=${cardId}&formPage=my`
 			})
 		}else{
 			// 游客

pages/pay/svip.vue

@@ -69,6 +69,7 @@
 	} from "@/utils/common";
 	let payType = ref('weixin')
 	let cardId = ref('')
+	let formPage = ref('')
 	const daoPokeRef = ref(null);
 	const daoPokeAllRef = ref(null);
 	const isVip = getUserIdentity();
@@ -95,6 +96,7 @@
 	];
 	onLoad((options) => {
 		cardId.value = options.cardId
+		formPage.value = options.formPage
 	})
 
 	function radioChange(data) {
@@ -121,9 +123,15 @@
 			setTimeout(() => {
 				daoPokeRef.value.handleClose();
 				daoPokeAllRef.value.handleClose();
-				uni.redirectTo({
-					url: '/pages/study/index'
-				})
+				if(formPage.value =='my'){
+					uni.redirectTo({
+						url: '/pages/my/index'
+					})
+				}else{
+					uni.redirectTo({
+						url: '/pages/study/index'
+					})
+				}
 			}, 3000)
 		})
 	}

pages/selectGradesTerms/index.vue

@@ -91,7 +91,8 @@
 				cacheManager.updateObject('auth', {
 					nianji: data.activeNianji,
 					zhangId: data.activeNianji == auth.nianji && data.activeXueke == auth.cardId ? auth.zhangId: 0,
-					cardId: data.activeXueke,
+					cardId: data.activeXueke,
+					currentZhang: 0
 				})
 				cacheManager.remove('daoPageCache')
 				// 数序

pages/study/index.vue

@@ -342,11 +342,11 @@
 	}
 
 	function clickGradeTerm() {
-		if(cacheManager.get('auth')){
-			cacheManager.updateObject('auth', {
-				currentZhang: 0
-			})
-		}
+		// if(cacheManager.get('auth')){
+		// 	cacheManager.updateObject('auth', {
+		// 		currentZhang: 0
+		// 	})
+		// }
 		uni.navigateTo({
 			url: `/pages/selectGradesTerms/index?tipFlag=${tipFlag.value}`,
 		})