完善订单页面

bundle/reserve/details.vue

@@ -280,7 +280,6 @@ export default {
             selectedWeekDay: '',
             selectedReserveTime: [],
             countSelectedTime: 0,
-            submitting: false // 防止重复提交
         };
     },
 
@@ -437,22 +436,14 @@ export default {
         // 篮球场-立即预约
         toReserve() {
             let self = this
-            if (self.submitting) {
-                uni.showToast({
-                    title: '正在提交，请勿重复操作',
-                    icon: 'none'
-                });
-                return;
-            }
+     
             // 一进来就锁定，彻底防止高频点击
-            self.submitting = true;
             if (self.typeId == 1) {
                 if (self.selectedReserveTime.length === 0) {
                     uni.showToast({
                         title: '请选择预约时间',
                         icon: 'none'
                     });
-                    self.submitting = false;
                     return;
                 }
                 uni.showLoading({
@@ -467,11 +458,32 @@ export default {
                             app_id: self.getAppId(),
                             ground_id: self.id,
                             room_list: JSON.stringify(self.selectedReserveTime),
+                            type: this.typeId
                         },
                         function(res) {
                             self.loadding = false;
-                            self.submitting = false;
                             if(res.code) {
+                                uni.$on('payment', params => {
+                                    console.log("🚀 ~ params:", params)
+                                    uni.showLoading({
+                                        title: '加载中',
+                                        mask: true,
+                                    });
+                                    setTimeout(() => {
+                                        self.loadding = false
+                                        uni.$off("payment")
+                                        if (params.result) {
+                                            uni.redirectTo({
+                                                url: `/bundle/reserve/notice?order_id=${params.order_id}`
+                                            })
+                                        } else {
+                                            uni.redirectTo({
+                                                url: '/pages/order/cg-my-order'
+                                            })
+                                        }
+                                    }, 500)
+                                })
+
                                 uni.navigateTo({
                                     url: `/bundle/reserve/confirm?venueId=${self.venue.id}&roomId=${self.id}&typeId=${self.typeId}&orderId=${res.data.lists.id}`
                                 });
@@ -479,7 +491,6 @@ export default {
                         }
                     )
                 } catch (error) {
-                    self.submitting = false;
                     console.error('订单提交失败:', error);
                     uni.showToast({
                         title: '订单提交失败，请重试',
@@ -493,13 +504,11 @@ export default {
                         title: '请选择预约时间',
                         icon: 'none'
                     });
-                    self.submitting = false;
                     return;
                 }
                 uni.navigateTo({
                     url: `/bundle/reserve/confirm?venueId=${self.venue.id}&roomId=${self.id}&typeId=${self.typeId}`
                 });
-                self.submitting = false;
             }
 
         },
@@ -616,13 +625,23 @@ export default {
 
         getReserveTime() {
             let self = this;
-            self._post(
-                'ground.ground/getSchedule',
-                {
+            let params = {}
+
+            if (self.selectedWeekTimes) {
+                params = {
                     app_id: self.getAppId(),
                     ground_id: self.id,
                     today: self.selectedWeekTimes
-                },
+                }
+            } else {
+                params = {
+                    app_id: self.getAppId(),
+                    ground_id: self.id,
+                }
+            }
+
+            self._post(
+                'ground.ground/getSchedule',params,
                 function (res) {
                     if (res.code) {
                         self.cdList = res.data.lists1