修改订单详情使用状态展示逻辑

src/manifest.json

@@ -50,8 +50,9 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        // "appid" : "wx6260718c6fd46efb",
-         "appid" : "wxc032a09413289004",
+        "appid" : "wx6260718c6fd46efb",
+        "appid" : "wxe70e6c132e5b4c28",
+        //  "appid" : "wxc032a09413289004",
         "setting" : {
             "urlCheck" : false,
             "minified" : true

src/pages/index/eventsRegister/index.vue

@@ -481,26 +481,26 @@ const submitOrderImpl = () => {
 }
 
 const paymentOrder = (payInfo: object) => {
-	// getOrderQuery(orderCode.value, orderId.value)
-	console.log(payInfo, '支付参数');
-	uni.requestPayment({
-		provider: 'wxpay',
-		...payInfo,
-		success: function (res) {
-			console.log('支付成功', res);
-			getOrderQuery(orderCode.value, orderId.value)
-		},
-		fail: function (err) {
-			console.log('支付失败', err);
-			if (err.errMsg == 'requestPayment:fail cancel') {
-				RouterUtils.to_page(`/pages/index/toBeUsed/index?orderId=${orderId.value}&orderType=${orderFormData.value.orderType}`)
-				return
-			}else{
-				RouterUtils.to_page(`/pages/index/payError/index?errMsg=${err.errMsg}`)
-			}
-			// TipsUtils.tips_toast('支付失败，请稍后重试');
-		}
-	});
+	getOrderQuery(orderCode.value, orderId.value)
+	// console.log(payInfo, '支付参数');
+	// uni.requestPayment({
+	// 	provider: 'wxpay',
+	// 	...payInfo,
+	// 	success: function (res) {
+	// 		console.log('支付成功', res);
+	// 		getOrderQuery(orderCode.value, orderId.value)
+	// 	},
+	// 	fail: function (err) {
+	// 		console.log('支付失败', err);
+	// 		if (err.errMsg == 'requestPayment:fail cancel') {
+	// 			RouterUtils.to_page(`/pages/index/toBeUsed/index?orderId=${orderId.value}&orderType=${orderFormData.value.orderType}`)
+	// 			return
+	// 		}else{
+	// 			RouterUtils.to_page(`/pages/index/payError/index?errMsg=${err.errMsg}`)
+	// 		}
+	// 		// TipsUtils.tips_toast('支付失败，请稍后重试');
+	// 	}
+	// });
 }
 
 const submitOrder = debounce(submitOrderImpl, 500)

src/pages/index/gymDetail/components/popup.vue

@@ -295,26 +295,26 @@ const submitOrderImpl = () => {
 	})
 }
 const paymentOrder = (payInfo: object) => {
-	// getOrderQuery(orderCode.value, orderId.value)
-	console.log(payInfo, '支付参数');
-	uni.requestPayment({
-		provider: 'wxpay',
-		...payInfo,
-		success: function (res) {
-			console.log('支付成功', res);
-			getOrderQuery(orderCode.value, orderId.value)
-		},
-		fail: function (err) {
-			console.log('支付失败', err);
-			if (err.errMsg == 'requestPayment:fail cancel') {
-				RouterUtils.to_page(`/pages/index/toBeUsed/index?orderId=${orderId.value}&orderType=${orderFormData.value.orderType}`)
-				return
-			}else{
-				RouterUtils.to_page(`/pages/index/payError/index?errMsg=${err.errMsg}`)
-			}
-			// TipsUtils.tips_toast('支付失败，请稍后重试');
-		}
-	});
+	getOrderQuery(orderCode.value, orderId.value)
+	// console.log(payInfo, '支付参数');
+	// uni.requestPayment({
+	// 	provider: 'wxpay',
+	// 	...payInfo,
+	// 	success: function (res) {
+	// 		console.log('支付成功', res);
+	// 		getOrderQuery(orderCode.value, orderId.value)
+	// 	},
+	// 	fail: function (err) {
+	// 		console.log('支付失败', err);
+	// 		if (err.errMsg == 'requestPayment:fail cancel') {
+	// 			RouterUtils.to_page(`/pages/index/toBeUsed/index?orderId=${orderId.value}&orderType=${orderFormData.value.orderType}`)
+	// 			return
+	// 		}else{
+	// 			RouterUtils.to_page(`/pages/index/payError/index?errMsg=${err.errMsg}`)
+	// 		}
+	// 		// TipsUtils.tips_toast('支付失败，请稍后重试');
+	// 	}
+	// });
 }
 const submitOrder = debounce(submitOrderImpl, 500)
 

