From be39bd6da8b2fd8e41601930ab6815f9e17f1df3 Mon Sep 17 00:00:00 2001
From: wangxiaowei <1121133807@qq.com>
Date: Sat, 20 Sep 2025 17:02:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 1 +
pnpm-lock.yaml | 13 +
src/bundle/order/tea-room/order-detail.vue | 282 +++++------
src/bundle/order/tea-room/order-list.vue | 51 +-
.../order/tea-specialist/order-detail.vue | 478 +++++++++++++-----
.../order/tea-specialist/order-list.vue | 185 +++++++
src/bundle/parten/components/Tabbar.vue | 60 +++
src/bundle/parten/pages/bill/bill.vue | 24 +
src/bundle/parten/pages/my/my.vue | 24 +
src/bundle/parten/pages/sub/sub.vue | 24 +
src/bundle/profile/profile.vue | 6 +-
src/bundle/settle-in/parten.vue | 227 +++++++++
src/bundle/settle-in/tea-room.vue | 271 ++++++++++
src/bundle/settle-in/tea-specialist.vue | 377 ++++++++++++++
src/components/order/ComboCard.vue | 143 +++++-
src/hooks/useColPickerData.ts | 38 ++
src/pages.json | 56 ++
src/pages/login/mobile.vue | 2 -
src/pages/my/my.vue | 56 +-
src/utils/order.ts | 8 +-
20 files changed, 1962 insertions(+), 364 deletions(-)
create mode 100644 src/bundle/order/tea-specialist/order-list.vue
create mode 100644 src/bundle/parten/components/Tabbar.vue
create mode 100644 src/bundle/parten/pages/bill/bill.vue
create mode 100644 src/bundle/parten/pages/my/my.vue
create mode 100644 src/bundle/parten/pages/sub/sub.vue
create mode 100644 src/bundle/settle-in/parten.vue
create mode 100644 src/bundle/settle-in/tea-room.vue
create mode 100644 src/bundle/settle-in/tea-specialist.vue
create mode 100644 src/hooks/useColPickerData.ts
diff --git a/package.json b/package.json
index 073136a..fcb0e1f 100644
--- a/package.json
+++ b/package.json
@@ -95,6 +95,7 @@
"@dcloudio/uni-mp-xhs": "3.0.0-4070520250711001",
"@dcloudio/uni-quickapp-webview": "3.0.0-4070520250711001",
"@tanstack/vue-query": "^5.62.16",
+ "@vant/area-data": "^2.1.0",
"abortcontroller-polyfill": "^1.7.8",
"alova": "^3.3.3",
"dayjs": "1.11.10",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9468bff..1559698 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -73,6 +73,9 @@ importers:
'@tanstack/vue-query':
specifier: ^5.62.16
version: 5.83.1(vue@3.4.21(typescript@5.9.2))
+ '@vant/area-data':
+ specifier: ^2.1.0
+ version: 2.1.0
abortcontroller-polyfill:
specifier: ^1.7.8
version: 1.7.8
@@ -234,6 +237,8 @@ importers:
specifier: ^2.2.10
version: 2.2.12(typescript@5.9.2)
+ src/uni_modules/mescroll-uni: {}
+
src/uni_modules/uni-icons: {}
src/uni_modules/uni-scss: {}
@@ -1206,6 +1211,7 @@ packages:
'@esbuild/darwin-arm64@0.20.2':
resolution: {integrity: sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==}
engines: {node: '>=12'}
+ cpu: [arm64]
os: [darwin]
'@esbuild/darwin-arm64@0.23.1':
@@ -1223,6 +1229,7 @@ packages:
'@esbuild/darwin-x64@0.20.2':
resolution: {integrity: sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==}
engines: {node: '>=12'}
+ cpu: [x64]
os: [darwin]
'@esbuild/darwin-x64@0.23.1':
@@ -2091,6 +2098,7 @@ packages:
'@rollup/rollup-darwin-x64@4.46.2':
resolution: {integrity: sha512-SSj8TlYV5nJixSsm/y3QXfhspSiLYP11zpfwp6G/YDXctf3Xkdnk4woJIF5VQe0of2OjzTt8EsxnJDCdHd2xMA==}
+ cpu: [x64]
os: [darwin]
'@rollup/rollup-freebsd-arm64@4.46.2':
@@ -2589,6 +2597,9 @@ packages:
peerDependencies:
vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0 || ^5.0.0-0 || ^6.0.0-0
+ '@vant/area-data@2.1.0':
+ resolution: {integrity: sha512-wx9PrUX7wSUJiFcz8UrcvZfTjV6sTc+7SHcbjGQQzEcv5y+EwOo5uV4ZKdfrR5Hzcw4MA08LQdvXPSEb4nWbug==}
+
'@vitejs/plugin-legacy@5.3.2':
resolution: {integrity: sha512-8moCOrIMaZ/Rjln0Q6GsH6s8fAt1JOI3k8nmfX4tXUxE5KAExVctSyOBk+A25GClsdSWqIk2yaUthH3KJ2X4tg==}
engines: {node: ^18.0.0 || >=20.0.0}
@@ -9669,6 +9680,8 @@ snapshots:
transitivePeerDependencies:
- vue
+ '@vant/area-data@2.1.0': {}
+
'@vitejs/plugin-legacy@5.3.2(terser@5.43.1)(vite@5.2.8(@types/node@20.19.9)(sass@1.77.8)(terser@5.43.1))':
dependencies:
'@babel/core': 7.28.0
diff --git a/src/bundle/order/tea-room/order-detail.vue b/src/bundle/order/tea-room/order-detail.vue
index 11e3cf7..4cfc41f 100644
--- a/src/bundle/order/tea-room/order-detail.vue
+++ b/src/bundle/order/tea-room/order-detail.vue
@@ -9,12 +9,146 @@
+
+
+
+
+
+
+ 续订包间
+
+
+ 续订时间
+
+
+ {{ item.time }}
+
+
+
+
+
+ 支付方式
+
+
+
+
+
+ {{ item.name }}
+
+
+
+ 可用202.22
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 合计：
+
+
+
+
+
+
+
+
+ 立即预定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 包间续订成功
+ 可以刷新页面查看预约时间
+ 好的
+
+
+
+
+
+
+
+
+
+
+
+
+ 费用明细
+
+
+
+ 茶室费
+
+ ￥640.00
+
+
+
+
+
+ 茶室费（￥160元/小时）
+ x4
+
+
+
+
+
+
+
+ 优惠
+
+ -￥148.00
+
+
+
+
+ 优惠券
+ -￥20
+
+
+
+ 会员八折
+ -￥20
+
+
+
+
+
+
+
+
+ 实际退款
+ ￥698.90
+
+
+
+
+
- 使用过程中有任何问题，请联系客服
+ 使用过程中有任何问题，请联系客服
@@ -27,7 +161,7 @@
订单自动取消
- 品一口香茗，让生活慢下来，从一杯好茶开始
+ 品一口香茗，让生活慢下来，从一杯好茶开始
@@ -191,9 +325,9 @@
- 取消
+ 取消
-
+
@@ -211,139 +345,6 @@
再次预定
-
-
-
-
-
-
-
- 续订包间
-
-
- 续订时间
-
-
- {{ item.time }}
-
-
-
-
-
- 支付方式
-
-
-
-
-
- {{ item.name }}
-
-
-
- 可用202.22
-
-
-
-
-
-
-
-
-
-
-
-
-
- 合计：
-
-
-
-
-
-
-
-
- 立即预定
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 包间续订成功
- 可以刷新页面查看预约时间
- 好的
-
-
-
-
-
-
-
-
-
-
-
-
- 费用明细
-
-
-
- 茶室费
-
- ￥640.00
-
-
-
-
-
- 茶室费（￥160元/小时）
- x4
-
-
-
-
-
-
-
- 优惠
-
- -￥148.00
-
-
-
-
- 优惠券
- -￥20
-
-
-
- 会员八折
- -￥20
-
-
-
-
-
-
-
-
- 实际退款
- ￥698.90
-
-
-
@@ -357,7 +358,7 @@
const title = ref('')
const orderStatus = ref('') // 订单状态：待使用、退款等
- /** 续订包间 **/
+ // 续订包间
const showRenewPopup = ref(false)
const timeList = [
{id: 1, time: '1小时'},
@@ -387,7 +388,6 @@
])
const showRenewSuccessPopup = ref(false)
- /** 结束 **/
// 订单倒计时取消
const time = ref(30 * 60 * 60 * 1000)
@@ -397,8 +397,6 @@
// 费用明细
const showCostPopup = ref(false) // 是否显示退款详情弹出框
- const costValue = ref(['item1'])
-
onLoad((args) => {
title.value = OrderStatusTitle[OrderSource.TeaRoom][args.orderStatus] || '订单详情'
@@ -407,7 +405,7 @@
orderStatus.value = args.orderStatus
})
- const orderDetail = {
+ const OrderDetail = {
// 取消订单
handleCancelOrder: () => {
message.confirm({
diff --git a/src/bundle/order/tea-room/order-list.vue b/src/bundle/order/tea-room/order-list.vue
index c2e1e41..268b9e0 100644
--- a/src/bundle/order/tea-room/order-list.vue
+++ b/src/bundle/order/tea-room/order-list.vue
@@ -8,7 +8,7 @@
-
+
@@ -21,11 +21,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -33,30 +33,30 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -79,21 +79,16 @@
const keywords = ref('')
// tab
- const tab = ref(0)
+ const tab = ref('all')
onLoad((args) => {
- if (args.orderType) {
- if (args.orderType === OrderStatus.Pending) {
- tab.value = 1
- } else if (args.orderType === OrderStatus.Reserved) {
- tab.value = 2
- } else if (args.orderType === OrderStatus.Finished) {
- tab.value = 3
- }
+ // 根据传过来的参数决定显示哪个tab
+ if (args.orderStatus) {
+ tab.value = args.orderStatus
}
})
- const orderList = {
+ const OrderList = {
// 上拉加载的回调: 其中num:当前页 从1开始, size:每页数据条数,默认10
upCallback: (mescroll) => {
// 需要留一下数据为空的时候显示的空数据图标内容
@@ -135,6 +130,12 @@
// })
},
+ // 切换tab
+ handleChangeTabs: (e: {index: number, name: string}) => {
+ tab.value = e.name
+ },
+
+
// 返回上一页
handleBack: () => {
uni.navigateBack({
@@ -149,10 +150,6 @@
background-color: $cz-page-background;
}
- .container{
- height: 150px;width: 100vw;
-}
-
.tabs {
:deep() {
.wd-tabs,
diff --git a/src/bundle/order/tea-specialist/order-detail.vue b/src/bundle/order/tea-specialist/order-detail.vue
index dd1027b..d5863b0 100644
--- a/src/bundle/order/tea-specialist/order-detail.vue
+++ b/src/bundle/order/tea-specialist/order-detail.vue
@@ -9,144 +9,7 @@
-
-
-
-
-
-
- 服务过程中有任何问题，请联系客服
- 使用过程中有任何问题，请联系客服
-
-
-
-
-
-
-
-
-
-
-
- 茶艺师名称
-
-
- ￥324
-
-
- ￥108/小时
- x3
-
-
- 车马费（￥3.00元/公里）
- x3
-
-
- 实付
- ￥29.32
-
-
-
-
-
-
- 预约信息
-
- 预约时间：2025-03-18 09:00-12:00
-
- 预约时长：3小时
- 一键续订
-
-
-
-
-
-
-
- 地图显示
-
- 信息没有更新，想问问茶艺师到哪里了？
-
-
-
-
-
- 联系茶艺师
-
-
-
-
-
-
-
- 服务方式
-
-
-
-
- 服务方式
- 到店服务
-
-
- 服务门店
- 茶馆名称茶馆名称茶馆名称茶馆名称茶馆名称茶馆名称茶馆名称
-
-
- {{ orderStatus === OrderStatus.Serving ? '门店地址' : '服务地址' }}
- 青浦区仓桥路478号
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 订单信息
-
- 订单编号
-
- 7327328627526903
-
- 复制
-
-
-
- 交易方式
- 微信支付
-
-
- 创建时间
- 2019-05-16 12:20:26
-
-
- 付款时间
- 2019-05-16 13:20:26
-
-
-
-
-
-
- 确认订单
- 再次预定
-
-
-
- 申请退款
- 联系客服
-
-
-
-
+
@@ -257,12 +120,303 @@
+
+
+
+
+
+
+
+
+
+
+ 费用明细
+
+
+
+ 服务费
+
+ ￥640.00
+
+
+
+
+ 服务费（￥160元/小时）
+ x4
+
+
+
+
+
+
+ 车马费
+
+ ￥640.00
+
+
+
+
+ 车马费（￥3.00元/公里）
+ x4
+
+
+
+
+
+
+ 茶艺服务
+
+ ￥640.00
+
+
+
+
+ 红茶/绿茶/福鼎白茶/铁观音
+ ￥158
+
+
+ 茶具使用
+ ￥158
+
+
+
+
+
+
+ 优惠
+
+ -￥148.00
+
+
+
+
+ 优惠券
+ -￥20
+
+
+
+
+
+
+
+
+ 实付金额
+ ￥698.90
+
+
+
+
+
+
+
+
+
+
+ 使用过程中有任何问题，请联系客服
+
+
+
+
+
+ 还剩
+
+
+
+ 订单自动取消
+
+
+ 品一口香茗，让生活慢下来，从一杯好茶开始
+ 您的服务已经结束，请及时确认订单
+
+
+
+
+
+
+
+
+
+
+
+ 茶艺师名称
+
+
+ ￥324
+
+
+ ￥108/小时
+ x3
+
+
+ 车马费（￥3.00元/公里）
+ x3
+
+
+ 实付
+ ￥29.32
+
+
+
+
+
+
+ 预约信息
+
+ 预约时间：2025-03-18 09:00-12:00
+
+ 预约时长：3小时
+ 一键续订
+
+
+
+
+
+
+
+ 地图显示
+
+ 信息没有更新，想问问茶艺师到哪里了？
+
+
+
+
+
+ 联系茶艺师
+
+
+
+
+
+
+
+ 服务方式
+
+
+
+
+ 服务方式
+ 到店服务
+
+
+ 服务门店
+ 茶馆名称茶馆名称茶馆名称茶馆名称茶馆名称茶馆名称茶馆名称
+
+
+ {{ orderStatus === OrderStatus.Serving ? '门店地址' : '服务地址' }}
+ 青浦区仓桥路478号
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+ 可用202.22
+
+
+
+
+
+
+
+
+
+ 订单信息
+
+ 订单编号
+
+ 7327328627526903
+
+ 复制
+
+
+
+ 交易方式
+ 微信支付
+
+
+ 创建时间
+ 2019-05-16 12:20:26
+
+
+ 付款时间
+ 2019-05-16 13:20:26
+
+
+
+
+
+
+
+
+ 再次预定
+ 确认订单
+
+
+
+
+
+ 取消
+
+
+
+
+
+ 费用明细
+
+
+
+
+ 立即预定
+
+
+
+
+ 申请退款
+ 联系客服
+
+
+
+
+ 再次预定
+
+
+
+
+
+
diff --git a/src/bundle/parten/components/Tabbar.vue b/src/bundle/parten/components/Tabbar.vue
new file mode 100644
index 0000000..89e010b
--- /dev/null
+++ b/src/bundle/parten/components/Tabbar.vue
@@ -0,0 +1,60 @@
+
+
+
+ currentTab--{{ currentTab }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/bundle/parten/pages/bill/bill.vue b/src/bundle/parten/pages/bill/bill.vue
new file mode 100644
index 0000000..e431a55
--- /dev/null
+++ b/src/bundle/parten/pages/bill/bill.vue
@@ -0,0 +1,24 @@
+
+ {
+ "layout": "default",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ }
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/bundle/parten/pages/my/my.vue b/src/bundle/parten/pages/my/my.vue
new file mode 100644
index 0000000..e431a55
--- /dev/null
+++ b/src/bundle/parten/pages/my/my.vue
@@ -0,0 +1,24 @@
+
+ {
+ "layout": "default",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ }
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/bundle/parten/pages/sub/sub.vue b/src/bundle/parten/pages/sub/sub.vue
new file mode 100644
index 0000000..e431a55
--- /dev/null
+++ b/src/bundle/parten/pages/sub/sub.vue
@@ -0,0 +1,24 @@
+
+ {
+ "layout": "default",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ }
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/bundle/profile/profile.vue b/src/bundle/profile/profile.vue
index 1b7b117..27e6f52 100644
--- a/src/bundle/profile/profile.vue
+++ b/src/bundle/profile/profile.vue
@@ -126,15 +126,13 @@
const OSS = inject('OSS')
const showLogoutPopup = ref(false) // 是否显示退出登录弹出框
- /** 上传文件 **/
+ // 上传文件
const fileList = ref([])
const action = 'https://www.mocky.io/v2/5cc8019d300000980a055e76' // 仅做测试使用，实际请换成真实上传接口
- /** 结束 **/
- /** 修改昵称 **/
+ // 修改昵称
const showEditNicknamePopup = ref(false) // 是否显示退款详情弹出框
const nickname = ref('') // 昵称
- /** 结束 **/
const profile = {
// 图片选择/删除
diff --git a/src/bundle/settle-in/parten.vue b/src/bundle/settle-in/parten.vue
new file mode 100644
index 0000000..8be59bb
--- /dev/null
+++ b/src/bundle/settle-in/parten.vue
@@ -0,0 +1,227 @@
+
+{
+ "layout": "default",
+ "style": {
+ "navigationStyle": "custom"
+ }
+}
+
+
+
+
+
+
+
+
+
+
+ 您的信息已成功提交
+ 目前正在审核中，请您耐心等待
+
+
+
+
+
+
+
+
+
+
+
+ 联系方式
+
+
+
+
+
+
+ 联系人
+
+
+
+
+
+
+ 手机号
+
+
+
+
+
+
+ 验证码
+
+
+
+
+
+ 发送验证码
+
+
+ S后重发
+
+
+
+
+
+
+
+
+
+ 省市区
+
+
+
+
+
+
+ 详细地址
+
+
+
+
+
+
+
+
+
+
+ 所在区域
+
+
+
+
+
+
+
+
+
+
+
+
+ 留言建议
+
+
+
+
+
+
+
+
+ *提交表单申请，工作人员将在3个工作日内与您电话联系，如需及时了解，请直接电话咨询，我们将在第一时间解答
+
+
+
+ 联系我们
+ 提交申请
+
+
+
+
+
+
+
diff --git a/src/bundle/settle-in/tea-room.vue b/src/bundle/settle-in/tea-room.vue
new file mode 100644
index 0000000..cbe6a3d
--- /dev/null
+++ b/src/bundle/settle-in/tea-room.vue
@@ -0,0 +1,271 @@
+
+{
+ "layout": "default",
+ "style": {
+ "navigationStyle": "custom"
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
+ 申请加盟合作成功
+ 请登录商家端查看信息
+ 如您遇到任何问题，可随时联系客服热线 400-6245-123，我们将竭诚为您服务！
+
+
+
+
+
+
+
+ 您的信息已成功提交
+ 目前正在审核中，请您耐心等待
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 加盟类型
+
+
+
+
+
+
+
+
+ 加盟
+
+
+ 入驻
+
+
+
+
+
+
+ 门店名称
+
+
+
+
+
+
+
+
+ 营业执照
+
+
+
+
+
+
+ 营业执照
+
+
+
+
+
+
+
+
+ 联系方式
+
+
+
+
+
+
+ 联系人
+
+
+
+
+
+
+ 手机号
+
+
+
+
+
+
+ 验证码
+
+
+
+
+
+ 发送验证码
+
+
+ S后重发
+
+
+
+
+
+
+
+
+
+ 省市区
+
+
+
+
+
+
+ 详细地址
+
+
+
+
+
+
+
+
+
+
+ 留言建议
+
+
+
+
+
+
+
+
+ *提交表单申请，工作人员将在3个工作日内与您电话联系，如需及时了解，请直接电话咨询，我们将在第一时间解答
+
+
+
+ 联系我们
+ 提交申请
+
+
+
+
+
+
+
diff --git a/src/bundle/settle-in/tea-specialist.vue b/src/bundle/settle-in/tea-specialist.vue
new file mode 100644
index 0000000..60a90fc
--- /dev/null
+++ b/src/bundle/settle-in/tea-specialist.vue
@@ -0,0 +1,377 @@
+
+{
+ "layout": "default",
+ "style": {
+ "navigationStyle": "custom"
+ }
+}
+
+
+
+
+
+
+
+
+
+
+ 申请茶艺师成功
+ 请登录茶艺师端查看信息根据步骤进行操作，如有疑问请联系客服400-6245-123
+
+
+ 操作步骤
+
+ 1.关注【茶址】公众号
+ 2.在左下角【茶址】 → 选择【茶艺师端】
+ 3.用注册手机号+密码 登录
+
+
+
+
+
+
+
+
+
+
+
+ 营业执照
+
+
+
+
+
+
+ 营业执照
+
+
+
+
+
+
+
+
+ 基本信息
+
+
+
+
+
+
+ 姓名
+
+
+
+
+
+
+ 性别
+
+
+
+
+
+
+ 出生年月
+
+
+
+
+
+
+
+ 身高
+
+
+ cm
+
+
+
+
+ 体重
+
+
+ kg
+
+
+
+
+
+
+
+
+
+ 兴趣爱好
+
+
+
+
+
+
+
+
+
+ 服务区域
+
+
+
+
+
+
+
+
+
+
+
+
+ 照片信息
+
+
+
+
+
+
+
+
+
+
+ 本人照片
+
+
+
+
+
+
+
+
+ 健康证、资格证书信息
+
+
+
+
+
+
+
+
+
+
+
+ 健康证
+
+
+
+
+
+
+
+
+
+ 茶艺师资格证
+
+
+
+
+
+
+
+
+
+ 联系方式
+
+
+
+
+
+
+ 手机号
+
+
+
+
+
+
+ 验证码
+
+
+
+
+
+ 发送验证码
+
+
+ S后重发
+
+
+
+
+
+
+
+
+
+
+
+ *提交表单申请，工作人员将在3个工作日内与您电话联系，如需及时了解，请直接电话咨询，我们将在第一时间解答
+
+
+
+ 联系我们
+ 提交申请
+
+
+
+
+
+
+
diff --git a/src/components/order/ComboCard.vue b/src/components/order/ComboCard.vue
index 6af5486..99b7c45 100644
--- a/src/components/order/ComboCard.vue
+++ b/src/components/order/ComboCard.vue
@@ -122,17 +122,20 @@
-
-
- 删除订单
-
+
+
+ 删除订单
+
- 取消订单
- 去支付
+ 取消订单
+ 去支付
@@ -144,19 +147,25 @@
-
-
- 茶艺师
-
-
-
+
+
+
+ 茶艺师
+
+
+
+
+ 金牌茶艺师
- 金牌茶艺师
-
+
+
消费中
已预约
服务中
+ 完成
+ 待付款
+ 订单取消
@@ -174,6 +183,25 @@
+
+
+
+
+ 删除订单
+
+
+
+
+ 取消订单
+
+ 去支付
+
+
@@ -223,8 +251,8 @@
})
},
- // 删除茶室订单
- handleDeleteTeaRoomOrder: () => {
+ // 删除订单
+ handleDeleteOrder: (source: string) => {
message.confirm({
title: '确定删除订单？',
msg: '删除订单后无法恢复，是否确认删除订单？',
@@ -237,6 +265,26 @@
customClass: '!bg-[#4C9F44] !text-[#fff] !text-32rpx !leading-44rpx !rounded-8rpx',
}
}).then((res) => {
+ switch (source) {
+ case OrderSource.Direct:
+ // TODO 这里调用删除直营订单的接口
+ break;
+ case OrderSource.Franchise:
+ // TODO 这里调用删除加盟订单的接口
+ break;
+ case OrderSource.DouYin:
+ // TODO 这里调用删除抖音订单的接口
+ break;
+ case OrderSource.TeaRoom:
+ // TODO 这里调用删除茶室订单的接口
+ break;
+ case OrderSource.TeaSpecialist:
+ // TODO 这里调用删除茶室订单的接口
+ break;
+ default:
+ break;
+ }
+
// 点击确认按钮回调事件
toast.info('删除订单成功')
}).catch(() => {
@@ -244,8 +292,8 @@
})
},
- // 取消茶室订单
- handleCancelTeaRoomOrder: () => {
+ // 取消订单
+ handleCancelOrder: (source: string) => {
message.confirm({
title: '确定取消订单？',
msg: '取消订单后无法恢复，优惠券可退回',
@@ -258,6 +306,25 @@
customClass: '!bg-[#4C9F44] !text-[#fff] !text-32rpx !leading-44rpx !rounded-8rpx',
}
}).then((res) => {
+ switch (source) {
+ case OrderSource.Direct:
+ // TODO 这里调用删除直营订单的接口
+ break;
+ case OrderSource.Franchise:
+ // TODO 这里调用删除加盟订单的接口
+ break;
+ case OrderSource.DouYin:
+ // TODO 这里调用删除抖音订单的接口
+ break;
+ case OrderSource.TeaRoom:
+ // TODO 这里调用删除茶室订单的接口
+ break;
+ case OrderSource.TeaSpecialist:
+ // TODO 这里调用删除茶室订单的接口
+ break;
+ default:
+ break;
+ }
// 点击确认按钮回调事件
toast.info('订单取消成功')
}).catch(() => {
@@ -265,7 +332,7 @@
})
},
- // 跳转到团购订单详情页
+ // 跳转到订单详情页
handleToOrderDetail: () => {
// TODO 这里要对不同类型的订单进行区分跳转一个是直营的一个市加盟的
switch (props.type) {
@@ -289,6 +356,44 @@
url: `/bundle/order/tea-room/order-detail?orderStatus=${props.orderStatus}`
})
break;
+ case OrderSource.TeaSpecialist:
+ uni.navigateTo({
+ url: `/bundle/order/tea-specialist/order-detail?orderStatus=${props.orderStatus}`
+ })
+ break;
+ default:
+ break;
+ }
+ },
+
+ // 支付
+ handleToPayOrder: (source: string) => {
+ switch (source) {
+ case OrderSource.Direct:
+ uni.navigateTo({
+ url: `/bundle/order/platform/direct-order-detail?orderStatus=${props.orderStatus}&toPay=true`
+ })
+ break;
+ case OrderSource.Franchise:
+ uni.navigateTo({
+ url: `/bundle/order/platform/franchise-order-detail?orderStatus=${props.orderStatus}&toPay=true`
+ })
+ break;
+ case OrderSource.DouYin:
+ uni.navigateTo({
+ url: `/bundle/order/douyin/douyin-order-detail?orderStatus=${props.orderStatus}&toPay=true`
+ })
+ break;
+ case OrderSource.TeaRoom:
+ uni.navigateTo({
+ url: `/bundle/order/tea-room/order-detail?orderStatus=${props.orderStatus}&toPay=true`
+ })
+ break;
+ case OrderSource.TeaSpecialist:
+ uni.navigateTo({
+ url: `/bundle/order/tea-specialist/order-detail?orderStatus=${props.orderStatus}&toPay=true`
+ })
+ break;
default:
break;
}
diff --git a/src/hooks/useColPickerData.ts b/src/hooks/useColPickerData.ts
new file mode 100644
index 0000000..0e62fb0
--- /dev/null
+++ b/src/hooks/useColPickerData.ts
@@ -0,0 +1,38 @@
+// 可以将此代码放置于项目src/hooks/useColPickerData.ts中
+import { useCascaderAreaData } from '@vant/area-data'
+
+export type CascaderOption = {
+ text: string
+ value: string
+ children?: CascaderOption[]
+}
+
+/**
+ * 使用'@vant/area-data'作为数据源，构造ColPicker组件的数据
+ * @returns
+ */
+export function useColPickerData() {
+ // '@vant/area-data' 数据源
+ const colPickerData: CascaderOption[] = useCascaderAreaData()
+
+ // 根据code查找子节点，不传code则返回所有节点
+ function findChildrenByCode(data: CascaderOption[], code?: string): CascaderOption[] | null {
+ if (!code) {
+ return data
+ }
+ for (const item of data) {
+ if (item.value === code) {
+ return item.children || null
+ }
+ if (item.children) {
+ const childrenResult = findChildrenByCode(item.children, code)
+ if (childrenResult) {
+ return childrenResult
+ }
+ }
+ }
+ return null
+ }
+
+ return { colPickerData, findChildrenByCode }
+}
\ No newline at end of file
diff --git a/src/pages.json b/src/pages.json
index 686344e..e25293b 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -203,6 +203,30 @@
"navigationStyle": "custom"
}
},
+ {
+ "path": "settle-in/parten",
+ "type": "page",
+ "layout": "default",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "settle-in/tea-room",
+ "type": "page",
+ "layout": "default",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "settle-in/tea-specialist",
+ "type": "page",
+ "layout": "default",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
{
"path": "store-recharge/store-recharge",
"type": "page",
@@ -363,6 +387,38 @@
"style": {
"navigationStyle": "custom"
}
+ },
+ {
+ "path": "order/tea-specialist/order-list",
+ "type": "page",
+ "layout": "default",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "parten/pages/bill/bill",
+ "type": "page",
+ "layout": "default",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
+ {
+ "path": "parten/pages/my/my",
+ "type": "page",
+ "layout": "default",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
+ {
+ "path": "parten/pages/sub/sub",
+ "type": "page",
+ "layout": "default",
+ "style": {
+ "navigationBarTitleText": ""
+ }
}
]
}
diff --git a/src/pages/login/mobile.vue b/src/pages/login/mobile.vue
index 3dd46a7..301af16 100644
--- a/src/pages/login/mobile.vue
+++ b/src/pages/login/mobile.vue
@@ -98,13 +98,11 @@
const page = ref<{title: string, desc: string}>({title: '其他手机号登录', desc: '请输入你要登录的手机号'})
const showEditSuccessPopup = ref(false) // 显示手机号修改成功弹窗
const userId = ref(0) // 用户ID，修改手机号时需要传
- /** 结束 **/
/** 验证码倒计时 **/
const countDownTime = ref(1 * 60 * 1000) // 60s倒计时
const startCountDown = ref(false) // 是否开始倒计时
const countDown = ref(null) // 倒计时组件
- /** 结束 **/
/** 表单相关 **/
const model = reactive<{
diff --git a/src/pages/my/my.vue b/src/pages/my/my.vue
index 341d755..cd68514 100644
--- a/src/pages/my/my.vue
+++ b/src/pages/my/my.vue
@@ -162,7 +162,7 @@
茶室订单
-
+
@@ -179,12 +179,14 @@
茶艺师订单
-
-
-
+
+
+
+
+
+ {{ item.title }}
- {{ item.title }}
-
+
@@ -194,15 +196,17 @@
更多服务
-
-
-
+
+
+
+
+
+ {{ item.title }}
+
+ {{item.badge}}
+
- {{ item.title }}
-
- {{item.badge}}
-
-
+
@@ -251,26 +255,26 @@
// 茶室订单
const roomMenuList = reactive([
- { id: 1, title: '全部订单', icon: `${OSS}icon/icon_room_all_order.png`, badge: '', type: 'all' },
- { id: 2, title: '待付款', icon: `${OSS}icon/icon_room_wait_pay_order.png`, badge: '', type: OrderStatus.Pending },
- { id: 3, title: '预约单', icon: `${OSS}icon/icon_room_reserve_order.png`, badge: '', type: OrderStatus.Reserved },
- { id: 4, title: '已完结', icon: `${OSS}icon/icon_room_finish_order.png`, badge: '', type: OrderStatus.Finished },
+ { id: 1, title: '全部订单', icon: `${OSS}icon/icon_room_all_order.png`, badge: '', status: 'all' },
+ { id: 2, title: '待付款', icon: `${OSS}icon/icon_room_wait_pay_order.png`, badge: '', status: OrderStatus.Pending },
+ { id: 3, title: '预约单', icon: `${OSS}icon/icon_room_reserve_order.png`, badge: '', status: OrderStatus.Reserved },
+ { id: 4, title: '已完结', icon: `${OSS}icon/icon_room_finish_order.png`, badge: '', status: OrderStatus.Finished },
])
// 茶艺师订单
const teaReserveMenuList = reactive([
- { id: 1, title: '全部订单', icon: `${OSS}icon/icon_tea_all_order.png`, badge: '', type: 'all' },
- { id: 2, title: '待付款', icon: `${OSS}icon/icon_tea_wait_pay_order.png`, badge: '', type: OrderStatus.Pending },
- { id: 3, title: '预约单', icon: `${OSS}icon/icon_tea_reserve_order.png`, badge: '', type: OrderStatus.Reserved },
- { id: 4, title: '待确认', icon: `${OSS}icon/icon_tea_wait_confirm_order.png`, badge: '', type: OrderStatus.Confirm },
- { id: 4, title: '已完结', icon: `${OSS}icon/icon_tea_finish_order.png`, badge: '', type: OrderStatus.Finished },
+ { id: 1, title: '全部订单', icon: `${OSS}icon/icon_tea_all_order.png`, badge: '', status: 'all' },
+ { id: 2, title: '待付款', icon: `${OSS}icon/icon_tea_wait_pay_order.png`, badge: '', status: OrderStatus.Pending },
+ { id: 3, title: '预约单', icon: `${OSS}icon/icon_tea_reserve_order.png`, badge: '', status: OrderStatus.Reserved },
+ { id: 4, title: '待确认', icon: `${OSS}icon/icon_tea_wait_confirm_order.png`, badge: '', status: OrderStatus.Confirm },
+ { id: 4, title: '已完结', icon: `${OSS}icon/icon_tea_finish_order.png`, badge: '', status: OrderStatus.Finished },
])
// 更多服务
const serviceMenuList = reactive([
- { id: 1, title: '申请茶馆', icon: `${OSS}icon/icon_service_teahouse.png`, badge: '', url: '' },
- { id: 2, title: '申请茶艺师', icon: `${OSS}icon/icon_service_tea.png`, badge: '', url: '' },
- { id: 3, title: '合创合伙人', icon: `${OSS}icon/icon_service_partner.png`, badge: '赚佣金', url: '' },
+ { id: 1, title: '申请茶馆', icon: `${OSS}icon/icon_service_teahouse.png`, badge: '', url: '/bundle/settle-in/tea-room' },
+ { id: 2, title: '申请茶艺师', icon: `${OSS}icon/icon_service_tea.png`, badge: '', url: '/bundle/settle-in/tea-specialist' },
+ { id: 3, title: '合创合伙人', icon: `${OSS}icon/icon_service_partner.png`, badge: '赚佣金', url: '/bundle/settle-in/parten' },
])
// 推广码弹窗
diff --git a/src/utils/order.ts b/src/utils/order.ts
index 3e20181..c082cf4 100644
--- a/src/utils/order.ts
+++ b/src/utils/order.ts
@@ -63,7 +63,7 @@ export const OrderSourceText: Record = {
// 订单状态
export enum OrderStatus {
- Consuming = 'consuming', // 消费中
+ Consuming = 'consuming', // 消费中(服务中)
Reserved = 'reserved', // 预约单(已预约)
Serving = 'serving', // 服务中(茶艺师订单独有的)
Pending = 'pending', // 待付款
@@ -111,12 +111,12 @@ export const OrderStatusTitle: Record>
},
[OrderSource.TeaSpecialist]: {
[OrderStatus.Consuming]: '消费中',
- [OrderStatus.Reserved]: '预约单',
+ [OrderStatus.Reserved]: '已预约',
[OrderStatus.Serving]: '服务中',
[OrderStatus.Pending]: '待付款',
- [OrderStatus.Confirm]: '待确认',
+ [OrderStatus.Confirm]: '订单待确认',
[OrderStatus.Finished]: '已完结',
- [OrderStatus.Cancelled]: '已取消',
+ [OrderStatus.Cancelled]: '订单取消',
[OrderStatus.ToUse]: '待使用',
[OrderStatus.Used]: '交易完成',
[OrderStatus.Refunded]: '售后完成',