From 2c7ad346df87999005faa1a052240af50083c103 Mon Sep 17 00:00:00 2001
From: sjeam <359824901@qq.com>
Date: Sun, 17 Aug 2025 09:07:32 +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.json                     | 12 ++++++------
 src/pages/banquet/combo/detail.vue |  2 +-
 src/pages/banquet/order/detail.vue |  8 +++++---
 src/pages/banquet/order/list.vue   |  2 +-
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/pages.json b/src/pages.json
index ee49d99..6ba2f3f 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -110,10 +110,10 @@
             "navigationStyle": "custom"
           },
           "needLogin": true
-        },
-        
+        }
+
+
 
-        
       ]
     },
     {
@@ -224,13 +224,13 @@
       //   "selectedIconPath": "static/images/tabbar/shouye_selected.png",
       //   "pagePath": "pages/tab/home/index",
       //   "text": "菜单分类"
-      // }, 
+      // },
       // {
       //   "iconPath": "static/images/tabbar/bofang.png",
       //   "selectedIconPath": "static/images/tabbar/bofang_selected.png",
       //   "pagePath": "pages/tab/list/index",
       //   "text": "食谱清单"
-      // }, 
+      // },
       {
         "iconPath": "static/images/tabbar/wode.png",
         "selectedIconPath": "static/images/tabbar/wode_selected.png",
@@ -245,4 +245,4 @@
     "navigationBarBackgroundColor": "#F8F8F8",
     "backgroundColor": "#F8F8F8"
   }
-}
\ No newline at end of file
+}
diff --git a/src/pages/banquet/combo/detail.vue b/src/pages/banquet/combo/detail.vue
index 42e5f6c..c7b8c47 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: '', //酒店
         },
         matchedItems_sp: [],
       };
diff --git a/src/pages/banquet/order/detail.vue b/src/pages/banquet/order/detail.vue
index 26ec998..89a9991 100644
--- a/src/pages/banquet/order/detail.vue
+++ b/src/pages/banquet/order/detail.vue
@@ -203,8 +203,8 @@ export default defineComponent({
     };
   },
   onLoad (option) {
-    this.order_id = option.id;;
-    this.orderInfo.order_id = option.id;
+    this.order_id = option.order_id;;
+    this.orderInfo.order_id = option.order_id;
     this.getOrderDetail()
   },
   methods: {
@@ -233,6 +233,8 @@ export default defineComponent({
                 console.log('complete:' + JSON.stringify(res));
               }
             })
+          } else if (res.code == 9304) {
+            this.payOrder(1);
           } else {
             uni.$u.toast(res.msg);
           }
@@ -245,7 +247,7 @@ export default defineComponent({
           } else {
             uni.$u.toast(res.msg);
           }
-          this.goBack () 
+          this.goBack()
         });
       }
     },
diff --git a/src/pages/banquet/order/list.vue b/src/pages/banquet/order/list.vue
index a2d50a5..5d15029 100644
--- a/src/pages/banquet/order/list.vue
+++ b/src/pages/banquet/order/list.vue
@@ -112,7 +112,7 @@ export default defineComponent({
 		//点击详情
 		orderDetail (id: number) {
 			uni.navigateTo({
-				url: `/pages/banquet/order/detail?id=${id}`
+				url: `/pages/banquet/order/detail?order_id=${id}`
 			});
 		},
 		goBackHome () {