src/pages/index/gymPay/index.vue

@@ -497,26 +497,26 @@ const submitOrderImpl = () => {
 }
 
 const paymentOrder = (payInfo: object) => {
-	// getOrderQuery(orderCode.value, orderId.value)
-	console.log(payInfo, '支付参数');
-	uni.requestPayment({
-		provider: 'wxpay',
-		...payInfo,
-		success: function (res) {
-			console.log('支付成功', res);
-			getOrderQuery(orderCode.value, orderId.value)
-		},
-		fail: function (err) {
-			console.log('支付失败', err);
-			if (err.errMsg == 'requestPayment:fail cancel') {
-				RouterUtils.to_page(`/pages/index/toBeUsed/index?orderId=${orderId.value}&orderType=${orderFormData.value.orderType}`)
-				return
-			}else{
-				RouterUtils.to_page(`/pages/index/payError/index?errMsg=${err.errMsg}`)
-			}
-			// TipsUtils.tips_toast('支付失败，请稍后重试');
-		}
-	});
+	getOrderQuery(orderCode.value, orderId.value)
+	// console.log(payInfo, '支付参数');
+	// uni.requestPayment({
+	// 	provider: 'wxpay',
+	// 	...payInfo,
+	// 	success: function (res) {
+	// 		console.log('支付成功', res);
+	// 		getOrderQuery(orderCode.value, orderId.value)
+	// 	},
+	// 	fail: function (err) {
+	// 		console.log('支付失败', err);
+	// 		if (err.errMsg == 'requestPayment:fail cancel') {
+	// 			RouterUtils.to_page(`/pages/index/toBeUsed/index?orderId=${orderId.value}&orderType=${orderFormData.value.orderType}`)
+	// 			return
+	// 		}else{
+	// 			RouterUtils.to_page(`/pages/index/payError/index?errMsg=${err.errMsg}`)
+	// 		}
+	// 		// TipsUtils.tips_toast('支付失败，请稍后重试');
+	// 	}
+	// });
 }
 
 const submitOrder = debounce(submitOrderImpl, 500)

src/pages/index/index.vue

@@ -128,7 +128,8 @@
 				<view class="i-card-list"
 					:style="{ background: index % 2 === 0 ? 'linear-gradient(179deg, #FFD5FB 0%, #FFFFFF 40%)' : 'linear-gradient( 179deg, #F2FFBE 0%, #FFFFFF 40%)' }"
 					v-for="(item, index) in instructorList" :key="item.id">
-					<view class="i-info" @click="RouterUtils.to_page(`/pages/index/instructorDetail/index?id=${item.id}`)">
+					<view class="i-info"
+						@click="RouterUtils.to_page(`/pages/index/instructorDetail/index?id=${item.id}`)">
 						<view class="header" :style="{ background: index % 2 === 0 ? '#FFB8F9' : '#C8FF0C' }">
 							<image class="head-img" :src="item.avatar" mode=""></image>
 							<image class="head-tag" src="/src/static/badge.png" mode=""></image>
@@ -137,7 +138,8 @@
 							<view class="name-tag">
 								<view class="name">
 									<view>
-										<text class="textHidden" style="width: 130rpx;text-align: center;">{{ item.name }}</text>
+										<text class="textHidden" style="width: 130rpx;text-align: center;">{{ item.name
+										}}</text>
 									</view>
 									<image v-if="index % 2 === 0" src="/src/static/name_bg.png" mode=""></image>
 									<image v-else src="/src/static/name_bg1.png" mode=""></image>
