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

pages/mall/mallPage.vue

@@ -95,9 +95,9 @@
 				<icon class="apple-icon"></icon>apple
 			</view>
 
-			<view v-if="currentPlatform =='android'" class="open-svip-btn" @touchstart="creatOrder">立即支付
+			<view v-if="currentPlatform =='android'" class="pay-btn" @touchstart="creatOrder">立即支付
 			</view>
-			<view v-if="currentPlatform =='ios'" style="margin-top: 20rpx;" class="open-svip-btn"
+			<view v-if="currentPlatform =='ios'" class="pay-btn"
 				@touchstart="creatOrderIos">立即支付</view>
 		</view>
 		<detail-dialog ref="mallDetailPopup" :selected-list="getSelectedProducts"></detail-dialog>
@@ -223,8 +223,13 @@
 		const mergeList = [...new Set([...localList, ...data.levelIdList])]
 		cacheManager.updateObject('auth', {
 			levelIdList: mergeList
-		})
-		toast("chenggong!!!! 之后跳转我的订单页面")
+		})
+		
+		uni.redirectTo({
+			url: '/pages/pay/order?status=2'
+		})
+		
+	//	toast("chenggong!!!! 之后跳转我的订单页面")
 
 		// if (formPage.value == 'my') {
 		// 	uni.redirectTo({
@@ -552,8 +557,18 @@
 			orderAdd(req).then(res => {
 				console.log('res', res);
 				console.log(' res.data.id', res.data.id);
-				orderId.value = res.data.id
-				wxPay()
+				orderId.value = res.data.id
+				orderCheck({
+					id: orderId.value
+				}).then(res3 => {
+					console.log('res3', res3);
+					if (res3.code == 0) {
+						genggaiVip(res3.data)
+					}
+				})
+				
+				
+			//	wxPay()
 			}).catch((err) => {
 				uni.hideLoading();
 				toast("订单创建失败")
@@ -662,7 +677,7 @@
 		} else {
 			productData.current = Number(cacheManager.get('auth').subjectId) - 1
 		}
-		//isIOSorAndroid()
+		isIOSorAndroid()
 		getMore();
 
 	})

pages/pay/order.vue

@@ -738,7 +738,7 @@
 		const opt = {
 			page: 1,
 			size: 10, // 固定查询10条
-			status: code // 前台索引加1为学科cardId
+			status: Number(code)  // 前台索引加1为学科cardId
 		}
 
 		if (code == 0) {
@@ -854,7 +854,7 @@
 
 	}
 	onLoad((options) => {
-		dingdanData.current = options.status || dingdanData.current
+		dingdanData.current = Number(options.status)  || dingdanData.current
 		getMore(dingdanData.current);
 		//	isIOSorAndroid()
 	})