From 77ced33f14137cbe76fe6b0653d99f70f9211af0 Mon Sep 17 00:00:00 2001
From: sjeam <359824901@qq.com>
Date: Fri, 15 Aug 2025 14:53:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=B4=E5=B8=AD2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/banquet/combo/detail.vue |  7 ++++---
 src/pages/banquet/order/detail.vue | 22 +++-------------------
 src/pages/banquet/order/list.vue   |  6 +++---
 3 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/src/pages/banquet/combo/detail.vue b/src/pages/banquet/combo/detail.vue
index 9d00089..be2ec2d 100644
--- a/src/pages/banquet/combo/detail.vue
+++ b/src/pages/banquet/combo/detail.vue
@@ -281,7 +281,7 @@
           public_name: '',
         },
         server_user_id: 0,
-
+        order_id: 0,//订单id
         address_string: '',
         banquetType: this.getBanquetType(),
         propShowOrder: false,
@@ -348,6 +348,7 @@
       addOrder() {
         CommonApi.commonPost('/api/banquet/order/createOrder', this.orderInfo).catch((res) => {
           if (res.code === 1) {
+            this.order_id = res.data.order_id;
             this.propShowOrder = true;
           } else {
             uni.$u.toast(res.msg);
@@ -356,10 +357,10 @@
       },
 
       // 微信支付
-      payOrder(order_id) {
+      payOrder() {
 
         CommonApi.commonPost('/api/banquet/order/pay', {
-          order_id: order_id
+          order_id: this.order_id
         }).catch((res) => {
           if (res.code === 1) {
               wx.requestPayment({
diff --git a/src/pages/banquet/order/detail.vue b/src/pages/banquet/order/detail.vue
index 28e74e2..7c0af7b 100644
--- a/src/pages/banquet/order/detail.vue
+++ b/src/pages/banquet/order/detail.vue
@@ -192,6 +192,7 @@
           <wd-textarea readonly auto-height label="备注" v-model="orderInfo.remark" placeholder="请填写备注" /> -->
           <view class="pb-4" />
           <wd-button plain hairline custom-style="width: calc(100vw - 100rpx);" @click="payOrder(1)">确定支付</wd-button>
+          <view class="pb-2" />
           <wd-button hairline custom-style="width: calc(100vw - 100rpx);" @click="payOrder(2)">取消订单</wd-button>
         </wd-cell-group>
       </wd-form>
@@ -273,19 +274,7 @@ export default defineComponent({
 
     // },
 
-    // //提交订单
-    // addOrder () {
-    //   CommonApi.commonPost('/api/banquet/order/createOrder', this.orderInfo).catch((res) => {
-    //     if (res.code === 1) {
-    //       this.payOrder(res.data.order_id);
-
-    //       this.propShowOrder = true;
-    //     } else {
-    //       uni.$u.toast(res.msg);
-    //     }
-    //   });
-    // },
-
+ 
     // 微信支付
     payOrder (type) {
       if (type === 1) {
@@ -293,9 +282,7 @@ export default defineComponent({
         CommonApi.commonPost('/api/banquet/order/pay', { order_id: this.order_id }).catch((res) => {
           if (res.code === 1) {
             // this.payOrder(res.data.order_id);
-
             // this.propShowOrder = true;
-
             console.log(res.data);
             wx.requestPayment({
               "timeStamp": res.data.timeStamp,
@@ -322,10 +309,7 @@ export default defineComponent({
         //取消订单
         CommonApi.commonPost('/api/banquet/order/cancel', { order_id: this.order_id }).catch((res) => {
           if (res.code === 1) {
-            // this.payOrder(res.data.order_id);
-            // this.propShowOrder = true;
-            console.log(res.data);
-            //  this.close();
+             uni.$u.toast(res.msg);
           } else {
             uni.$u.toast(res.msg);
           }
diff --git a/src/pages/banquet/order/list.vue b/src/pages/banquet/order/list.vue
index 3f7f2df..28bdd05 100644
--- a/src/pages/banquet/order/list.vue
+++ b/src/pages/banquet/order/list.vue
@@ -53,10 +53,10 @@ body {
 			</view>
 		</z-paging>
 
-		<up-button class="" style="" text="返回首页" type="primary" color="#59CB56" shape="circle" size="normal"
+		<!-- <up-button class="" style="" text="返回首页" type="primary" color="#59CB56" shape="circle" size="normal"
 			custom-style="width:calc(100vw - 50rpx)" @click="goBackHome">
-		</up-button>
-		<!-- </view> -->
+		</up-button> -->
+	 
 	</view>
 
 </template>