@@ -147,12 +149,12 @@
 								</view>
 							</view>
 							<view class="ascription textHidden">{{ item.orgName }}</view>
-							<view class="sign textHidden">教学理念:{{ item.teachingPhilosophy||'暂无'}}</view>
+							<view class="sign textHidden">教学理念:{{ item.teachingPhilosophy || '暂无' }}</view>
 						</view>
 						<view class="type-icon">
 							<!-- https://national-motion.oss-cn-beijing.aliyuncs.com/opt/upFiles/dxVfKxD7aH2397154f377d68fb59a71226c9c2f078a9_1758071827887.png -->
 							<!-- https://national-motion.oss-cn-beijing.aliyuncs.com/opt/upFiles/uv0VmclIvXiJc1081e0e33e281a8a436d24ec9ca87c3_1758071769194.png -->
-							<image :src="index % 2 === 0?hotInstructorImg1:hotInstructorImg2" mode=""></image>
+							<image :src="index % 2 === 0 ? hotInstructorImg1 : hotInstructorImg2" mode=""></image>
 						</view>
 					</view>
 					<view class="i-data">
@@ -177,7 +179,8 @@
 						</view>
 						<view class="num">已售{{ course.count || '0' }}</view>
 					</view>
-					<view class="more" @click="RouterUtils.to_page(`/pages/index/instructorDetail/index?id=${item.id}`)">更多课程
+					<view class="more"
+						@click="RouterUtils.to_page(`/pages/index/instructorDetail/index?id=${item.id}`)">更多课程
 					</view>
 				</view>
 			</view>
@@ -194,10 +197,10 @@
 
 <script setup lang="ts">
 import zsLoading from '@/components/zzx-loading/zzx-loading.vue'
-import { ref, onMounted, computed} from 'vue'
-import { onLoad, onPageScroll, onPullDownRefresh } from '@dcloudio/uni-app';
+import { ref, onMounted, computed } from 'vue'
+import { onLoad, onPageScroll, onPullDownRefresh, onShareAppMessage } from '@dcloudio/uni-app';
 import zsEmpty from '@/components/zs-empty/index.vue'
-import { TipsUtils,RouterUtils } from '@/utils/util';
+import { TipsUtils, RouterUtils } from '@/utils/util';
 import { http } from '@/utils/http'
 import { useCacheStore } from '@/stores/cache'
 const cache = useCacheStore()
@@ -216,6 +219,12 @@ onLoad(() => {
 	get_location()
 	console.log(token.value, 'token是否刷新')
 })
+onShareAppMessage(() => {
+	return {
+		title: '邀请您加入',
+		path: `pages/index/userList/index`
+	}
+})
 onPullDownRefresh(() => {
 	get_indexInfo()
 	get_message()
@@ -282,6 +291,12 @@ const get_logininfo = (item: string) => {
 				cache.remove('COURSE_ID')
 			}, 500)
 		}
+		if (cache.get('PLACE_ID') && token.value) {
+			gotoPage(`/pages/index/submitOrder/index?id=${cache.get('PLACE_ID')}`)
+			setTimeout(() => {
+				cache.remove('PLACE_ID')
+			}, 500)
+		}
 	})
 }
 
