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

pages/mall/mallPage.vue

@@ -103,7 +103,7 @@
 		<detail-dialog ref="mallDetailPopup" :selected-list="getSelectedProducts"></detail-dialog>
 
 
-		<product-dialog ref="mallProductPopup" @payBtn="payBtn"></product-dialog>
+		<product-dialog ref="mallProductPopup"></product-dialog>
 	</view>
 </template>
 
@@ -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("订单创建失败")

pages/pay/order.vue

@@ -29,7 +29,7 @@
 											<text v-if="item.status ==1" class="pay-status">待付款</text>
 										</view>
 									</view>
-									<view class="order-content-box" v-for="(item2,index2) in item.cardList"
+									<view class="order-content-box" @click="goDao(item2,index2)" v-for="(item2,index2) in item.cardList"
 										:key="index2">
 										<!-- 需要改成从接口获取的 wgy-->
 										<img class="content-img" :src="item2.cover">
@@ -318,7 +318,13 @@
 		},
 	})
 
-
+	function goDao(data,index){
+		console.log('data',data);
+		console.log('index',index);
+		if(data.type == 0){
+			
+		}
+	}
 	function genggaiVip(data) {
 		uni.hideLoading();
 		const localList = cacheManager.get('auth').levelIdList || []
@@ -738,7 +744,7 @@
 		const opt = {
 			page: 1,
 			size: 10, // 固定查询10条
-			status: code // 前台索引加1为学科cardId
+			status: Number(code)  // 前台索引加1为学科cardId
 		}
 
 		if (code == 0) {
@@ -854,7 +860,7 @@
 
 	}
 	onLoad((options) => {
-		dingdanData.current = options.status || dingdanData.current
+		dingdanData.current = Number(options.status)  || dingdanData.current
 		getMore(dingdanData.current);
 		//	isIOSorAndroid()
 	})

pages/selectGradesTerms/index.vue

@@ -29,7 +29,7 @@
 	import {
 		reactive,
 		toRefs,
-		computed,
+		computed,
 		nextTick
 	} from "vue";
 	import * as httpApi from "@/api/selectGradesTerms.js";
@@ -143,10 +143,11 @@
 					typeId: typeId,
 					levelId: levelId,
 					subjectId: subjectId,
-					zhangId: data.activeProduct == auth.nianji && data.activeXueke == auth.cardId ? auth.zhangId :
+					zhangId: data.activeProduct == auth.levelId && data.activeXueke == auth.cardId ? auth.zhangId :
 						0,
 					currentZhang: 0
 				})
+				// 通知岛重新调用接口
 				cacheManager.remove('daoPageCache')
 				uni.redirectTo({
 					url: `/pages/study/index`
@@ -170,6 +171,11 @@
 
 		function handleBack() {
 			if (userCode !== 'Visitor') {
+				
+				if (!data.activeProduct) {
+					return;
+				}
+				
 				uni.redirectTo({
 					url: `/pages/study/index`
 				})

pages/study/index.vue

@@ -409,7 +409,7 @@
 		// 	})
 		// }
 		uni.navigateTo({
-			url: `/pages/selectGradesTerms/index?tipFlag=${tipFlag.value}`,
+			url: `/pages/selectGradesTerms/index?tipFlag=${tipFlag.value}&from='daoPage'`,
 		})
 	}
 	// 游客弹窗---确定