From 40570c7234fa126d07a9a48c525d89d7613a6ab8 Mon Sep 17 00:00:00 2001 From: wangxiaowei <1121133807@qq.com> Date: Wed, 3 Sep 2025 17:01:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=A1=B5=E9=9D=A2=E5=92=8C?= =?UTF-8?q?=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../douyin/douyin-order-detail.vue | 152 +++++++++++ src/bundle/group-buying/douyin/excharge.vue | 130 ++++++++++ src/bundle/group-buying/douyin/order-list.vue | 166 ++++++++++++ ...der-detail.vue => direct-order-detail.vue} | 152 ++++++----- .../platform/franchise-order-detail.vue | 240 ++++++++++++++++++ .../group-buying/platform/order-list.vue | 2 +- src/components/order/ComboCard.vue | 85 +++++-- src/components/order/ComboCoupon.vue | 57 +++-- src/pages.json | 34 ++- src/pages/my/my.vue | 5 +- src/utils/order.ts | 68 ++++- 11 files changed, 986 insertions(+), 105 deletions(-) create mode 100644 src/bundle/group-buying/douyin/douyin-order-detail.vue create mode 100644 src/bundle/group-buying/douyin/excharge.vue create mode 100644 src/bundle/group-buying/douyin/order-list.vue rename src/bundle/group-buying/platform/{order-detail.vue => direct-order-detail.vue} (56%) create mode 100644 src/bundle/group-buying/platform/franchise-order-detail.vue diff --git a/src/bundle/group-buying/douyin/douyin-order-detail.vue b/src/bundle/group-buying/douyin/douyin-order-detail.vue new file mode 100644 index 0000000..f339ae1 --- /dev/null +++ b/src/bundle/group-buying/douyin/douyin-order-detail.vue @@ -0,0 +1,152 @@ + +{ + "layout": "default", + "style": { + "navigationStyle": "custom" + } +} + + + + + + + + diff --git a/src/bundle/group-buying/douyin/excharge.vue b/src/bundle/group-buying/douyin/excharge.vue new file mode 100644 index 0000000..2f4f01e --- /dev/null +++ b/src/bundle/group-buying/douyin/excharge.vue @@ -0,0 +1,130 @@ + +{ + "layout": "default", + "style": { + "navigationStyle": "custom" + } +} + + + + + + + + diff --git a/src/bundle/group-buying/douyin/order-list.vue b/src/bundle/group-buying/douyin/order-list.vue new file mode 100644 index 0000000..3f97fe8 --- /dev/null +++ b/src/bundle/group-buying/douyin/order-list.vue @@ -0,0 +1,166 @@ +{ + "layout": "default", + "style": { + "navigationStyle": "custom" + } +} + + + + + + + diff --git a/src/bundle/group-buying/platform/order-detail.vue b/src/bundle/group-buying/platform/direct-order-detail.vue similarity index 56% rename from src/bundle/group-buying/platform/order-detail.vue rename to src/bundle/group-buying/platform/direct-order-detail.vue index 66a5ba4..f1dcecf 100644 --- a/src/bundle/group-buying/platform/order-detail.vue +++ b/src/bundle/group-buying/platform/direct-order-detail.vue @@ -9,33 +9,82 @@ + + + diff --git a/src/bundle/group-buying/platform/order-list.vue b/src/bundle/group-buying/platform/order-list.vue index b720e1a..c3371d5 100644 --- a/src/bundle/group-buying/platform/order-list.vue +++ b/src/bundle/group-buying/platform/order-list.vue @@ -61,7 +61,7 @@ // 菜单 const currentType = ref(1) - const menuList = reactive<{}> ([ + const menuList = reactive>([ { type: 1, title: '直营店', diff --git a/src/components/order/ComboCard.vue b/src/components/order/ComboCard.vue index 55e2d25..d76560a 100644 --- a/src/components/order/ComboCard.vue +++ b/src/components/order/ComboCard.vue @@ -1,7 +1,7 @@ diff --git a/src/components/order/ComboCoupon.vue b/src/components/order/ComboCoupon.vue index a6abc63..99fb106 100644 --- a/src/components/order/ComboCoupon.vue +++ b/src/components/order/ComboCoupon.vue @@ -1,6 +1,6 @@