From 01886bf72930e451dd1a59f8942ea9fa7a521a30 Mon Sep 17 00:00:00 2001
From: sjeam <359824901@qq.com>
Date: Fri, 15 Aug 2025 10:36:08 +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 | 4 +-
src/pages/banquet/combo/index.vue | 4 +-
src/pages/banquet/order/detail.vue | 175 +++++++++++++----------------
src/pages/tab/home/index.vue | 2 +-
4 files changed, 82 insertions(+), 103 deletions(-)
diff --git a/src/pages/banquet/combo/detail.vue b/src/pages/banquet/combo/detail.vue
index dc378ab..c4e3bd2 100644
--- a/src/pages/banquet/combo/detail.vue
+++ b/src/pages/banquet/combo/detail.vue
@@ -225,8 +225,8 @@
message: '请输入详细地址'
}
]" />
-
-
+
+
确定预定（做席后再支付）
付定金锁定订单
diff --git a/src/pages/banquet/combo/index.vue b/src/pages/banquet/combo/index.vue
index d990b06..a3297c6 100644
--- a/src/pages/banquet/combo/index.vue
+++ b/src/pages/banquet/combo/index.vue
@@ -534,11 +534,11 @@ export default defineComponent({
console.log(item);
if (item.type === 1) {
uni.navigateTo({
- url: `/pages/banquet/combo/dishes?id=${item.id}&is_add=1`
+ url: `/pages/banquet/combo/dishes?id=${item.id}`
});
} else {
uni.navigateTo({
- url: `/pages/banquet/combo/dishes_combo?id=${item.id}&is_add=1`
+ url: `/pages/banquet/combo/dishes_combo?id=${item.id}`
});
}
diff --git a/src/pages/banquet/order/detail.vue b/src/pages/banquet/order/detail.vue
index 3286383..5699dac 100644
--- a/src/pages/banquet/order/detail.vue
+++ b/src/pages/banquet/order/detail.vue
@@ -66,9 +66,9 @@
prefixIcon="weixin-fill" customStyle="font-weight:bold"
iconStyle="font-size:64rpx;color:#59CB56;margin-right:10rpx;" lines="1" decoration="none">
-
+
-
+
@@ -84,6 +84,9 @@
+
+
+
@@ -115,17 +118,16 @@
:show="true" prefixIcon="" customStyle="font-weight:bold"
iconStyle="font-size:28rpx;color:#59CB56;margin-right:10rpx;" lines="1" decoration="none">
-
+
-
-
+
@@ -133,36 +135,42 @@
-
+
+ 费用合计：
+
+ ￥{{ orderInfo.final_price }}元
+
- -->
+
-
-
-
-
- 费用合计：
-
- ￥{{ totalPrice }}元
-
-
-
-
-
厨师姓名：{{ server_user.public_name }}
- 厨师联系方式：{{ server_user.phone }}
+ 厨师联系方式：{{ server_user.phone }}
查看详情
-
+
+ 订单编号：{{ orderInfo.order_sn }}
+ 下单时间：{{ orderInfo.create_time }}
+ 支付方式： 微信
+ 支付金额：￥{{ orderInfo.final_price }}元
+ 预付金额：￥{{ orderInfo.prepay_price }}元
+ 联系人：{{ orderInfo.customer_name }}
+ 联系电话：{{ orderInfo.phone }}
+ 宴席类型：{{ orderInfo.banquet_type }}
+ 宴席地址：{{ orderInfo.address }}
+ 备注：{{ orderInfo.remark }}
+
+
1.(不交定金)如若厨师接到更高价订单，可能会将您的订单取消。
@@ -172,62 +180,19 @@
-
+
-
-
确定支付
- 取消支付
-
+ 取消订单
@@ -248,30 +213,31 @@ export default defineComponent({
return {
totalPrice: 0,
server_user: {
+ id: 0,
phone: '',
public_name: '',
},
order_id: 0,
-
address_string: '',
banquetType: this.getBanquetType(),
propShowOrder: false,
- area: [],
- value: [],
- orderInfo: {
- district_name: [],
- street_name: '',
- // cart_ids: [], 酒店
- customer_name: '',
- phone: '',
- address: '',
- remark: '',
- banquet_type: '1',
- reservation_type: 1,
- order_id: 0,
- // table_number: 0, 酒店
- // banquet_date: '', 酒店
- },
+ // area: [],
+ // value: [],
+ orderInfo: [],
+ // orderInfo: {
+ // district_name: [],
+ // street_name: '',
+ // // cart_ids: [], 酒店
+ // customer_name: '',
+ // phone: '',
+ // address: '',
+ // remark: '',
+ // banquet_type: '1',
+ // reservation_type: 1,
+ // order_id: 0,
+ // // table_number: 0, 酒店
+ // // banquet_date: '', 酒店
+ // },
matchedItems_sp: [],
};
@@ -323,7 +289,7 @@ export default defineComponent({
// 微信支付
payOrder (type) {
if (type === 1) {
- //支付订单
+ //支付订单
CommonApi.commonPost('/api/banquet/order/pay', { order_id: this.order_id }).catch((res) => {
if (res.code === 1) {
// this.payOrder(res.data.order_id);
@@ -337,7 +303,17 @@ export default defineComponent({
}
});
} else {
- //取消支付
+ //取消订单
+ 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();
+ } else {
+ uni.$u.toast(res.msg);
+ }
+ });
}
@@ -391,10 +367,13 @@ export default defineComponent({
CommonApi.commonGet('/api/banquet/order/detail', { order_id: this.order_id }).catch((res) => {
if (res.code === 1) {
console.log(res)
- // this.matchedItems_sp = res.data.cart_list;
+ this.matchedItems_sp = res.data.order_info;
+
// this.totalPrice = res.data.total_price;
- // this.server_user.phone = res.data.server_user.certification.phone;
- // this.server_user.public_name = res.data.server_user.certification.public_name;
+ 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;
// this.$refs.pagingRefSP?.complete(res.data);
// console.log(res);
} else {
diff --git a/src/pages/tab/home/index.vue b/src/pages/tab/home/index.vue
index f4bc254..90943e0 100644
--- a/src/pages/tab/home/index.vue
+++ b/src/pages/tab/home/index.vue
@@ -184,7 +184,7 @@ export default defineComponent({
goodsDetail (id: number) {
console.log(id);
uni.navigateTo({
- url: `/pages/common/goods/detail?id=${id}&is_add=1`
+ url: `/pages/common/goods/detail?id=${id}`
});
},