From 2d3ea0c2122fb8ce0fdf3299fb70072ca7a0b3fd Mon Sep 17 00:00:00 2001 From: wangxiaowei <1121133807@qq.com> Date: Wed, 10 Sep 2025 08:06:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AEi=E8=AF=A5=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../after-sales/after-sales.vue | 0 .../douyin/douyin-order-detail.vue | 0 .../douyin/excharge.vue | 0 .../douyin/order-list.vue | 2 +- .../platform/direct-order-detail.vue | 2 +- .../platform/franchise-order-detail.vue | 0 .../platform/order-list.vue | 0 .../order/reserve-room/order-detail.vue | 231 ++++++++++++++++++ src/components/order/ComboCard.vue | 64 ++++- src/components/order/ComboCoupon.vue | 2 +- src/pages.json | 24 +- src/pages/my/my.vue | 4 +- src/pages/reserve/reserve.vue | 27 +- 13 files changed, 323 insertions(+), 33 deletions(-) rename src/bundle/{group-buying => order}/after-sales/after-sales.vue (100%) rename src/bundle/{group-buying => order}/douyin/douyin-order-detail.vue (100%) rename src/bundle/{group-buying => order}/douyin/excharge.vue (100%) rename src/bundle/{group-buying => order}/douyin/order-list.vue (99%) rename src/bundle/{group-buying => order}/platform/direct-order-detail.vue (98%) rename src/bundle/{group-buying => order}/platform/franchise-order-detail.vue (100%) rename src/bundle/{group-buying => order}/platform/order-list.vue (100%) create mode 100644 src/bundle/order/reserve-room/order-detail.vue diff --git a/src/bundle/group-buying/after-sales/after-sales.vue b/src/bundle/order/after-sales/after-sales.vue similarity index 100% rename from src/bundle/group-buying/after-sales/after-sales.vue rename to src/bundle/order/after-sales/after-sales.vue diff --git a/src/bundle/group-buying/douyin/douyin-order-detail.vue b/src/bundle/order/douyin/douyin-order-detail.vue similarity index 100% rename from src/bundle/group-buying/douyin/douyin-order-detail.vue rename to src/bundle/order/douyin/douyin-order-detail.vue diff --git a/src/bundle/group-buying/douyin/excharge.vue b/src/bundle/order/douyin/excharge.vue similarity index 100% rename from src/bundle/group-buying/douyin/excharge.vue rename to src/bundle/order/douyin/excharge.vue diff --git a/src/bundle/group-buying/douyin/order-list.vue b/src/bundle/order/douyin/order-list.vue similarity index 99% rename from src/bundle/group-buying/douyin/order-list.vue rename to src/bundle/order/douyin/order-list.vue index 3b0db58..f0a81e0 100644 --- a/src/bundle/group-buying/douyin/order-list.vue +++ b/src/bundle/order/douyin/order-list.vue @@ -122,7 +122,7 @@ // 去兑换 handleToExcharge: () => { uni.navigateTo({ - url: '/bundle/group-buying/douyin/excharge' + url: '/bundle/order/douyin/excharge' }) }, diff --git a/src/bundle/group-buying/platform/direct-order-detail.vue b/src/bundle/order/platform/direct-order-detail.vue similarity index 98% rename from src/bundle/group-buying/platform/direct-order-detail.vue rename to src/bundle/order/platform/direct-order-detail.vue index 0f00c42..17d0203 100644 --- a/src/bundle/group-buying/platform/direct-order-detail.vue +++ b/src/bundle/order/platform/direct-order-detail.vue @@ -206,7 +206,7 @@ // 跳转到申请退款页面 handleToRefund: () => { uni.navigateTo({ - url: `/bundle/group-buying/after-sales/after-sales?type=direct&orderType=${GroupBuyingCategoryOrderStatus.AfterSaleApply}` + url: `/bundle/order/after-sales/after-sales?type=direct&orderType=${GroupBuyingCategoryOrderStatus.AfterSaleApply}` }) }, diff --git a/src/bundle/group-buying/platform/franchise-order-detail.vue b/src/bundle/order/platform/franchise-order-detail.vue similarity index 100% rename from src/bundle/group-buying/platform/franchise-order-detail.vue rename to src/bundle/order/platform/franchise-order-detail.vue diff --git a/src/bundle/group-buying/platform/order-list.vue b/src/bundle/order/platform/order-list.vue similarity index 100% rename from src/bundle/group-buying/platform/order-list.vue rename to src/bundle/order/platform/order-list.vue diff --git a/src/bundle/order/reserve-room/order-detail.vue b/src/bundle/order/reserve-room/order-detail.vue new file mode 100644 index 0000000..3deb36e --- /dev/null +++ b/src/bundle/order/reserve-room/order-detail.vue @@ -0,0 +1,231 @@ + +{ + "layout": "default", + "style": { + "navigationStyle": "custom" + } +} + + + + + + + + diff --git a/src/components/order/ComboCard.vue b/src/components/order/ComboCard.vue index c3be4fb..9b9808b 100644 --- a/src/components/order/ComboCard.vue +++ b/src/components/order/ComboCard.vue @@ -20,8 +20,8 @@ - - + + @@ -64,8 +64,8 @@ - - + + @@ -96,16 +96,16 @@ - - 消费中 - 已预约 - 服务中 + + 消费中 + 已预约 + 服务中 - - + + @@ -119,6 +119,44 @@ + + + + + + + + + + 茶艺师 + + + + + 金牌茶艺师 + + + 消费中 + 已预约 + 服务中 + + + + + + 上门服务 + + + 到点服务 + + + + + 预约时间：03/18 08:00-12:00 + + + + @@ -165,17 +203,17 @@ switch (props.type) { case 'Direct': uni.navigateTo({ - url: `/bundle/group-buying/platform/direct-order-detail?orderType=${props.orderType}` + url: `/bundle/order/platform/direct-order-detail?orderType=${props.orderType}` }) break; case 'Franchise': uni.navigateTo({ - url: `/bundle/group-buying/platform/franchise-order-detail?orderType=${props.orderType}` + url: `/bundle/order/platform/franchise-order-detail?orderType=${props.orderType}` }) break; case 'DouYin': uni.navigateTo({ - url: `/bundle/group-buying/douyin/douyin-order-detail?orderType=${props.orderType}` + url: `/bundle/order/douyin/douyin-order-detail?orderType=${props.orderType}` }) break; default: diff --git a/src/components/order/ComboCoupon.vue b/src/components/order/ComboCoupon.vue index 7dbd046..b0ea9b2 100644 --- a/src/components/order/ComboCoupon.vue +++ b/src/components/order/ComboCoupon.vue @@ -161,7 +161,7 @@ const comboCoupon = { handleToStore: () => { uni.navigateTo({ - url: '/src/bundle/group-buying/platform/store-detail' + url: '/src/bundle/order/platform/store-detail' }) } } diff --git a/src/pages.json b/src/pages.json index cfd4c1e..1d87041 100644 --- a/src/pages.json +++ b/src/pages.json @@ -220,7 +220,7 @@ } }, { - "path": "group-buying/after-sales/after-sales", + "path": "order/after-sales/after-sales", "type": "page", "layout": "default", "style": { @@ -228,7 +228,7 @@ } }, { - "path": "group-buying/douyin/douyin-order-detail", + "path": "order/douyin/douyin-order-detail", "type": "page", "layout": "default", "style": { @@ -236,7 +236,7 @@ } }, { - "path": "group-buying/douyin/excharge", + "path": "order/douyin/excharge", "type": "page", "layout": "default", "style": { @@ -244,7 +244,7 @@ } }, { - "path": "group-buying/douyin/order-list", + "path": "order/douyin/order-list", "type": "page", "layout": "default", "style": { @@ -252,7 +252,7 @@ } }, { - "path": "group-buying/platform/direct-order-detail", + "path": "order/platform/direct-order-detail", "type": "page", "layout": "default", "style": { @@ -260,7 +260,7 @@ } }, { - "path": "group-buying/platform/franchise-order-detail", + "path": "order/platform/franchise-order-detail", "type": "page", "layout": "default", "style": { @@ -268,7 +268,15 @@ } }, { - "path": "group-buying/platform/order-list", + "path": "order/platform/order-list", + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "order/reserve-room/order-detail", "type": "page", "layout": "default", "style": { @@ -278,4 +286,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/src/pages/my/my.vue b/src/pages/my/my.vue index 8dd0286..1ce83f0 100644 --- a/src/pages/my/my.vue +++ b/src/pages/my/my.vue @@ -248,14 +248,14 @@ // 跳转抖音团购 handleToDouYinGroupBuying() { uni.navigateTo({ - url: '/bundle/group-buying/douyin/order-list' + url: '/bundle/order/douyin/order-list' }) }, // 跳转平台团购 handleToPlatformGroupBuying() { uni.navigateTo({ - url: '/bundle/group-buying/platform/order-list' + url: '/bundle/order/platform/order-list' }) }, diff --git a/src/pages/reserve/reserve.vue b/src/pages/reserve/reserve.vue index 7ec4df0..5685c96 100644 --- a/src/pages/reserve/reserve.vue +++ b/src/pages/reserve/reserve.vue @@ -30,15 +30,28 @@ - - - - + + + + + + + - - + + + + + + + + + + + + + -