diff --git a/src/bundle/finance/detail.vue b/src/bundle/finance/detail.vue
index c695780..85dc077 100644
--- a/src/bundle/finance/detail.vue
+++ b/src/bundle/finance/detail.vue
@@ -7,7 +7,7 @@
}
-
+
diff --git a/src/bundle/profile/change-mobile.vue b/src/bundle/profile/change-mobile.vue
new file mode 100644
index 0000000..35fff33
--- /dev/null
+++ b/src/bundle/profile/change-mobile.vue
@@ -0,0 +1,241 @@
+{
+ "layout": "default",
+ "style": {
+ "navigationStyle": "custom"
+ }
+}
+
+
+
+
+
+ 修改手机号码
+
+ 手机号一年内可修改2次
+
+
+
+
+ 手机号
+
+
+
+
+
+
+ 验证码
+
+
+
+
+
+
+
+
+
+ 发送验证码
+
+
+ S后重发
+
+
+
+
+
+
+
+
+
+
+ 登录
+
+
+
+
+
+
+ 我已阅读并同意 《服务协议》 和《隐私政策》
+
+
+
+
+
+
+
+
+
+
+
+ 手机号修改成功
+ {{ page.desc }}
+ 好的
+
+
+
+
+
+
+
+
+
diff --git a/src/bundle/profile/change-password.vue b/src/bundle/profile/change-password.vue
new file mode 100644
index 0000000..edca9ba
--- /dev/null
+++ b/src/bundle/profile/change-password.vue
@@ -0,0 +1,219 @@
+{
+ "layout": "default",
+ "style": {
+ "navigationStyle": "custom"
+ }
+}
+
+
+
+
+
+ 修改密码
+
+ 需要验证绑定手机
+
+
+
+
+ 手机号
+
+
+
+
+
+
+ 验证码
+
+
+
+
+
+
+
+
+
+ 发送验证码
+
+
+ S后重发
+
+
+
+
+
+
+
+
+
+
+ 下一步
+
+
+
+
+
+
+
+
+
+ 手机号修改成功
+ {{ page.desc }}
+ 好的
+
+
+
+
+
+
+
+
+
diff --git a/src/bundle/profile/profile.vue b/src/bundle/profile/profile.vue
index debf0ae..0f768d2 100644
--- a/src/bundle/profile/profile.vue
+++ b/src/bundle/profile/profile.vue
@@ -1,6 +1,5 @@
{
- "needLogin": true,
"layout": "default",
"style": {
"navigationStyle": "custom"
@@ -101,7 +100,7 @@
-
+
修改手机号
@@ -114,6 +113,36 @@
+
+
+
+ 修改手机号
+
+
+
+ {{ user.nickname }}
+
+
+
+
+
+
+
+
+
+
+ 修改绑定用户
+
+
+
+ {{ user.nickname }}
+
+
+
+
+
+
+
@@ -166,7 +195,7 @@
onLoad(() => {
token.value = uni.getStorageSync('token')
- Profile.handleInit()
+ // Profile.handleInit()
})
const Profile = {
diff --git a/src/bundle/profile/set-password.vue b/src/bundle/profile/set-password.vue
new file mode 100644
index 0000000..10229f0
--- /dev/null
+++ b/src/bundle/profile/set-password.vue
@@ -0,0 +1,223 @@
+{
+ "layout": "default",
+ "style": {
+ "navigationBarTitleText": "",
+ "navigationBarBackgroundColor": "#fff"
+ }
+}
+
+
+
+
+
+ 设置新密码
+
+ 请设置你得新密码
+
+
+
+
+ 密码
+
+
+
+
+
+
+ 再次确认
+
+
+
+
+
+
+
+ 确定
+
+
+
+
+
+
+
+
+
+ 密码修改成功
+ 请记住你的登录密码
+ 好的
+
+
+
+
+
+
+
+
+
diff --git a/src/bundle/setmeal/add.vue b/src/bundle/setmeal/add.vue
index ed6af59..cbaed75 100644
--- a/src/bundle/setmeal/add.vue
+++ b/src/bundle/setmeal/add.vue
@@ -428,7 +428,6 @@
.add-textarea {
:deep() {
-
.wd-textarea__value,
.wd-textarea__count {
background: transparent !important;
diff --git a/src/bundle/setmeal/detail.vue b/src/bundle/setmeal/detail.vue
new file mode 100644
index 0000000..d517bcc
--- /dev/null
+++ b/src/bundle/setmeal/detail.vue
@@ -0,0 +1,547 @@
+
+{
+ "needLogin": true,
+ "style": {
+ "navigationStyle": "custom"
+ }
+}
+
+
+
+
+
+
+
+
+ 费用明细
+
+
+ 茶室费
+ ￥{{ bill.service.total }}
+
+
+
+ 茶室费（￥{{ teaRoomPrice }}元/小时）
+ x{{ bill.service.num }}
+
+
+
+
+ 优惠
+ -￥{{ bill.totalDiscount }}
+
+
+ 优惠券
+ -￥{{ bill.coupon || 0 }}
+
+
+ 团购券
+ -￥{{ bill.groupCoupon || 0 }}
+
+
+ 会员八折
+ -￥{{ bill.discount || 0 }}
+
+
+
+
+
+
+
+
+ 实付金额
+ ￥{{ bill.total }}
+
+
+
+
+
+
+
+
+
+
+
+ 支付
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+ 可用202.22
+
+
+
+
+
+
+
+ 确定付款
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ isGroupBuying ? teaRoomPackage.title : teaRoom.name }}
+
+
+
+ 文艺小清新
+
+
+ 全息投影
+
+
+
+
+ {{ teaRoomPackage.introduce }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 使用说明
+
+
+
+
+
+
+
+ 预定时间
+
+ {{ sevenDay.minimum_time }}小时起订
+
+
+
+ {{ reserveTime[0] }} {{ reserveTime[1].join(',') }}
+
+
+ 请选择
+
+
+
+
+
+
+
+
+
+
+
+ 优惠券
+
+ 优惠券
+
+
+
+ {{ selectedCoupon.name }}
+
+
+ 请选择
+
+
+
+
+
+
+
+
+
+
+
+ 团购券
+
+ 团购券
+
+
+
+ {{ selectedGroupCoupon.name }}
+
+
+ 请选择
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 套餐详情
+
+
+
+
+
+
+
+ 购买须知
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/bundle/user/bill-detail.vue b/src/bundle/user/bill-detail.vue
new file mode 100644
index 0000000..a8f1a90
--- /dev/null
+++ b/src/bundle/user/bill-detail.vue
@@ -0,0 +1,99 @@
+{
+ "layout": "default",
+ "style": {
+ "navigationStyle": "custom",
+ "navigationBarBackgroundColor": "#fff"
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+ 订单号：1744601722882174
+
+
+
+
+
+
+ 门店：茶址24小时-碧云店
+ 类型：包间预定
+ 支付方式：平台余额
+ 支付时间：2025-04-14 11:35
+
+
+
+ 金额
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/bundle/user/user-detail.vue b/src/bundle/user/user-detail.vue
new file mode 100644
index 0000000..0e44c21
--- /dev/null
+++ b/src/bundle/user/user-detail.vue
@@ -0,0 +1,132 @@
+{
+ "layout": "default",
+ "style": {
+ "navigationStyle": "custom",
+ "navigationBarBackgroundColor": "#fff"
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 用户昵称
+
+
+
+
+
+ 手机号：18857339563
+
+
+
+
+
+
+
+
+ 2026.03.06到期
+
+
+
+
+
+ 平台余额
+ 3,1.46
+
+
+
+
+
+ 门店余额
+ 3,662.46
+
+
+
+
+
+
+ 消费金额
+
+
+
+
+ 去查看
+
+
+
+
+
+
+
+
+ 注册日期：2025-04-23
+
+
+
+
+
+
+ 备注
+
+
+
+
+
+
+ 修改备注
+
+
+
+
+
+
+
+
+
diff --git a/src/bundle/user/user-list.vue b/src/bundle/user/user-list.vue
new file mode 100644
index 0000000..3b58d3d
--- /dev/null
+++ b/src/bundle/user/user-list.vue
@@ -0,0 +1,103 @@
+{
+ "layout": "default",
+ "style": {
+ "navigationStyle": "custom",
+ "navigationBarBackgroundColor": "#fff"
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 用户昵称
+
+
+
+
+
+ 13525626532
+ 这里是备注信息，备注信息这里是备注信息，备注信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/order/ComboCard.vue b/src/components/order/ComboCard.vue
index 1195140..aff6e08 100644
--- a/src/components/order/ComboCard.vue
+++ b/src/components/order/ComboCard.vue
@@ -125,13 +125,67 @@
+
+
+
+
+
+
+
+
+
+ {{ order.store_name }}
+
+
+
+ 待使用
+ 使用中
+ 完成
+ 订单取消
+
+
+
+
+
+
+
+
+
+ {{ order.room_name }}
+
+ 预约时间：{{ order.day_time }} {{ order.start_time }}-{{ order.end_time }}
+ 预约时长：{{ order.hours }}小时
+
+
+
+
+
+
+
+
+ 释放时间
+ 取消订单
+
+
+
+
+
+ 删除
+
+
+
+
+
diff --git a/src/hooks/useOrder.ts b/src/hooks/useOrder.ts
index 339c6f6..f180a9a 100644
--- a/src/hooks/useOrder.ts
+++ b/src/hooks/useOrder.ts
@@ -131,4 +131,18 @@ export async function handleTGOrderRefundHooks(orderId: number) {
*/
export function handleToTGComboHooks(storeId: number, id: number) {
router.navigateTo(`/bundle/tea-room/detail?storeId=${storeId}&id=${id}&type=${ReserveServiceCategory.GroupBuying}`)
+}
+
+/**
+ * 释放时间
+ */
+export async function handleReleaseTimeHooks(orderId: number) {
+ try {
+ // await releaseTeaRoomOrderTime({ id: orderId })
+ uni.$emit('refreshOrderList')
+ uni.$emit('refreshOrderDetail')
+ } catch (error) {
+ router.navigateBack()
+ throw error
+ }
}
\ No newline at end of file
diff --git a/src/pages/about/about.vue b/src/pages/about/about.vue
deleted file mode 100644
index 88afbd7..0000000
--- a/src/pages/about/about.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-
-{
- "layout": "tabbar",
- "style": {
- "navigationBarTitleText": "关于"
- }
-}
-
-
-
-
-
-
-
- 组件使用、请求调用、unocss
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 为了方便脚手架动态生成不同UI模板，本页的按钮统一使用UI库无关的原生button
-
-
-
-
-
-
diff --git a/src/pages/about/alova.vue b/src/pages/about/alova.vue
deleted file mode 100644
index 70c3af3..0000000
--- a/src/pages/about/alova.vue
+++ /dev/null
@@ -1,56 +0,0 @@
-
-{
- "layout": "default",
- "style": {
- "navigationBarTitleText": "Alova 请求演示"
- }
-}
-
-
-
-
-
-
-
-
-
- loading...
-
-
-
- 请求数据如下
-
-
- {{ JSON.stringify(data) }}
-
-
-
-
- {{ data?.id }}
-
-
-
-
-
-
-
diff --git a/src/pages/about/components/request.vue b/src/pages/about/components/request.vue
deleted file mode 100644
index ac1b7a3..0000000
--- a/src/pages/about/components/request.vue
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-
-
- pages 里面的 vue 文件会扫描成页面，将自动添加到 pages.json 里面。
-
-
- 但是 pages/components 里面的 vue 不会。
-
-
-
-
-
-
-
- loading...
-
-
-
- 请求数据如下
-
-
- {{ JSON.stringify(data) }}
-
-
-
-
-
-
-
-
diff --git a/src/pages/about/vue-query.vue b/src/pages/about/vue-query.vue
deleted file mode 100644
index cea85c9..0000000
--- a/src/pages/about/vue-query.vue
+++ /dev/null
@@ -1,53 +0,0 @@
-
-{
- "layout": "default",
- "style": {
- "navigationBarTitleText": "Vue Query 请求演示"
- }
-}
-
-
-
-
-
-
-
-
-
- loading...
-
-
-
- 请求数据如下
-
-
- {{ JSON.stringify(data) }}
-
-
-
-
-
-
-
diff --git a/src/pages/city/city.vue b/src/pages/city/city.vue
deleted file mode 100644
index a17e651..0000000
--- a/src/pages/city/city.vue
+++ /dev/null
@@ -1,127 +0,0 @@
-
-{
- "needLogin": true,
- "layout": "tabbar",
- "style": {
- // 'custom' 表示开启自定义导航栏，默认 'default'
- "navigationStyle": "default",
- "navigationBarTitleText": "选择城市"
- }
-}
-
-
-
-
-
-
-
-
- 当前定位
-
-
-
- {{ city || LOCATION_DEFAULT_CITY }}
-
-
-
-
-
- 已开通城市
-
-
-
- {{ item.name }}
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 5f83ee2..98a7c28 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -73,7 +73,7 @@
套餐管理
-
+
用户列表
diff --git a/src/pages/login/password.vue b/src/pages/login/password.vue
index 52010ab..7b419f0 100644
--- a/src/pages/login/password.vue
+++ b/src/pages/login/password.vue
@@ -174,7 +174,7 @@
return
}
- router.navigateTo( '/pages/login/set-password')
+ router.navigateTo('/pages/login/set-password')
},
// 获取手机号
diff --git a/src/pages/my/img/bg.png b/src/pages/my/img/bg.png
deleted file mode 100644
index 822e83d..0000000
Binary files a/src/pages/my/img/bg.png and /dev/null differ
diff --git a/src/pages/my/img/modify.png b/src/pages/my/img/modify.png
deleted file mode 100644
index 875631e..0000000
Binary files a/src/pages/my/img/modify.png and /dev/null differ
diff --git a/src/pages/my/img/修改 (1).png b/src/pages/my/img/修改 (1).png
deleted file mode 100644
index f419519..0000000
Binary files a/src/pages/my/img/修改 (1).png and /dev/null differ
diff --git a/src/pages/my/img/头像.png b/src/pages/my/img/头像.png
deleted file mode 100644
index ffd344e..0000000
Binary files a/src/pages/my/img/头像.png and /dev/null differ
diff --git a/src/pages/my/img/播放 (5).png b/src/pages/my/img/播放 (5).png
deleted file mode 100644
index 618a95d..0000000
Binary files a/src/pages/my/img/播放 (5).png and /dev/null differ
diff --git a/src/pages/my/img/组 116095.png b/src/pages/my/img/组 116095.png
deleted file mode 100644
index 244da48..0000000
Binary files a/src/pages/my/img/组 116095.png and /dev/null differ
diff --git a/src/pages/my/img/组 116107.png b/src/pages/my/img/组 116107.png
deleted file mode 100644
index 050cf4a..0000000
Binary files a/src/pages/my/img/组 116107.png and /dev/null differ
diff --git a/src/pages/my/my.vue b/src/pages/my/my.vue
index 8a4d2bd..3492168 100644
--- a/src/pages/my/my.vue
+++ b/src/pages/my/my.vue
@@ -1,55 +1,38 @@
-
- {
- "layout": "tabbar",
- "style": {
- "navigationStyle": "custom"
- }
+{
+ "layout": "tabbar",
+ "style": {
+ "navigationStyle": "custom"
}
-
+}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
- {{ isLogin ? user.nickname : '立即登录' }}
-
-
-
- 账号: {{ formatAccount(user.account || user.mobile) }}
-
-
-
-
-
-
-
-
-
- ￥{{ isLogin ? user.user_money : '0.00' }}
-
-
-
- 钱包余额
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ {{ isLogin ? user.nickname : '立即登录' }}
+
+
+
+ 账号: {{ formatAccount(user.account || user.mobile) }}
+
+
+
+
+
+
+
+
+
+ ￥{{ isLogin ? user.user_money : '0.00' }}
+
+
+
+ 钱包余额
+
+
+
+
+
-
-
-
- 门店茶址24小时智能茶室(中新店)地址
-
-
- 抖音uid:
- {{ storeInfo.douyin_uid || '236598984587' }}
-
-
- 门店地址:
- {{ storeInfo.address || '上海浦东新区新金桥路58号新银东大厦 15楼F室' }}
-
-
-
- 营业时间:
- {{ storeInfo.business_hours || '08:00-22:00' }}
-
-
-
- 修改
-
-
-
- 联系电话:
- {{ storeInfo.contact_phone || '021-8888888' }}
-
-
+
+
+
+ 门店茶址24小时智能茶室(中新店)地址
+
+
+ 抖音uid:
+ {{ storeInfo.douyin_uid || '236598984587' }}
+
+
+ 门店地址:
+ {{ storeInfo.address || '上海浦东新区新金桥路58号新银东大厦 15楼F室' }}
+
+
+
+ 营业时间:
+ {{ storeInfo.business_hours || '08:00-22:00' }}
+
+
+
+ 修改
+
+
+
+ 联系电话:
+ {{ storeInfo.contact_phone || '021-8888888' }}
+
+
-
-
-
- 门店视频/图片
-
-
-
-
-
-
-
-
-
-
- +{{ item.overlay }}
-
-
-
-
-
+
+
+
+ 门店视频/图片
+
+
+
+
+
+
+
+
+
+
+ +{{ item.overlay }}
+
+
+
+
+
-
-
-
+
+
+
diff --git a/src/pages/my/profile.vue b/src/pages/my/profile.vue
index 1320673..62762cf 100644
--- a/src/pages/my/profile.vue
+++ b/src/pages/my/profile.vue
@@ -1,11 +1,9 @@
-
-{
- "layout": "default",
- "style": {
- "navigationStyle": "custom"
- }
-}
-
+{
+ "layout": "default",
+ "style": {
+ "navigationStyle": "custom"
+ }
+}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
- 修改昵称
-
+
+
+ 修改昵称
+
-
-
-
- 昵称:
-
-
-
+
+
+
+ 昵称:
+
+
+
-
-
- 昵称限制1-10字符,一个汉字为一个字符
-
+
+
+ 昵称限制1-10字符,一个汉字为一个字符
+
-
-
- 保存
-
-
-
-
+
+
+ 保存
+
+
+
+
diff --git a/src/pages/order/order-detail.vue b/src/pages/order/order-detail.vue
new file mode 100644
index 0000000..7494e64
--- /dev/null
+++ b/src/pages/order/order-detail.vue
@@ -0,0 +1,593 @@
+
+{
+ "needLogin": true,
+ "layout": "default",
+ "style": {
+ "navigationStyle": "custom"
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
+ 续订包间
+
+
+ 预定时间
+
+ {{ sevenDay.minimum_time }}小时起订
+
+
+
+ {{ reserveTime[0] }} {{ reserveTime[1].join(',') }}
+
+
+ 请选择
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 合计：
+
+
+
+
+
+
+ 立即预定
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 包间续订成功
+ 可以刷新页面查看预约时间
+ 好的
+
+
+
+
+
+
+
+
+
+
+
+
+ 费用明细
+
+
+
+ 茶室费
+
+ ￥640.00
+
+
+
+
+
+ 茶室费（￥160元/小时）
+ x4
+
+
+
+
+
+
+
+ 优惠
+
+ -￥148.00
+
+
+
+
+ 优惠券
+ -￥20
+
+
+
+ 会员八折
+ -￥20
+
+
+
+
+
+
+
+
+ 实际退款
+ ￥698.90
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ order.room_msg.title }}
+
+
+ ￥{{ order.room_all_price }}
+
+
+ ￥{{ order.room_price }}/小时
+
+
+
+
+
+ 预约信息
+
+ 预约时间：{{ order.day_time }} {{ order.renew_dtime.start_time || order.start_time }}-{{ order.renew_dtime.end_time || order.end_time }}
+
+ 预约时长：{{ order.hours }}小时
+
+
+
+
+
+
+
+ 订单信息
+
+ 订单编号
+
+ {{ order.order_sn }}
+
+ 复制
+
+
+
+ 创建时间
+ {{ order.dtime }}
+
+
+ 支付方式
+ 管理员添加
+
+
+ 用户手机号
+ 1110
+
+
+
+
+
+ 续单时长
+ {{ order.update_dtime }}
+
+
+ 续单费用
+ {{ order.update_dtime }}
+
+
+
+
+
+
+
+
+ 取消订单
+
+ 释放时间
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/order/order.vue b/src/pages/order/order.vue
new file mode 100644
index 0000000..d05c185
--- /dev/null
+++ b/src/pages/order/order.vue
@@ -0,0 +1,222 @@
+
+{
+ "layout": "tabbar",
+ "style": {
+ // 'custom' 表示开启自定义导航栏，默认 'default'
+ "navigationStyle": "custom",
+ "navigationBarTitleText": "首页"
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/reserve/reserve.vue b/src/pages/reserve/reserve.vue
deleted file mode 100644
index bc0ae22..0000000
--- a/src/pages/reserve/reserve.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-
-{
- "layout": "tabbar",
- "style": {
- // 'custom' 表示开启自定义导航栏，默认 'default'
- "navigationStyle": "custom",
- "navigationBarTitleText": "首页"
- }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/share/tea-room/share-order-detail.vue b/src/pages/share/tea-room/share-order-detail.vue
deleted file mode 100644
index 4b09033..0000000
--- a/src/pages/share/tea-room/share-order-detail.vue
+++ /dev/null
@@ -1,330 +0,0 @@
-
-{
- "layout": "default",
- "style": {
- "navigationStyle": "custom"
- }
-}
-
-
-
-
-
-
-
-
-
-
-
- 分享订单
-
-
-
-
-
-
-
- 使用过程中有任何问题，请联系客服
-
-
-
-
-
- 还剩
-
-
-
- 订单自动取消
-
-
- 品一口香茗，让生活慢下来，从一杯好茶开始
-
-
-
-
-
-
-
-
-
-
-
- {{ order.room_msg.title }}
-
-
-
- ￥{{ order.room_all_price }}
-
-
- ￥{{ order.room_price }}/小时
-
-
-
- 实付
- ￥{{ order.order_amount }}
-
-
-
-
-
-
- 预约信息
-
- 预约时间：{{ order.day_time }} {{ order.start_time }}-{{ order.end_time }}
-
- 预约时长：{{ order.hours }}小时
-
-
-
-
-
-
-
- 开门锁
-
-
-
-
-
-
-
-
- 点击开锁
-
- 大门锁
- 手动输入 1052 32#
-
-
-
-
-
- 点击开锁
-
- 房间锁
- 手动输入 1052 32#
-
-
-
-
-
-
-
- 适用门店
-
-
-
-
-
-
- {{ order.store_msg.name }}
- 距您{{ order.distance }}km
-
-
-
-
- {{ order.store_msg.address }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 订单信息
-
- 订单编号
-
- {{ order.order_sn }}
-
- 复制
-
-
-
- 交易方式
- {{ order.pay_way_title }}
-
-
- 创建时间
- {{ order.dtime }}
-
-
- 付款时间
- {{ order.update_dtime }}
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/store/device.vue b/src/pages/store/device.vue
new file mode 100644
index 0000000..aec93b9
--- /dev/null
+++ b/src/pages/store/device.vue
@@ -0,0 +1,118 @@
+{
+ "layout": "default",
+ "style": {
+ "navigationStyle": "custom"
+ }
+}
+
+
+
+
+
+
+
+
+
+ 大门
+
+
+
+
+
+ 门锁
+
+
+
+ 点击开锁
+
+
+
+
+
+
+
+ 大楼开门码
+
+
+
+
+
+ 门锁
+
+ 开锁
+
+
+
+
+
+ ON
+
+
+ 插座空开
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/store/img/bookroom.png b/src/pages/store/img/bookroom.png
deleted file mode 100644
index d80eac7..0000000
Binary files a/src/pages/store/img/bookroom.png and /dev/null differ
diff --git a/src/pages/store/img/device.png b/src/pages/store/img/device.png
deleted file mode 100644
index 2ee7e5d..0000000
Binary files a/src/pages/store/img/device.png and /dev/null differ
diff --git a/src/pages/store/img/renew.png b/src/pages/store/img/renew.png
deleted file mode 100644
index 4a92e3c..0000000
Binary files a/src/pages/store/img/renew.png and /dev/null differ
diff --git a/src/pages/store/img/room.png b/src/pages/store/img/room.png
deleted file mode 100644
index 0ea0c08..0000000
Binary files a/src/pages/store/img/room.png and /dev/null differ
diff --git a/src/pages/store/renew.vue b/src/pages/store/renew.vue
new file mode 100644
index 0000000..1224d8e
--- /dev/null
+++ b/src/pages/store/renew.vue
@@ -0,0 +1,164 @@
+{
+ "layout": "default",
+ "style": {
+ "navigationStyle": "custom"
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
+ 续单
+
+
+
+
+
+
+
+ 这是茶室包间名称换行效果这是茶室包间名称换行效果
+
+ 预约时间：03/18 08:00-12:00
+ 预约时长：2小时
+
+
+
+
+
+
+
+
+ 确定
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/store/reserve.vue b/src/pages/store/reserve.vue
new file mode 100644
index 0000000..6beddbb
--- /dev/null
+++ b/src/pages/store/reserve.vue
@@ -0,0 +1,137 @@
+{
+ "layout": "default",
+ "style": {
+ "navigationStyle": "custom"
+ }
+}
+
+
+
+
+
+
+
+
+
+ 包厢选择
+
+
+
+
+
+
+
+
+
+
+
+
+ 包厢价格
+
+
+
+
+
+
+
+
+
+
+ 预定时间
+
+
+
+
+
+
+
+
+
+
+ 确定
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/store/room-detail.vue b/src/pages/store/room-detail.vue
index e686ea0..8120bc1 100644
--- a/src/pages/store/room-detail.vue
+++ b/src/pages/store/room-detail.vue
@@ -1,11 +1,9 @@
-
-{
- "layout": "default",
- "style": {
- "navigationStyle": "custom"
- }
-}
-
+{
+ "layout": "default",
+ "style": {
+ "navigationStyle": "custom"
+ }
+}
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
- 带"*"的为必填项
-
+
+ 带"*"的为必填项
+
-
-
-
-
- 基本信息
-
+
+
+
+
+ 基本信息
+
-
-
-
-
- 包间名称
-
-
-
-
-
-
-
+
+
+
+
+ 包间名称
+
+
+
+
+
+
+
-
-
-
-
-
- 包间标签
-
-
-
-
-
-
- 可选择1~2个标签,每个标签不超过5个字
-
-
-
-
-
- {{ tag }}
-
-
-
-
-
-
- 添加标签
-
-
-
-
+
+
+
+
+
+ 包间标签
+
+
+
+
+
+
+ 可选择1~2个标签,每个标签不超过5个字
+
+
+
+
+
+ {{ tag }}
+
+
+
+
+
+
+ 添加标签
+
+
+
+
-
-
-
-
- 团购视频
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 添加视频
-
-
-
-
+
+
+
+
+ 团购视频
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加视频
+
+
+
+
-
-
-
-
-
- 团购图片
-
-
-
-
-
-
- 可添加3~9张图片
-
-
-
-
-
-
-
-
-
-
-
-
-
- 添加图片
-
-
-
-
-
-
+
+
+
+
+
+ 团购图片
+
+
+
+
+
+
+ 可添加3~9张图片
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加图片
+
+
+
+
+
+
-
-
-
- 规格与价格
-
+
+
+
+ 规格与价格
+
-
-
-
-
- 小时优惠价
-
-
-
-
-
-
-
-
- ¥
-
-
-
-
+
+
+
+
+ 小时优惠价
+
+
+
+
+
+
+
+
+ ¥
+
+
+
+
-
-
-
-
-
- 起订时间
-
-
-
-
-
-
- 范围1~5
-
-
-
-
-
- 小时
-
-
-
+
+
+
+
+
+ 起订时间
+
+
+
+
+
+
+ 范围1~5
+
+
+
+
+
+ 小时
+
+
+
-
-
-
-
-
- 库存
-
-
-
-
-
-
- 输入范围1-999
-
-
-
-
-
+
+
+
+
+
+ 库存
+
+
+
+
+
+
+ 输入范围1-999
+
+
+
+
+
-
-
-
- 套餐详情
-
+
+
+
+ 套餐详情
+
-
-
-
-
-
- 套餐介绍
-
-
-
-
-
-
- 每条内容之间需要换行输入
-
-
-
-
+
+
+
+
+
+ 套餐介绍
+
+
+
+
+
+
+ 每条内容之间需要换行输入
+
+
+
+
-
-
-
-
- 其他说明
-
-
-
-
-
+
+
+
+
+ 其他说明
+
+
+
+
+
-
-
-
- 购买须知
-
+
+
+
+ 购买须知
+
-
-
-
-
- 使用人数
-
-
-
-
-
-
-
+
+
+
+
+ 使用人数
+
+
+
+
+
+
+
-
-
-
-
- 退改说明
-
-
-
-
-
-
-
-
-
+
+
+
+
+ 退改说明
+
+
+
+
+
+
+
+
+
-
-
-
-
- 保存
-
-
-
+
+
+
+
+ 保存
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
- 选择标签
-
+
+
+ 选择标签
+
-
-
-
- 我的标签
-
-
- {{ isTagManageMode ? '退出管理' : '管理' }}
-
-
+
+
+
+ 我的标签
+
+
+ {{ isTagManageMode ? '退出管理' : '管理' }}
+
+
-
-
- 可选择1~2个标签, 每个标签不超过5个字
-
+
+
+ 可选择1~2个标签, 每个标签不超过5个字
+
-
-
-
-
- {{ tag }}
-
-
-
-
-
-
-
- 新建标签
-
-
-
+
+
+
+
+ {{ tag }}
+
+
+
+
+
+
+
+ 新建标签
+
+
+
-
-
- 确认
-
-
-
+
+
+ 确认
+
+
+
-
-
-
-
-
-
-
-
-
- 新建标签
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ 新建标签
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
- 完成
-
-
-
-
+
+
+ 完成
+
+
+
+
diff --git a/src/pages/store/room-manage.vue b/src/pages/store/room-manage.vue
index c8a049f..c252c8d 100644
--- a/src/pages/store/room-manage.vue
+++ b/src/pages/store/room-manage.vue
@@ -1,11 +1,9 @@
-
-{
- "layout": "default",
- "style": {
- "navigationStyle": "custom"
- }
-}
-
+{
+ "layout": "default",
+ "style": {
+ "navigationStyle": "custom"
+ }
+}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ room.name }} ({{ room.type }})
-
-
-
-
-
-
-
-
- {{ getStatusConfig(room.status).text }}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ room.name }} ({{ room.type }})
+
+
+
+
+
+
+
+
+ {{ getStatusConfig(room.status).text }}
+
+
+
+
+
+
+
+
+
-
-
diff --git a/src/pages/store/store.vue b/src/pages/store/store.vue
index 227ebe6..dd91beb 100644
--- a/src/pages/store/store.vue
+++ b/src/pages/store/store.vue
@@ -1,114 +1,102 @@
-
-{
- "layout": "tabbar",
- "style": {
- "navigationStyle": "custom"
- }
-}
-
+{
+ "layout": "tabbar",
+ "style": {
+ "navigationStyle": "custom"
+ }
+}
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
- {{ item.title }}
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
diff --git a/src/tabbar/config.ts b/src/tabbar/config.ts
index b8f1256..af9ecde 100644
--- a/src/tabbar/config.ts
+++ b/src/tabbar/config.ts
@@ -44,7 +44,7 @@ export const nativeTabbarList: NativeTabBarItem[] = [
{
iconPath: 'static/tabbar/order.png',
selectedIconPath: 'static/tabbar/order_s.png',
- pagePath: 'pages/reserve/reserve',
+ pagePath: 'pages/order/order',
text: '订单',
},
{
diff --git a/src/utils/order.ts b/src/utils/order.ts
index cf8aad0..8ace276 100644
--- a/src/utils/order.ts
+++ b/src/utils/order.ts
@@ -50,6 +50,7 @@ export enum OrderSource {
TeaRoom = 'teaRoom', // 茶室
TeaSpecialist = 'teaSpecialist', // 茶艺师
SetMeal = 'setMeal', // 茶室管理端-套餐管理
+ Admin = 'admin', // 茶室管理端-套餐管理
}
// 订单来源对应名称
@@ -59,6 +60,7 @@ export const OrderSourceText: Record = {
[OrderSource.TeaRoom]: '茶室',
[OrderSource.TeaSpecialist]: '茶艺师',
[OrderSource.SetMeal]: '套餐管理',
+ [OrderSource.Admin]: '管理员',
}
// 订单状态
@@ -317,3 +319,22 @@ export const TeaRoomPackageOrderStatusTextValue: Record