@@ -793,6 +808,7 @@ const searchInfoBtn = () => {
 			align-items: center;
 			justify-content: space-around;
 			gap: 20rpx;
+
 			.header {
 				width: 150rpx;
 				height: 150rpx;
@@ -853,17 +869,19 @@ const searchInfoBtn = () => {
 						white-space: nowrap;
 						text-overflow: ellipsis;
 						overflow: auto;
+
 						.tag {
 							font-size: 24rpx;
 							color: #AAAAAA;
 							flex-shrink: 0;
-							margin-right: 10rpx; 
+							margin-right: 10rpx;
 
 							&:last-child {
 								margin-right: 0;
 							}
 						}
 					}
+
 					.tags-container::-webkit-scrollbar {
 						display: none;
 					}

src/pages/index/submitOrder/index.vue

@@ -144,6 +144,7 @@ const cache = useCacheStore()
 const calendar = ref();
 const check_index = ref(0);
 onLoad((option:any) => {
+	console.log(option, '传递参数');
 	placeId.value = option.id?option.id:cache.get('PLACE_ID')
 	orderFormData.value.productIds = option.id
 })
@@ -403,20 +404,20 @@ const submitOrderImpl = () => {
 	})
 }
 const paymentOrder = (payInfo: object) => {
-	// getOrderQuery(orderCode.value, orderId.value)
-	console.log(payInfo, '支付参数');
-	uni.requestPayment({
-		provider: 'wxpay',
-		...payInfo,
-		success: function (res) {
-			console.log('支付成功', res);
-			getOrderQuery(orderCode.value, orderId.value)
-		},
-		fail: function (err) {
-			console.log('支付失败', err);
-			// TipsUtils.tips_toast('支付失败，请稍后重试');
-		}
-	});
+	getOrderQuery(orderCode.value, orderId.value)
+	// console.log(payInfo, '支付参数');
+	// uni.requestPayment({
+	// 	provider: 'wxpay',
+	// 	...payInfo,
+	// 	success: function (res) {
+	// 		console.log('支付成功', res);
+	// 		getOrderQuery(orderCode.value, orderId.value)
+	// 	},
+	// 	fail: function (err) {
+	// 		console.log('支付失败', err);
+	// 		// TipsUtils.tips_toast('支付失败，请稍后重试');
+	// 	}
+	// });
 }
 
 const submitBooking = debounce(submitOrderImpl, 500)  //防抖

src/pages/index/toBeUsed/index.vue

@@ -136,24 +136,29 @@
 				<view class="download-qrcode" @click="download_qrcode">下载到手机</view>
 			</block>
 			<view v-if="orderDetailInfo?.orderType == 0" style="color: #222;font-size: 26rpx;">通过学校门口闸机时，通过人脸自动核验</view>
-			<view class="t-todeused">
+			<view class="t-todeused"  v-for="(item, index) in orderDetailInfo?.proInfoList" :key="item.id">
 				<view class="todeused">
-					<view class="text">{{ orderDetailInfo?.orderStatus }}</view>
-					<view class="time" v-if="orderDetailInfo?.appCourses?.endTime || orderDetailInfo?.endTime">
+					<view class="text">
+						<text v-if="item.orderStatus==0">待付款</text>
+						<text v-if="item.orderStatus==1">待使用</text>
+						<text v-if="item.orderStatus==2">已使用</text>
+						<text v-if="item.orderStatus==3">已到期</text>
+						<text v-if="item.orderStatus==4">已取消</text>
+						<text v-if="item.orderStatus==5">退款中</text>
+						<text v-if="item.orderStatus==6">已退款</text>
+					</view>
+					<view class="time">
 						<!-- {{ orderDetailInfo?.appCourses?.endTime || orderDetailInfo?.endTime }} -->
-						{{ orderDetailInfo?.proInfoList[0].expireTime }}
+						{{ item.expireTime }}
 						到期
 					</view>
 				</view>
 				<!-- orderStatus：0-待付款 1-待使用 2-已使用 3-已到期 4-已取消 5-退款中 6已退款 -->
 				<!-- type：0-学校 1-包场 2-无固定场 3-个人赛 4-团队赛 5-课程 6-保险 -->
-				<view class="order-num" v-for="(item, index) in orderDetailInfo?.proInfoList" :key="item.id"
-					@click="RouterUtils.to_page(`/pages/index/tryUseRecord/index?ticketNo=${item.ticketNo}&proInfoList=${JSON.stringify(orderDetailInfo?.proInfoList)}&selectValue=${index}`)">
+				<view class="order-num" @click="RouterUtils.to_page(`/pages/index/tryUseRecord/index?ticketNo=${item.ticketNo}&proInfoList=${JSON.stringify(orderDetailInfo?.proInfoList)}&selectValue=${index}`)">
 					<text v-if="item.type != 6">{{ item.ticketNo }}&nbsp;&nbsp; {{ item.userName }}</text>
 					<zzx-icon v-if="item.type != 6" name="ashRight" size="12"></zzx-icon>
