From f412faeeabb6946073588c7968f2da6cc9fb2c95 Mon Sep 17 00:00:00 2001
From: lewis <604446095@qq.com>
Date: Fri, 15 Aug 2025 14:12:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E8=B0=83=E8=AF=95=E8=AE=A2=E5=8D=95=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/banquet/combo/detail.vue | 11 +++++++----
 src/pages/banquet/cook/detail.vue  |  4 ++--
 src/pages/banquet/order/detail.vue | 20 ++++++++++++++++++--
 src/pages/banquet/order/list.vue   |  6 +++---
 4 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/src/pages/banquet/combo/detail.vue b/src/pages/banquet/combo/detail.vue
index c4e3bd2..feeb7b1 100644
--- a/src/pages/banquet/combo/detail.vue
+++ b/src/pages/banquet/combo/detail.vue
@@ -186,7 +186,7 @@
             ]" />
           <wd-input label="联系电话" prop="phone" clearable v-model="orderInfo.phone" placeholder="请填写联系电话"
             :rules="[{ required: false, pattern: /^1[3-9]\d{9}$/, message: '请输入有效手机号码' }]" />
- 
+
           <wd-select-picker label="宴席类型" prop="banquet_type"  v-model="orderInfo.banquet_type" :columns="banquetType"
             type="radio"
               :rules="[
@@ -257,7 +257,7 @@ export default defineComponent({
         public_name: '',
       },
       server_user_id: 0,
- 
+
       address_string: '',
       banquetType: this.getBanquetType(),
       propShowOrder: false,
@@ -316,7 +316,10 @@ export default defineComponent({
     addOrder () {
       CommonApi.commonPost('/api/banquet/order/createOrder', this.orderInfo).catch((res) => {
         if (res.code === 1) {
-          this.propShowOrder = true;
+          // this.propShowOrder = true;
+          uni.navigateTo({
+            url: `/pages/banquet/order/detail?id=${res.data.order_id}`
+          });
         } else {
           uni.$u.toast(res.msg);
         }
@@ -340,7 +343,7 @@ export default defineComponent({
       });
 
 
- 
+
     },
     //获取地址
     getArea () {
diff --git a/src/pages/banquet/cook/detail.vue b/src/pages/banquet/cook/detail.vue
index f2292b5..c8e45a6 100644
--- a/src/pages/banquet/cook/detail.vue
+++ b/src/pages/banquet/cook/detail.vue
@@ -159,7 +159,7 @@ export default defineComponent({
     //加入购物车
     addCart (id) {
       uni.navigateTo({
-        url: `/pages/banquet/combo/index??id=${id}`
+        url: `/pages/banquet/combo/index?id=${id}`
       });
       // CommonApi.commonPost('/api/cart/add', {
       //   buy_now: false,
@@ -182,4 +182,4 @@ export default defineComponent({
 });
 
 
-</script>
\ No newline at end of file
+</script>
diff --git a/src/pages/banquet/order/detail.vue b/src/pages/banquet/order/detail.vue
index 5699dac..62c19e7 100644
--- a/src/pages/banquet/order/detail.vue
+++ b/src/pages/banquet/order/detail.vue
@@ -170,7 +170,7 @@
       <view class="pt-2">宴席地址：{{ orderInfo.address }}</view>
       <view class="pt-2">备注：{{ orderInfo.remark }}</view>
       <view class="pt-4" />
- 
+
       <template #title>
       </template>
       <view>1.(不交定金)如若厨师接到更高价订单，可能会将您的订单取消。</view>
@@ -180,7 +180,7 @@
 
       <wd-form ref="form" :model="orderInfo" errorType="message">
         <wd-cell-group border>
-<!-- 
+<!--
           <view class="pb-4" />
           <wd-input readonly label="联系姓名" prop="customer_name" clearable v-model="orderInfo.customer_name"
             placeholder="请填写联系姓名" />
@@ -297,6 +297,22 @@ export default defineComponent({
             // this.propShowOrder = true;
 
             console.log(res.data);
+            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));
+              }
+            })
             //  this.close();
           } else {
             uni.$u.toast(res.msg);
diff --git a/src/pages/banquet/order/list.vue b/src/pages/banquet/order/list.vue
index eaccadc..086aa1a 100644
--- a/src/pages/banquet/order/list.vue
+++ b/src/pages/banquet/order/list.vue
@@ -137,7 +137,7 @@ export default defineComponent({
 			console.log('列表分页',pageNo);
 			this.search_sp.page = pageNo;
 			console.log('列表分页',this.search_sp);
-			CommonApi.commonGet('/api/order/list', this.search_sp).catch((res) => {
+			CommonApi.commonGet('/api/banquet/order/list', this.search_sp).catch((res) => {
 				if (res.code === 1) {
 					this.$refs.pagingRefSP?.complete(res.data);
 					// console.log('刷新页面');
@@ -147,7 +147,7 @@ export default defineComponent({
 					// 		this.createOrderData.cart_ids.push(item.id);
 					// 	}
 					// });
-			
+
 				} else {
 					uni.$u.toast(res.msg);
 				}
@@ -156,7 +156,7 @@ export default defineComponent({
 
 		// 打开地图
 		getopenLocation (res) {
-			useLocation().openLocation(res.latitude, res.longitude,res.address,res.address) 
+			useLocation().openLocation(res.latitude, res.longitude,res.address,res.address)
 		},
 		//点击详情
 		orderDetail (id: number) {