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

App.vue

@@ -16,20 +16,19 @@
 		onShow: function() {
 
 			// #ifdef APP-PLUS
-					
-			if (cacheManager.get('auth')) {	
-				uni.redirectTo({
-					url: `/pages/study/index`
-				})
-			}else if(!(cacheManager.get('wxLogin').bind)){
-					console.log('asdfadsfadsfasd')
-				// 微信登录且未绑定 
-			} else {
-				cacheManager.clearAll()
-				uni.redirectTo({
-					url: '/pages/login/index'
-				});
-			}
+			// if (cacheManager.get('auth')) {	
+			// 	uni.reLaunch({
+			// 		url: `/pages/study/index`
+			// 	})
+			// }else if(!(cacheManager.get('wxLogin').bind)){
+			// 		console.log('asdfadsfadsfasd')
+			// 	// 微信登录且未绑定 
+			// } else {
+			// 	cacheManager.clearAll()
+			// 	uni.redirectTo({
+			// 		url: '/pages/login/index' 
+			// 	});
+			// }
 			const webview = plus.webview.currentWebview();
 			plus.key.addEventListener('backbutton', () => {
 				event.preventDefault();
@@ -38,7 +37,23 @@
 			// #endif
 		},
 		onHide: function() {
-		//	console.log('App Hide')
+	// 	//	console.log('App Hide')
+	// 	// #ifdef APP-PLUS
+	// 	if (cacheManager.get('auth')) {	
+	// 		uni.reLaunch({
+	// 			url: `/pages/study/index`
+	// 		})
+	// 	}else if(!(cacheManager.get('wxLogin').bind)){
+	// 			console.log('asdfadsfadsfasd')
+	// 		// 微信登录且未绑定 
+	// 	} else {
+	// 		cacheManager.clearAll()
+	// 		uni.redirectTo({
+	// 			url: '/pages/login/index' 
+	// 		});
+	// 	}
+	
+	// 	// #endif
 
 		}
 	}

pages/my/index.vue

@@ -187,12 +187,13 @@
 		}
 	}
 	// 会员权益按钮
-	function hyqyBtn(index){
+	function hyqyBtn(index){
+		let cardId = index+1;
 		/* index为学科 1数学 2英语 */
 		if(loginFlag.value){
 			// 非游客
 			uni.redirectTo({
-				url: '/pages/pay/svip'
+				url: `/pages/pay/svip?cardId=${cardId}`
 			})
 		}else{
 			// 游客

pages/pay/order.vue

@@ -52,7 +52,7 @@
 					</scroll-view>
 				</view>
 				<view v-if="dingdanData.current === 1">
-					<scroll-view style="height: 300px;" scroll-y="true" refresher-enabled="true"
+					<scroll-view scroll-y="true" refresher-enabled="true"
 						:refresher-triggered="dingdanData.daiFukuan.loading" :refresher-threshold="50" class="order-scroll-view"
 						refresher-background="transparent" @refresherrefresh="onRefresh">
 							<uni-list>
@@ -93,7 +93,7 @@
 					</scroll-view>
 				</view>
 				<view v-if="dingdanData.current === 2">
-					<scroll-view style="height: 300px;" scroll-y="true" refresher-enabled="true"
+					<scroll-view scroll-y="true" refresher-enabled="true"
 						:refresher-triggered="dingdanData.yiFukuan.loading" :refresher-threshold="50" class="order-scroll-view"
 						refresher-background="transparent" @refresherrefresh="onRefresh">
 							<uni-list>