From 14f23ddcc3a7f4cc494de3fdf595e3824b1d9fb7 Mon Sep 17 00:00:00 2001
From: sjeam <359824901@qq.com>
Date: Sun, 17 Aug 2025 10:28:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=B4=E5=B8=AD2.0=20=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/banquet/combo/detail.vue |  12 +-
 src/pages/banquet/order/detail.vue | 303 +++++++++++++++--------------
 2 files changed, 172 insertions(+), 143 deletions(-)

diff --git a/src/pages/banquet/combo/detail.vue b/src/pages/banquet/combo/detail.vue
index 14a83ae..76e872b 100644
--- a/src/pages/banquet/combo/detail.vue
+++ b/src/pages/banquet/combo/detail.vue
@@ -293,7 +293,7 @@
           reservation_type: 1,
           server_user_id: 0,
           table_number: 1, //酒店
-          banquet_date: '', //酒店
+          banquet_date: null, //酒店
         },
         matchedItems_sp: [],
         showDatePicker: false
@@ -343,6 +343,9 @@
             uni.navigateTo({
               url: `/pages/banquet/order/detail?order_id=${res.data.order_id}`
             });
+          }else if (res.code === 0) {
+            uni.$u.toast('请求错误，请从新下单！');
+            this.goBack();
           } else {
             uni.$u.toast(res.msg);
           }
@@ -447,7 +450,12 @@
         });
       },
 
-
+      // 返回上一级
+      goBack() {
+        uni.navigateBack({
+          delta: 1 // delta 表示返回的页面数，1 表示返回上一级
+        });
+      },
     },
 
 
diff --git a/src/pages/banquet/order/detail.vue b/src/pages/banquet/order/detail.vue
index 89a9991..5612e71 100644
--- a/src/pages/banquet/order/detail.vue
+++ b/src/pages/banquet/order/detail.vue
@@ -1,29 +1,29 @@
 <style lang='scss'>
-.custom-count-down {
-  display: inline-block;
-  width: 22px;
-  color: #ff3232;
-  font-size: 12px;
-  text-align: center;
-  background-color: #ff404021;
-  border-radius: 2px;
-}
+  .custom-count-down {
+    display: inline-block;
+    width: 22px;
+    color: #ff3232;
+    font-size: 12px;
+    text-align: center;
+    background-color: #ff404021;
+    border-radius: 2px;
+  }
 
-.custom-count-down-colon {
-  display: inline-block;
-  margin: 0 4px;
-  color: #ff4040;
-}
+  .custom-count-down-colon {
+    display: inline-block;
+    margin: 0 4px;
+    color: #ff4040;
+  }
 
-.cell-icon {
-  display: block;
-  box-sizing: border-box;
-  width: 16px;
-  height: 16px;
-  margin-right: 4px;
-  background: url('https://img10.360buyimg.com/jmadvertisement/jfs/t1/71075/7/3762/1820/5d1f26d1E0d600b9e/a264c901943080ac.png') no-repeat;
-  background-size: cover;
-}
+  .cell-icon {
+    display: block;
+    box-sizing: border-box;
+    width: 16px;
+    height: 16px;
+    margin-right: 4px;
+    background: url('https://img10.360buyimg.com/jmadvertisement/jfs/t1/71075/7/3762/1820/5d1f26d1E0d600b9e/a264c901943080ac.png') no-repeat;
+    background-size: cover;
+  }
 </style>
 <template>
   <view>
@@ -169,10 +169,14 @@
       <view>4.在此，感谢您对此平台以及厨师们的支持，您的支持就是我们前进的最大动力。</view>
 
       <template #footer>
-        <view class="pb-4" />
-        <wd-button plain hairline custom-style="width: calc(100vw - 120rpx);" @click="payOrder(1)">确定支付</wd-button>
+
         <view class="pb-2" />
