diff --git a/src/bundle/coupon/coupon.vue b/src/bundle/coupon/coupon.vue index 884385e..db4f8be 100644 --- a/src/bundle/coupon/coupon.vue +++ b/src/bundle/coupon/coupon.vue @@ -100,10 +100,10 @@ - - + + 已选择1张 - + 确定 @@ -147,7 +147,7 @@ page { background-color: $cz-page-background; } - + .radio { :deep() { .wd-radio-group { diff --git a/src/bundle/group-buying/after-sales/after-sales.vue b/src/bundle/group-buying/after-sales/after-sales.vue new file mode 100644 index 0000000..5446a10 --- /dev/null +++ b/src/bundle/group-buying/after-sales/after-sales.vue @@ -0,0 +1,248 @@ + +{ + "layout": "default", + "style": { + "navigationStyle": "custom" + } +} + + + + + + + + diff --git a/src/bundle/group-buying/douyin/douyin-order-detail.vue b/src/bundle/group-buying/douyin/douyin-order-detail.vue index f339ae1..e8512d0 100644 --- a/src/bundle/group-buying/douyin/douyin-order-detail.vue +++ b/src/bundle/group-buying/douyin/douyin-order-detail.vue @@ -100,7 +100,7 @@ diff --git a/src/bundle/group-buying/douyin/order-list.vue b/src/bundle/group-buying/douyin/order-list.vue index 3f97fe8..3b0db58 100644 --- a/src/bundle/group-buying/douyin/order-list.vue +++ b/src/bundle/group-buying/douyin/order-list.vue @@ -20,7 +20,7 @@ - + @@ -38,7 +38,7 @@ - + 去兑换 @@ -50,6 +50,8 @@ import ComboCard from '@/components/order/ComboCard.vue' import { onPageScroll, onReachBottom } from '@dcloudio/uni-app' import useMescroll from "@/uni_modules/mescroll-uni/hooks/useMescroll.js" + import { GroupBuyingCategory } from '@/utils/groupBuying' + /* mescroll */ const { mescrollInit, downCallback } = useMescroll(onPageScroll, onReachBottom) // 调用mescroll的hook @@ -90,7 +92,7 @@ // console.log("🚀 ~ goods:", goods) // mescroll.endByPage(curPageData.length, res.totalPages); //必传参数(当前页的数据个数, 总页数) - + // }).catch(() => { // mescroll.endErr(); // 请求失败, 结束加载 // }) @@ -117,6 +119,13 @@ // }) }, + // 去兑换 + handleToExcharge: () => { + uni.navigateTo({ + url: '/bundle/group-buying/douyin/excharge' + }) + }, + // 切换菜单 handleChangeMenu: (type: number) => { currentType.value = type @@ -160,7 +169,7 @@ } .excharge { - background: url(#{$OSS}images/douyin/douyin_image1.png) 0 0 no-repeat; + background: url(#{$OSS}images/douyin/douyin_image1.png) 0 0 no-repeat; background-size: 100%; } diff --git a/src/bundle/group-buying/platform/direct-order-detail.vue b/src/bundle/group-buying/platform/direct-order-detail.vue index f1dcecf..0f00c42 100644 --- a/src/bundle/group-buying/platform/direct-order-detail.vue +++ b/src/bundle/group-buying/platform/direct-order-detail.vue @@ -142,38 +142,13 @@ - - - 售后订单 - - 售后原因 - 买多了/买错了 - - - 退款金额 - ￥159.22 - - - 申请时间 - 2019-05-16 13:20:26 - - - 退款编号 - - 7327328627526903 - - 复制 - - - - - 申请退款 - 立即预定 + 申请退款 + 立即预定 @@ -186,7 +161,7 @@ - diff --git a/src/bundle/group-buying/platform/franchise-order-detail.vue b/src/bundle/group-buying/platform/franchise-order-detail.vue index 8fcca49..f9a1770 100644 --- a/src/bundle/group-buying/platform/franchise-order-detail.vue +++ b/src/bundle/group-buying/platform/franchise-order-detail.vue @@ -17,15 +17,10 @@ 请在2025.12.31(含)前使用 品一口香茗，让生活慢下来，从一杯好茶开始 - - 退款成功￥128.00 - 谢谢您的信任，我们一定会做的更好 - 2025年4月13日 18:22 - - + @@ -183,7 +178,7 @@ - diff --git a/src/bundle/reserve-room/choose-room.vue b/src/bundle/reserve-room/choose-room.vue new file mode 100644 index 0000000..9cfc458 --- /dev/null +++ b/src/bundle/reserve-room/choose-room.vue @@ -0,0 +1,227 @@ + +{ + "layout": "tabbar", + "style": { + "navigationStyle": "custom" + } +} + + + + + diff --git a/src/bundle/reserve-room/detail.vue b/src/bundle/reserve-room/detail.vue index be929f2..b7d3119 100644 --- a/src/bundle/reserve-room/detail.vue +++ b/src/bundle/reserve-room/detail.vue @@ -13,12 +13,12 @@ - - + 这里是茶室的名称茶室的名称 @@ -141,8 +141,8 @@ - + @@ -166,7 +166,7 @@ - + @@ -175,16 +175,16 @@ 选择时间 - 开始时间 {{ startTimeLayout }} - 结束时间 {{ endTimeLayout }} @@ -230,10 +230,10 @@ 费用明细 - 茶室费 + 茶室费 ￥640.00 - + 茶室费（￥160元/小时） x4 @@ -259,7 +259,7 @@ - 实付金额 + 实付金额 ￥640.00 @@ -300,6 +300,7 @@ diff --git a/src/bundle/reserve-room/room.vue b/src/bundle/reserve-room/room.vue index ce4fbba..80fe60b 100644 --- a/src/bundle/reserve-room/room.vue +++ b/src/bundle/reserve-room/room.vue @@ -11,7 +11,7 @@ \ No newline at end of file + diff --git a/src/pages.json b/src/pages.json index aa577dd..cfd4c1e 100644 --- a/src/pages.json +++ b/src/pages.json @@ -146,7 +146,8 @@ "type": "page", "layout": "tabbar", "style": { - "navigationStyle": "custom" + "navigationStyle": "custom", + "navigationBarTitleText": "首页" } }, { @@ -178,6 +179,22 @@ "navigationBarTitleText": "分包页面" } }, + { + "path": "reserve-room/choose-room-reserve", + "type": "page", + "layout": "tabbar", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "reserve-room/choose-room", + "type": "page", + "layout": "tabbar", + "style": { + "navigationStyle": "custom" + } + }, { "path": "reserve-room/detail", "type": "page", @@ -202,6 +219,14 @@ "navigationStyle": "custom" } }, + { + "path": "group-buying/after-sales/after-sales", + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom" + } + }, { "path": "group-buying/douyin/douyin-order-detail", "type": "page", @@ -253,4 +278,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/pages/city/city.vue b/src/pages/city/city.vue index d747671..ac498eb 100644 --- a/src/pages/city/city.vue +++ b/src/pages/city/city.vue @@ -11,7 +11,9 @@ \ No newline at end of file + diff --git a/src/uni.scss b/src/uni.scss index 1b5f86f..75cd131 100644 --- a/src/uni.scss +++ b/src/uni.scss @@ -78,4 +78,5 @@ $uni-font-size-paragraph: 15px; /* chazhi 自定义 */ $cz-page-background: #F6F7F9; // 页面背景色 +$cz-theme-color: #4C9F44; // 页面背景色 $OSS: 'https://shchazhi.oss-cn-hangzhou.aliyuncs.com/fronted/'; diff --git a/src/utils/platformService.ts b/src/utils/platformService.ts new file mode 100644 index 0000000..2e891bd --- /dev/null +++ b/src/utils/platformService.ts @@ -0,0 +1,73 @@ +// 预约服务分类 +export enum ReserveServiceCategory { + ReserveRoom = 'ReserveRoom', // 预约茶室 + GroupBuying = 'GroupBuying', // 团购 +} + + +/** 售后服务分类 **/ + // 个人原因 +enum PersonalReasonEnum { + OverBought = 1, // 买多了/买错了 + NoLongerNeeded = 2 // 计划有变，暂时不需要的 +} + + // 商家原因 +enum MerchantReasonEnum { + CannotContact = 3, // 电话联系不上商家 + NotServing = 4, // 商家营业但不接待 + Renovating = 5 // 商家停止装修 +} + + // 个人原因映射 +export const PersonalReasonMap: { label: string, value: PersonalReasonEnum }[] = [ + { label: '买多了/买错了', value: PersonalReasonEnum.OverBought }, + { label: '计划有变，暂时不需要的', value: PersonalReasonEnum.NoLongerNeeded } +] + + // 商家原因映射 +export const MerchantReasonMap: { label: string, value: MerchantReasonEnum }[] = [ + { label: '电话联系不上商家', value: MerchantReasonEnum.CannotContact }, + { label: '商家营业但不接待', value: MerchantReasonEnum.NotServing }, + { label: '商家停止装修', value: MerchantReasonEnum.Renovating } +] + + // 售后原因映射（用于提交时的参数转换） +export const ReasonMap: Record = { + [PersonalReasonEnum.OverBought]: '买多了/买错了', + [PersonalReasonEnum.NoLongerNeeded]: '计划有变，暂时不需要的', + [MerchantReasonEnum.CannotContact]: '已退款', + [MerchantReasonEnum.NotServing]: '申请售后', + [MerchantReasonEnum.Renovating]: '申请售后中' +} + +/** 结束 **/ + +/** 预约（茶室、茶艺师预约） **/ + // 预约类型 +export enum ReserveCategory { + TeaRoom = 'teaRoom', // 直营店 + TeaSpecialist = 'teaSpecialist' // 茶艺师 +} + + // 预约类型对应名称 +export const ReserveCategoryText: Record = { + [ReserveCategory.TeaRoom]: '茶室预约', + [ReserveCategory.TeaSpecialist]: '茶艺师预约', +} + + // 通用订单状态 +export enum ReserveCategoryOrderStatus { + Consuming = 'consuming', // 消费中 + Reserved = 'reserved', // 已预约 + Serving = 'serving' // 服务中(茶艺师订单独有的) +} + + // 对应名称 +export const ReserveCategoryOrderStatusText: Record = { + [ReserveCategoryOrderStatus.Consuming]: '消费中', + [ReserveCategoryOrderStatus.Reserved]: '已预约', + [ReserveCategoryOrderStatus.Serving]: '服务中' +} + +/** 结束 **/