-					<!-- <view v-if="item.type != 6" class="t-use-status">{{ getStatusText(item.orderStatus) }}</view> -->
 					<text v-if="item.type != 6 && orderPageInfo?.orderType == 1">{{ item.expireTime }}到期</text>
-					<!-- <view>申请退款</view> -->
 				</view>
 			</view>
 		</view>
@@ -705,20 +710,20 @@ const submitPay = (e: any) => {
 	})
 }
 const paymentOrder = (payInfo: object) => {
-	// getOrderQuery(orderCode.value, orderId.value)
-	console.log(payInfo, '支付参数');
-	uni.requestPayment({
-		provider: 'wxpay',
-		...payInfo,
-		success: function (res) {
-			console.log('支付成功', res);
-			getOrderQuery(orderCode.value, orderId.value)
-		},
-		fail: function (err) {
-			console.log('支付失败', err);
-			// TipsUtils.tips_toast('支付失败，请稍后重试');
-		}
-	});
+	getOrderQuery(orderCode.value, orderId.value)
+	// console.log(payInfo, '支付参数');
+	// uni.requestPayment({
+	// 	provider: 'wxpay',
+	// 	...payInfo,
+	// 	success: function (res) {
+	// 		console.log('支付成功', res);
+	// 		getOrderQuery(orderCode.value, orderId.value)
+	// 	},
+	// 	fail: function (err) {
+	// 		console.log('支付失败', err);
+	// 		// TipsUtils.tips_toast('支付失败，请稍后重试');
+	// 	}
+	// });
 }
 
 const getOrderQuery = (orderCode: string, orderId: string, retryCount = 0) => {

src/pages/mine/orderInfo/index.vue

@@ -157,20 +157,20 @@ const submitPay = (e: any) => {
 	})
 }
 const paymentOrder = (payInfo: object) => {
-	// getOrderQuery(orderCode.value, orderId.value)
-	console.log(payInfo, '支付参数');
-	uni.requestPayment({
-		provider: 'wxpay',
-		...payInfo,
-		success: function (res) {
-			console.log('支付成功', res);
-			getOrderQuery(orderCode.value, orderId.value)
-		},
-		fail: function (err) {
-			console.log('支付失败', err);
-			// TipsUtils.tips_toast('支付失败，请稍后重试');
-		}
-	});
+	getOrderQuery(orderCode.value, orderId.value)
+	// console.log(payInfo, '支付参数');
+	// uni.requestPayment({
+	// 	provider: 'wxpay',
+	// 	...payInfo,
+	// 	success: function (res) {
+	// 		console.log('支付成功', res);
+	// 		getOrderQuery(orderCode.value, orderId.value)
+	// 	},
+	// 	fail: function (err) {
+	// 		console.log('支付失败', err);
+	// 		// TipsUtils.tips_toast('支付失败，请稍后重试');
+	// 	}
+	// });
 }
 
 const getOrderQuery = (orderCode: string, orderId: string, retryCount = 0) => {

src/utils/http/index.ts

@@ -178,9 +178,9 @@ export class HttpClient {
 
 // 创建实例
 export const http = new HttpClient({
-  // baseURL: 'http://192.168.0.217:8080/jeecg-boot/app',
+  baseURL: 'http://192.168.0.217:8080/jeecg-boot/app',
   // baseURL: 'http://192.168.1.166:8080/jeecg-boot/app',
-  baseURL: 'http://192.168.0.11:8080/jeecg-boot/app',
+  // baseURL: 'http://192.168.0.11:8080/jeecg-boot/app',
   // baseURL: 'https://api.qlapp.cn/jeecgboot/app', //生产
   headers: {
     'Content-Type': 'application/json'

src/utils/util/index.ts

@@ -92,7 +92,7 @@ export class RouterUtils {
 			'/pages/index/venue/index',
 			// '/pages/index/detail/index',
 			// '/pages/index/gymDetail/index',
-			// '/pages/index/courseDetail/index',
+			'/pages/index/courseDetail/index',
 			'/pages/index/training/index',
 			'/pages/index/events/index',
 			'/pages/index/eventsDetail/index',