-        <wd-button hairline custom-style="width: calc(100vw - 120rpx);" @click="payOrder(2)">取消订单</wd-button>
+        <wd-button plain hairline custom-style="width: calc(100vw - 120rpx);" @click="payOrder(2)">取消订单</wd-button>
+        <view class="pb-2" />
+        <wd-button hairline custom-style="width: calc(100vw - 120rpx);" @click="payOrder(1)">确定支付</wd-button>
+        <view class="pb-2" />
+        <wd-button hairline custom-style="width: calc(100vw - 120rpx);" @click="goBackHome()">返回首页</wd-button>
+
       </template>
     </wd-card>
     <view class="p-2"></view>
@@ -180,123 +184,140 @@
 </template>
 
 <script lang="ts">
-import { useColPickerData, useModal } from '@/hooks'
-import { defineComponent } from "vue";
-import { CommonApi, UserApi } from "@/api";
-const { colPickerData, findChildrenByCode } = useColPickerData()
-export default defineComponent({
-  data () {
-    return {
-      totalPrice: 0,
-      server_user: {
-        id: 0,
-        phone: '',
-        public_name: '',
+  import {
+    useColPickerData,
+    useModal
+  } from '@/hooks'
+  import {
+    defineComponent
+  } from "vue";
+  import {
+    CommonApi,
+    UserApi
+  } from "@/api";
+  const {
+    colPickerData,
+    findChildrenByCode
+  } = useColPickerData()
+  export default defineComponent({
+    data() {
+      return {
+        totalPrice: 0,
+        server_user: {
+          id: 0,
+          phone: '',
+          public_name: '',
+        },
+        order_id: 0,
+        address_string: '',
+        banquetType: this.getBanquetType(),
+        propShowOrder: false,
+        orderInfo: [],
+        matchedItems_sp: [],
+
+      };
+    },
+    onLoad(option) {
+      this.order_id = option.order_id;;
+      this.orderInfo.order_id = option.order_id;
+      this.getOrderDetail()
+    },
+    methods: {
+      close() {
+        this.propShowOrder = false;
       },
-      order_id: 0,
-      address_string: '',
-      banquetType: this.getBanquetType(),
-      propShowOrder: false,
-      orderInfo: [],
-      matchedItems_sp: [],
-
-    };
-  },
-  onLoad (option) {
-    this.order_id = option.order_id;;
-    this.orderInfo.order_id = option.order_id;
-    this.getOrderDetail()
-  },
-  methods: {
-    close () {
-      this.propShowOrder = false;
-    },
-    // 微信支付
-    payOrder (type) {
-      if (type === 1) {
-        //支付订单
-        CommonApi.commonPost('/api/banquet/order/pay', { order_id: this.order_id }).catch((res) => {
-          if (res.code === 1) {
-            wx.requestPayment({
-              "timeStamp": res.data.timeStamp,
-              "nonceStr": res.data.nonceStr,
-              "package": res.data.package,
-              "signType": res.data.signType,
-              "paySign": res.data.paySign,
-              "success": function (res) {
-                console.log('success:' + JSON.stringify(res));
-              },
-              "fail": function (err) {
-                console.log('fail:' + JSON.stringify(err));
-              },
-              "complete": function (res) {
-                console.log('complete:' + JSON.stringify(res));
-              }
-            })
-          } else if (res.code == 9304) {
-            this.payOrder(1);
-          } else {
-            uni.$u.toast(res.msg);
-          }
-        });
-      } else {
-        //取消订单
-        CommonApi.commonPost('/api/banquet/order/cancel', { order_id: this.order_id }).catch((res) => {
-          if (res.code === 1) {
-            uni.$u.toast(res.msg);
-          } else {
-            uni.$u.toast(res.msg);
-          }
-          this.goBack()
-        });
-      }
-    },
-    //宴席类型
-    getBanquetType () {
-      CommonApi.commonGet('/api/banquet/dishes/banquetType').catch((res) => {
-        if (res.code === 1) {
-          res.data.forEach(item => {
-            item.label = item.name;
-
+      // 微信支付
+      payOrder(type) {
+        if (type === 1) {
+          //支付订单
+          CommonApi.commonPost('/api/banquet/order/pay', {
+            order_id: this.order_id
+          }).catch((res) => {
+            if (res.code === 1) {
+              wx.requestPayment({
+                "timeStamp": res.data.timeStamp,
+                "nonceStr": res.data.nonceStr,
+                "package": res.data.package,
+                "signType": res.data.signType,
+                "paySign": res.data.paySign,
+                "success": function(res) {
+                  console.log('success:' + JSON.stringify(res));
+                },
+                "fail": function(err) {
+                  console.log('fail:' + JSON.stringify(err));
+                },
+                "complete": function(res) {
+                  console.log('complete:' + JSON.stringify(res));
+                }
+              })
+            } else if (res.code == 9304) {
+              this.payOrder(1);
+            } else {
+              uni.$u.toast(res.msg);
+            }
           });
-          this.banquetType = res.data;
         } else {
-          uni.$u.toast(res.msg);
+          //取消订单
+          CommonApi.commonPost('/api/banquet/order/cancel', {
+            order_id: this.order_id
+          }).catch((res) => {
+            if (res.code === 1) {
+              uni.$u.toast(res.msg);
+            } else {
+              uni.$u.toast(res.msg);
+            }
+            this.goBack()
+          });
         }
-      });
+      },
+      //宴席类型
+      getBanquetType() {
+        CommonApi.commonGet('/api/banquet/dishes/banquetType').catch((res) => {
+          if (res.code === 1) {
+            res.data.forEach(item => {
+              item.label = item.name;
+
+            });
+            this.banquetType = res.data;
+          } else {
+            uni.$u.toast(res.msg);
+          }
+        });
+      },
+      // //购物车验证
+      getOrderDetail() {
+        CommonApi.commonGet('/api/banquet/order/detail', {
+          order_id: this.order_id
+        }).catch((res) => {
+          if (res.code === 1) {
+            this.matchedItems_sp = res.data.order_info;
+            this.orderInfo = res.data.order;
+            this.server_user.phone = res.data.server_info.certification.phone;
+            this.server_user.public_name = res.data.server_info.certification.public_name;
+            this.server_user.id = res.data.server_info.id;
+          } else {
+            uni.$u.toast(res.msg);
+          }
+        });
+      },
+      //点击详情
+      cookDetail(id: number) {
+        uni.navigateTo({
+          url: `/pages/banquet/cook/detail?id=${id}`
+        });
+      },
+      goBackHome() {
+        uni.switchTab({
+          // url: '/pages/index/index'
+          url: '/pages/tab/user/index'
+        });
+      },
+      // 返回上一级
+      goBack() {
+        uni.navigateBack({
+          delta: 1 // delta 表示返回的页面数，1 表示返回上一级
+        });
+      },
     },
-    // //购物车验证
-    getOrderDetail () {
-      CommonApi.commonGet('/api/banquet/order/detail', { order_id: this.order_id }).catch((res) => {
-        if (res.code === 1) {
-          this.matchedItems_sp = res.data.order_info;
-          this.orderInfo = res.data.order;
-          this.server_user.phone = res.data.server_info.certification.phone;
-          this.server_user.public_name = res.data.server_info.certification.public_name;
-          this.server_user.id = res.data.server_info.id;
-        } else {
-          uni.$u.toast(res.msg);
-        }
-      });
-    },
-    //点击详情
-    cookDetail (id: number) {
-      uni.navigateTo({
-        url: `/pages/banquet/cook/detail?id=${id}`
-      });
-    },
-    goBackHome () {
-      uni.switchTab({
-        // url: '/pages/index/index'
-        url: '/pages/tab/user/index'
-      });
-    },
-    // 返回上一级
-    goBack () {
-      uni.navigateBack({
-        delta: 1 // delta 表示返回的页面数，1 表示返回上一级
-      });
-    },
-  },
-});
-</script>
+  });
+</script>
\ No newline at end of file