diff --git a/src/bundle/collect/collect.vue b/src/bundle/collect/collect.vue new file mode 100644 index 0000000..5f8f5ae --- /dev/null +++ b/src/bundle/collect/collect.vue @@ -0,0 +1,175 @@ + +{ + // "needLogin": true, + "layout": "default", + "style": { + "navigationStyle": "custom" + } +} + + + + + + + diff --git a/src/bundle/coupon/coupon.vue b/src/bundle/coupon/coupon.vue index db4f8be..4418f30 100644 --- a/src/bundle/coupon/coupon.vue +++ b/src/bundle/coupon/coupon.vue @@ -29,6 +29,7 @@ :key="item.id" :coupon="item" canUse + showChecked :checked="item.id === checkedId" :onCheck="coupons.handleCheck" :class="index !== couponList.length - 1 ? 'mb-20rpx' : ''" @@ -48,6 +49,7 @@ :key="item.id" :coupon="item" :canUse="false" + showChecked :checked="item.id === checkedId" :onCheck="coupons.handleCheck" :class="index !== couponList.length - 1 ? 'mb-20rpx' : ''" diff --git a/src/bundle/coupon/my-coupon.vue b/src/bundle/coupon/my-coupon.vue new file mode 100644 index 0000000..f9cbf8c --- /dev/null +++ b/src/bundle/coupon/my-coupon.vue @@ -0,0 +1,144 @@ + +{ + // "needLogin": true, + "layout": "default", + "style": { + "navigationStyle": "custom" + } +} + + + + + + + diff --git a/src/bundle/order/platform/direct-order-detail.vue b/src/bundle/order/platform/direct-order-detail.vue index 5db2e2f..aedd7e5 100644 --- a/src/bundle/order/platform/direct-order-detail.vue +++ b/src/bundle/order/platform/direct-order-detail.vue @@ -213,7 +213,7 @@ // 跳转到立即预定页面(选择茶室) handleToChooseTeaRoom: () => { uni.navigateTo({ - url: `/bundle/reserve-room/choose-room` + url: `/bundle/tea-room/choose-room` }) }, diff --git a/src/bundle/order/reserve-room/order-detail.vue b/src/bundle/order/tea-room/order-detail.vue similarity index 98% rename from src/bundle/order/reserve-room/order-detail.vue rename to src/bundle/order/tea-room/order-detail.vue index ffa6699..da54026 100644 --- a/src/bundle/order/reserve-room/order-detail.vue +++ b/src/bundle/order/tea-room/order-detail.vue @@ -9,14 +9,12 @@ diff --git a/src/pages/notice/bill.vue b/src/pages/notice/bill.vue index fe9ccab..7430e43 100644 --- a/src/pages/notice/bill.vue +++ b/src/pages/notice/bill.vue @@ -21,6 +21,6 @@ type.value = args.type || '' }) - + diff --git a/src/pages/notice/pay.vue b/src/pages/notice/pay.vue index 06e974e..1f727aa 100644 --- a/src/pages/notice/pay.vue +++ b/src/pages/notice/pay.vue @@ -7,8 +7,8 @@ } @@ -34,7 +56,7 @@ // 预约茶室 - 查看订单 handleRoomSeeOrder: () => { uni.navigateTo({ - url: '/bundle/reserve-room/order' + url: '/bundle/tea-room/order' }) }, @@ -43,6 +65,20 @@ uni.switchTab({ url: '/pages/index/index' }) + }, + + // 购买会员 - 完成 + handleVipDone: () => { + uni.switchTab({ + url: '/pages/index/index' + }) + }, + + // 我的钱包-充值 + handleRechargeDone: () => { + uni.switchTab({ + url: '/pages/index/index' + }) } } diff --git a/src/pages/notice/reserve.vue b/src/pages/notice/reserve.vue index e6a78e0..6b7d963 100644 --- a/src/pages/notice/reserve.vue +++ b/src/pages/notice/reserve.vue @@ -34,7 +34,7 @@ // 预约茶室 - 查看订单 handleRoomSeeOrder: () => { uni.navigateTo({ - url: '/bundle/reserve-room/order' + url: '/bundle/tea-room/order' }) }, diff --git a/src/pages/reserve/reserve.vue b/src/pages/reserve/reserve.vue index dca75ec..1bc04aa 100644 --- a/src/pages/reserve/reserve.vue +++ b/src/pages/reserve/reserve.vue @@ -134,7 +134,7 @@ // 茶室预约-跳转到对应的订单页 handleToReserveRoomOrder: () => { uni.navigateTo({ - url: `/bundle/order/reserve-room/order-detail?orderStatus=${ReserveCategoryOrderStatus.Consuming}` + url: `/bundle/order/tea-room/order-detail?orderStatus=${ReserveCategoryOrderStatus.Consuming}` }) }, diff --git a/src/utils/order.ts b/src/utils/order.ts index 33c5c10..b13c828 100644 --- a/src/utils/order.ts +++ b/src/utils/order.ts @@ -154,3 +154,34 @@ export const ReserveCategoryOrderStatusText: Record = { + [TeaRoomOrderStatus.Pending]: '待付款', + [TeaRoomOrderStatus.Reserved]: '预约单', + [TeaRoomOrderStatus.Finished]: '已完结' +} +/** 结束 **/ + +/** 茶艺师订单 **/ +export enum TeaSpecialistOrderStatus { + Pending = 'pending', // 待付款 + Reserved = 'reserved', // 预约单 + Confirm = 'confirm', // 待确认 + Finished = 'finished' // 已完结 +} + +export const TeaSpecialistOrderStatusText: Record = { + [TeaSpecialistOrderStatus.Pending]: '待付款', + [TeaSpecialistOrderStatus.Reserved]: '预约单', + [TeaSpecialistOrderStatus.Confirm]: '待确认', + [TeaSpecialistOrderStatus.Finished]: '已完结' +} +/** 结束 **/ diff --git a/src/utils/pay.ts b/src/utils/pay.ts new file mode 100644 index 0000000..8e5f280 --- /dev/null +++ b/src/utils/pay.ts @@ -0,0 +1,49 @@ +interface PayMethod { + id: number + name: string + icon: string + balance: number + value: number, + type: string +} + +// 支付方式分类 +export enum PayCategory { + PlatformBalance = 'PlatformBalance', // 平台余额 + StoreBalance = 'StoreBalance', // 门店余额 + WeChatPay = 'WeChatPay', // 微信支付 +} + +export enum PayValue { + PlatformBalance = 1, // 平台余额 + StoreBalance = 2, // 门店余额 + WeChatPay = 3, // 微信支付 +} + +// 支付方式列表 +export const PayList: PayMethod[] = [ + { + id: 1, + name: '平台余额', + icon: 'icon/icon_platform_balance.png', + balance: 0, + value: PayValue.PlatformBalance, + type: PayCategory.PlatformBalance + }, + { + id: 2, + name: '门店余额', + icon: 'icon/icon_store_balance.png', + balance: 0, + value: PayValue.StoreBalance, + type: PayCategory.StoreBalance + }, + { + id: 3, + name: '微信支付', + icon: 'icon/icon_weichat.png', + balance: 0, + value: PayValue.WeChatPay, + type: PayCategory.WeChatPay + } +] \ No newline at end of file