From 4559c450fa72995731f09dad13088148d4f7b5fa Mon Sep 17 00:00:00 2001
From: wangxiaowei <1121133807@qq.com>
Date: Mon, 15 Dec 2025 17:53:24 +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

---
 src/bundle/finance/detail.vue                 |    2 +-
 src/bundle/profile/change-mobile.vue          |  241 ++++
 src/bundle/profile/change-password.vue        |  219 +++
 src/bundle/profile/profile.vue                |   35 +-
 src/bundle/profile/set-password.vue           |  223 +++
 src/bundle/setmeal/add.vue                    |    1 -
 src/bundle/setmeal/detail.vue                 |  547 +++++++
 src/bundle/user/bill-detail.vue               |   99 ++
 src/bundle/user/user-detail.vue               |  132 ++
 src/bundle/user/user-list.vue                 |  103 ++
 src/components/order/ComboCard.vue            |  165 ++-
 src/hooks/useOrder.ts                         |   14 +
 src/pages/about/about.vue                     |   84 --
 src/pages/about/alova.vue                     |   56 -
 src/pages/about/components/request.vue        |   54 -
 src/pages/about/vue-query.vue                 |   53 -
 src/pages/city/city.vue                       |  127 --
 src/pages/index/index.vue                     |    2 +-
 src/pages/login/password.vue                  |    2 +-
 src/pages/my/img/bg.png                       |  Bin 11665 -> 0 bytes
 src/pages/my/img/modify.png                   |  Bin 664 -> 0 bytes
 src/pages/my/img/修改 (1).png                 |  Bin 394 -> 0 bytes
 src/pages/my/img/头像.png                     |  Bin 11769 -> 0 bytes
 src/pages/my/img/播放 (5).png                 |  Bin 734 -> 0 bytes
 src/pages/my/img/组 116095.png                |  Bin 266 -> 0 bytes
 src/pages/my/img/组 116107.png                |  Bin 3965 -> 0 bytes
 src/pages/my/my.vue                           |  503 ++++---
 src/pages/my/profile.vue                      |  525 ++++---
 src/pages/order/order-detail.vue              |  593 ++++++++
 src/pages/order/order.vue                     |  222 +++
 src/pages/reserve/reserve.vue                 |  238 ---
 .../share/tea-room/share-order-detail.vue     |  330 -----
 src/pages/store/device.vue                    |  118 ++
 src/pages/store/img/bookroom.png              |  Bin 4731 -> 0 bytes
 src/pages/store/img/device.png                |  Bin 5520 -> 0 bytes
 src/pages/store/img/renew.png                 |  Bin 4915 -> 0 bytes
 src/pages/store/img/room.png                  |  Bin 2751 -> 0 bytes
 src/pages/store/renew.vue                     |  164 +++
 src/pages/store/reserve.vue                   |  137 ++
 src/pages/store/room-detail.vue               | 1285 ++++++++---------
 src/pages/store/room-manage.vue               |  288 ++--
 src/pages/store/store.vue                     |  170 +--
 src/tabbar/config.ts                          |    2 +-
 src/utils/order.ts                            |   21 +
 44 files changed, 4342 insertions(+), 2413 deletions(-)
 create mode 100644 src/bundle/profile/change-mobile.vue
 create mode 100644 src/bundle/profile/change-password.vue
 create mode 100644 src/bundle/profile/set-password.vue
 create mode 100644 src/bundle/setmeal/detail.vue
 create mode 100644 src/bundle/user/bill-detail.vue
 create mode 100644 src/bundle/user/user-detail.vue
 create mode 100644 src/bundle/user/user-list.vue
 delete mode 100644 src/pages/about/about.vue
 delete mode 100644 src/pages/about/alova.vue
 delete mode 100644 src/pages/about/components/request.vue
 delete mode 100644 src/pages/about/vue-query.vue
 delete mode 100644 src/pages/city/city.vue
 delete mode 100644 src/pages/my/img/bg.png
 delete mode 100644 src/pages/my/img/modify.png
 delete mode 100644 src/pages/my/img/修改 (1).png
 delete mode 100644 src/pages/my/img/头像.png
 delete mode 100644 src/pages/my/img/播放 (5).png
 delete mode 100644 src/pages/my/img/组 116095.png
 delete mode 100644 src/pages/my/img/组 116107.png
 create mode 100644 src/pages/order/order-detail.vue
 create mode 100644 src/pages/order/order.vue
 delete mode 100644 src/pages/reserve/reserve.vue
 delete mode 100644 src/pages/share/tea-room/share-order-detail.vue
 create mode 100644 src/pages/store/device.vue
 delete mode 100644 src/pages/store/img/bookroom.png
 delete mode 100644 src/pages/store/img/device.png
 delete mode 100644 src/pages/store/img/renew.png
 delete mode 100644 src/pages/store/img/room.png
 create mode 100644 src/pages/store/renew.vue
 create mode 100644 src/pages/store/reserve.vue

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 @@
 }</route>
 
 <template>
-	<view class="mt-26rpx">
+	<view>
         <view>
             <navbar title="订单详情" custom-class="!bg-[transparent]"></navbar>
         </view>
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 @@
+<route lang="jsonc" type="page">{
+    "layout": "default",
+    "style": {
+        "navigationStyle": "custom"
+    }
+}</route>
+
+<template>
+    <view>
+        <view class="mx-60rpx mt-20rpx">
+            <view class="text-[#303133] text-48rpx leading-80rpx font-600">
+                修改手机号码
+            </view>
+            <view class="font-400 text-28rpx leading-44rpx text-[#6B7280] mt-12rpx">手机号一年内可修改2次</view>
+        </view>
+        <view class="mt-106rpx mx-48rpx">
+            <wd-form ref="form" :model="model">
+                <view>
+                    <view class="font-400 text-30rpx text-[#606266] leading-44rpx">手机号</view>
+                    <view class="mt-20rpx">
+                        <wd-input 
+                            v-model="model.mobile" 
+                            type="text" 
+                            placeholder="请输入手机号码"
+                            inputmode="numeric"
+                            no-border 
+                            custom-class="!bg-[#F6F7F8] !border !border-solid !border-[#EAECF0] !rounded-16rpx" 
+                            custom-input-class="!px-32rpx !h-104rpx"
+                            @input="mobile.handleInputMobile"
+                        />
+                    </view>
+                </view>
+
+                <view class="mt-40rpx">
+                    <view class="font-400 text-30rpx text-[#606266] leading-44rpx">验证码</view>
+                    <view class="mt-20rpx">
+                        <wd-input type="text" placeholder="请输入验证码" v-model="model.code" inputmode="numeric" no-border custom-class="!bg-[#F6F7F8] !border !border-solid !border-[#EAECF0] !rounded-16rpx" custom-input-class="!px-32rpx !h-104rpx">
+                            <template #suffix> 
+                                <view class="flex items-center mr-34rpx">
+                                    <view class="flex items-center">
+                                        <wd-divider color="#C9C9C9" vertical />
+                                    </view>
+
+                                    <view class="flex items-center">
+                                        <view class="text-[#4C9F44] text-32rpx font-400 leading-44rpx" v-if="!startCountDown" @click="mobile.handleCountDown">发送验证码</view>
+                                        <view class="!text-[#C9C9C9] text-32rpx font-400 leading-44rpx flex items-center" v-if="startCountDown">
+                                            <wd-count-down ref="countDown" :time="countDownTime" millisecond :auto-start="false" format="ss" custom-class="!text-[#C9C9C9] !text-32rpx" @finish="mobile.handleFinishCountDown"></wd-count-down>
+                                            <view> S后重发</view>
+                                        </view>
+                                    </view>
+                                </view> 
+                            </template>
+                        </wd-input>
+                    </view>
+                </view>
+            </wd-form>
+        </view>
+
+        <view class="h-90rpx leading-90rpx mx-60rpx rounded-8rpx text-center mt-112rpx bg-[#4C9F44] text-[#fff]" :class="disabled ? 'opacity-40' : ''" @click="mobile.handleToLogin">登录</view>
+
+        <view class="flex items-center mx-52rpx mt-56rpx" v-if="pageType === 'login'">
+            <view class="w-32rpx h-32rpx">
+                <wd-checkbox v-model="agree" @change="mobile.handleAgree" checked-color="#4C9F44" size="large"> </wd-checkbox>
+            </view>
+            <view class="font-400 text-26rpx leading-40rpx text-[#8F959E] ml-14rpx flex-1" @click="agree = !agree">
+                我已阅读并同意 <text class="text-[#4C9F44]" @click.stop="mobile.handleToService">《服务协议》</text> 和<text class="text-[#4C9F44]" @click.stop="mobile.handleToPrivacy">《隐私政策》</text>
+            </view>
+        </view>
+
+        <!-- 手机号修改成功 -->
+        <wd-popup v-model="showEditSuccessPopup" lock-scroll custom-style="border-radius: 32rpx 32rpx 0rpx 0rpx;" position="bottom">
+            <view class="relative pt-64rpx pb-74rpx">
+                <view class="flex justify-center items-center">
+                    <view class="bg-[#4C9F44] w-280rpx rounded-280rpx">
+                        <wd-img width="280rpx" height="280rpx" :src="`${OSS}images/reserve_room/reserve_room_image7.png`"/>
+                    </view>
+                </view>
+                <view class="text-[#303133] text-36rpx leading-46rpx text-center mt-48rpx">手机号修改成功</view>
+                <view class="text-[#9CA3AF] text-28rpx leading-44rpx mt-16rpx text-center">{{ page.desc }}</view>
+                <view class="w-630rpx h-90rpx leading-90rpx text-center bg-[#4C9F44] rounded-8rpx text-[#fff] mt-174rpx mx-auto" @click="mobile.handleToBack">好的</view>
+            </view>
+        </wd-popup>
+    </view>
+</template>
+
+
+<script lang="ts" setup>
+    import {mobile as testMobile} from '@/utils/test'
+    import { useToast  } from 'wot-design-uni'
+    import { router } from '@/utils/tools'
+
+	const OSS = inject('OSS')
+    const toast = useToast()
+    const disabled = ref<boolean>(true)
+
+	/** 页面 **/
+    let pageType = 'login' // 页面类型 login:登录 edit:修改手机号
+    const page = ref<{title: string, desc: string}>({title: '其他手机号登录', desc: '请输入你要登录的手机号'})
+    const showEditSuccessPopup = ref<boolean>(false) // 显示手机号修改成功弹窗
+    const userId = ref<number>(0) // 用户ID，修改手机号时需要传
+
+	/** 验证码倒计时 **/
+    const countDownTime = ref<number>(1 * 60 * 1000)  // 60s倒计时
+    const startCountDown = ref<boolean>(false) // 是否开始倒计时
+    const countDown = ref<any>(null) // 倒计时组件
+
+	/** 表单相关 **/
+    const model = reactive<{
+        mobile: string
+        code: string
+    }>({
+        mobile: '',
+        code: ''
+    })
+	/** 结束 **/
+
+	/** 服务协议和隐私政策 **/
+    const agree = ref<boolean>(false)
+	/** 结束 **/
+
+    onLoad((args) => {
+        // 从个人登录页面进入
+        if (args.type === 'edit') {
+            userId.value = Number(args.userId) || 0 // userId仅做测试使用，实际请传真实用户ID
+            
+            page.value.title = '修改手机号'
+            page.value.desc = '手机号一年内可修改2次'
+            pageType = 'edit'
+        }
+    })
+
+    const mobile = {
+        // 验证手机号
+        handleInputMobile: (e: {value: string}) => {
+            model.mobile = e.value
+            disabled.value = !testMobile(model.mobile)
+        },
+
+        // 发送验证码
+        handleCountDown: () => {
+            if (disabled.value) {
+                toast.show({
+                    iconClass: 'info-circle',
+                    msg: '手机号码错误请重新输入',
+                    direction: 'vertical'
+                })
+                return
+            }
+
+            startCountDown.value = true
+            nextTick(() => {
+                countDown.value?.start()
+
+                // 发送验证码请求
+            })
+        },
+
+        // 验证码倒计时结束
+        handleFinishCountDown: () => {
+            startCountDown.value = false
+        },
+        
+        // 登录
+        handleToLogin: () => {
+            // TODO 如果是edit的话就是修改手机号
+
+            if (pageType === 'login' && !agree.value) {
+                toast.show({
+                    iconClass: 'info-circle',
+                    msg: '请同意服务协议和隐私政策',
+                    direction: 'vertical'
+                })
+                return
+            }
+
+            if (!testMobile(model.mobile)) {
+                toast.show({
+                    iconClass: 'info-circle',
+                    msg: '手机号码错误请重新输入',
+                    direction: 'vertical'
+                })
+                return
+            }
+
+            if (!model.code) {
+                toast.show({
+                    iconClass: 'info-circle',
+                    msg: '验证码错误',
+                    direction: 'vertical'
+                })
+                return
+            }
+            
+            router.navigateTo('/bundle/profile/set-password')
+        },
+
+        // 获取手机号
+        handleGetPhoneNumber: (e: object) => {
+            console.log("🚀 ~ e:", e)
+        },
+
+        handleAgree: (e: any) => {
+            console.log('e', e)
+        },
+
+        // 跳转到服务协议页面
+        handleToService: () => {
+            disabled.value = !disabled.value
+            console.log("🚀 ~ disabled:", disabled)
+        },
+
+        // 跳转到隐私政策页面
+        handleToPrivacy: () => {
+
+        },
+
+        // 修改手机成功后返回
+        handleToBack: () => {
+            uni.navigateBack()
+        }
+    }
+</script>
+
+<style lang="scss">
+    page {
+        background-color: #fff;
+    }
+
+    .service {
+        :deep() {
+            .wd-checkbox {
+                display: flex;
+                align-content: flex-start;
+            }
+
+            .wd-checkbox__label {
+                margin-left: 6rpx;
+            }
+        }
+    }
+</style>
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 @@
+<route lang="jsonc" type="page">{
+    "layout": "default",
+    "style": {
+        "navigationStyle": "custom"
+    }
+}</route>
+
+<template>
+    <view>
+        <view class="mx-60rpx mt-20rpx">
+            <view class="text-[#303133] text-48rpx leading-80rpx font-600">
+                修改密码
+            </view>
+            <view class="font-400 text-28rpx leading-44rpx text-[#6B7280] mt-12rpx">需要验证绑定手机</view>
+        </view>
+        <view class="mt-106rpx mx-48rpx">
+            <wd-form ref="form" :model="model">
+                <view>
+                    <view class="font-400 text-30rpx text-[#606266] leading-44rpx">手机号</view>
+                    <view class="mt-20rpx">
+                        <wd-input 
+                            v-model="model.mobile" 
+                            type="text" 
+                            placeholder="请输入手机号码"
+                            inputmode="numeric"
+                            no-border 
+                            custom-class="!bg-[#F6F7F8] !border !border-solid !border-[#EAECF0] !rounded-16rpx" 
+                            custom-input-class="!px-32rpx !h-104rpx"
+                            @input="mobile.handleInputMobile"
+                        />
+                    </view>
+                </view>
+
+                <view class="mt-40rpx">
+                    <view class="font-400 text-30rpx text-[#606266] leading-44rpx">验证码</view>
+                    <view class="mt-20rpx">
+                        <wd-input type="text" placeholder="请输入验证码" v-model="model.code" inputmode="numeric" no-border custom-class="!bg-[#F6F7F8] !border !border-solid !border-[#EAECF0] !rounded-16rpx" custom-input-class="!px-32rpx !h-104rpx">
+                            <template #suffix> 
+                                <view class="flex items-center mr-34rpx">
+                                    <view class="flex items-center">
+                                        <wd-divider color="#C9C9C9" vertical />
+                                    </view>
+
+                                    <view class="flex items-center">
+                                        <view class="text-[#4C9F44] text-32rpx font-400 leading-44rpx" v-if="!startCountDown" @click="mobile.handleCountDown">发送验证码</view>
+                                        <view class="!text-[#C9C9C9] text-32rpx font-400 leading-44rpx flex items-center" v-if="startCountDown">
+                                            <wd-count-down ref="countDown" :time="countDownTime" millisecond :auto-start="false" format="ss" custom-class="!text-[#C9C9C9] !text-32rpx" @finish="mobile.handleFinishCountDown"></wd-count-down>
+                                            <view> S后重发</view>
+                                        </view>
+                                    </view>
+                                </view> 
+                            </template>
+                        </wd-input>
+                    </view>
+                </view>
+            </wd-form>
+        </view>
+
+        <view class="h-90rpx leading-90rpx mx-60rpx rounded-8rpx text-center mt-112rpx bg-[#4C9F44] text-[#fff]" :class="disabled ? 'opacity-40' : ''" @click="mobile.handleToLogin">下一步</view>
+
+        <!-- 手机号修改成功 -->
+        <wd-popup v-model="showEditSuccessPopup" lock-scroll custom-style="border-radius: 32rpx 32rpx 0rpx 0rpx;" position="bottom">
+            <view class="relative pt-64rpx pb-74rpx">
+                <view class="flex justify-center items-center">
+                    <view class="bg-[#4C9F44] w-280rpx rounded-280rpx">
+                        <wd-img width="280rpx" height="280rpx" :src="`${OSS}images/reserve_room/reserve_room_image7.png`"/>
+                    </view>
+                </view>
+                <view class="text-[#303133] text-36rpx leading-46rpx text-center mt-48rpx">手机号修改成功</view>
+                <view class="text-[#9CA3AF] text-28rpx leading-44rpx mt-16rpx text-center">{{ page.desc }}</view>
+                <view class="w-630rpx h-90rpx leading-90rpx text-center bg-[#4C9F44] rounded-8rpx text-[#fff] mt-174rpx mx-auto" @click="mobile.handleToBack">好的</view>
+            </view>
+        </wd-popup>
+    </view>
+</template>
+
+
+<script lang="ts" setup>
+    import {mobile as testMobile} from '@/utils/test'
+    import { useToast  } from 'wot-design-uni'
+
+	const OSS = inject('OSS')
+    const toast = useToast()
+    const disabled = ref<boolean>(true)
+
+	/** 页面 **/
+    let pageType = 'login' // 页面类型 login:登录 edit:修改手机号
+    const page = ref<{title: string, desc: string}>({title: '其他手机号登录', desc: '请输入你要登录的手机号'})
+    const showEditSuccessPopup = ref<boolean>(false) // 显示手机号修改成功弹窗
+    const userId = ref<number>(0) // 用户ID，修改手机号时需要传
+
+	/** 验证码倒计时 **/
+    const countDownTime = ref<number>(1 * 60 * 1000)  // 60s倒计时
+    const startCountDown = ref<boolean>(false) // 是否开始倒计时
+    const countDown = ref<any>(null) // 倒计时组件
+
+	/** 表单相关 **/
+    const model = reactive<{
+        mobile: string
+        code: string
+    }>({
+        mobile: '',
+        code: ''
+    })
+	/** 结束 **/
+
+	/** 服务协议和隐私政策 **/
+    const agree = ref<boolean>(false)
+	/** 结束 **/
+
+    onLoad((args) => {
+        // 从个人登录页面进入
+        if (args.type === 'edit') {
+            userId.value = Number(args.userId) || 0 // userId仅做测试使用，实际请传真实用户ID
+            
+            page.value.title = '修改手机号'
+            page.value.desc = '手机号一年内可修改2次'
+            pageType = 'edit'
+        }
+    })
+
+    const mobile = {
+        // 验证手机号
+        handleInputMobile: (e: {value: string}) => {
+            model.mobile = e.value
+            disabled.value = !testMobile(model.mobile)
+        },
+
+        // 发送验证码
+        handleCountDown: () => {
+            if (disabled.value) {
+                toast.show({
+                    iconClass: 'info-circle',
+                    msg: '手机号码错误请重新输入',
+                    direction: 'vertical'
+                })
+                return
+            }
+
+            startCountDown.value = true
+            nextTick(() => {
+                countDown.value?.start()
+
+                // 发送验证码请求
+            })
+        },
+
+        // 验证码倒计时结束
+        handleFinishCountDown: () => {
+            startCountDown.value = false
+        },
+        
+        // 登录
+        handleToLogin: () => {
+            // TODO 如果是edit的话就是修改手机号
+            if (!testMobile(model.mobile)) {
+                toast.show({
+                    iconClass: 'info-circle',
+                    msg: '手机号码错误请重新输入',
+                    direction: 'vertical'
+                })
+                return
+            }
+
+            if (!model.code) {
+                toast.show({
+                    iconClass: 'info-circle',
+                    msg: '验证码错误',
+                    direction: 'vertical'
+                })
+                return
+            }
+        },
+
+        // 获取手机号
+        handleGetPhoneNumber: (e: object) => {
+            console.log("🚀 ~ e:", e)
+        },
+
+        handleAgree: (e: any) => {
+            console.log('e', e)
+        },
+
+        // 跳转到服务协议页面
+        handleToService: () => {
+            disabled.value = !disabled.value
+            console.log("🚀 ~ disabled:", disabled)
+        },
+
+        // 跳转到隐私政策页面
+        handleToPrivacy: () => {
+
+        },
+
+        // 修改手机成功后返回
+        handleToBack: () => {
+            uni.navigateBack()
+        }
+    }
+</script>
+
+<style lang="scss">
+    page {
+        background-color: #fff;
+    }
+
+    .service {
+        :deep() {
+            .wd-checkbox {
+                display: flex;
+                align-content: flex-start;
+            }
+
+            .wd-checkbox__label {
+                margin-left: 6rpx;
+            }
+        }
+    }
+</style>
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 @@
 <route lang="jsonc" type="page">
 {
-	"needLogin": true,
 	"layout": "default",
 	"style": {
 		"navigationStyle": "custom"
@@ -101,7 +100,7 @@
 			</view>
 
 			<!-- 修改手机号 -->
-			<view class="flex justify-between items-center" @click="Profile.handleToEditMobile">
+			<view class="flex justify-between items-center mb-54rpx" @click="Profile.handleToEditMobile">
 				<view class="font-400 text-[#303133] text-30rpx leading-42rpx">修改手机号</view>
 				<view class="flex justify-end">
 					<view class="flex items-center">
@@ -114,6 +113,36 @@
 					</view>
 				</view>
 			</view>
+
+			<!-- 修改手机号 -->
+			<view class="flex justify-between items-center mb-54rpx" @click="router.navigateTo('/bundle/profile/change-password')">
+				<view class="font-400 text-[#303133] text-30rpx leading-42rpx">修改手机号</view>
+				<view class="flex justify-end">
+					<view class="flex items-center">
+						<view class="font-400 text-[#303133] text-30rpx leading-42rpx">
+							{{ user.nickname }}
+						</view>
+						<view>
+							<wd-icon name="arrow-right" size="32rpx" color="#C0C4CC" />
+						</view>
+					</view>
+				</view>
+			</view>
+			
+			<!-- 修改绑定用户 -->
+			<view class="flex justify-between items-center" @click="router.navigateTo('/bundle/profile/change-password')">
+				<view class="font-400 text-[#303133] text-30rpx leading-42rpx">修改绑定用户</view>
+				<view class="flex justify-end">
+					<view class="flex items-center">
+						<view class="font-400 text-[#303133] text-30rpx leading-42rpx">
+							{{ user.nickname }}
+						</view>
+						<view>
+							<wd-icon name="arrow-right" size="32rpx" color="#C0C4CC" />
+						</view>
+					</view>
+				</view>
+			</view>
 		</view>
 
 		<view class="bg-white rounded-16rpx mt-144rpx mx-30rpx px-30rpx py-32rpx text-center font-400 text-[#303133] text-30rpx leading-42rpx" @click="showLogoutPopup = true">
@@ -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 @@
+<route lang="jsonc" type="page">{
+    "layout": "default",
+    "style": {
+        "navigationBarTitleText": "",
+        "navigationBarBackgroundColor": "#fff"
+    }
+}</route>
+
+<template>
+    <view>
+        <view class="mx-60rpx mt-20rpx">
+            <view class="text-[#303133] text-48rpx leading-80rpx font-600">
+                设置新密码
+            </view>
+            <view class="font-400 text-28rpx leading-44rpx text-[#6B7280] mt-12rpx">请设置你得新密码</view>
+        </view>
+        <view class="mt-106rpx mx-48rpx">
+            <wd-form ref="form" :model="model">
+                <view>
+                    <view class="font-400 text-30rpx text-[#606266] leading-44rpx">密码</view>
+                    <view class="mt-20rpx">
+                        <wd-input 
+                            v-model="model.mobile" 
+                            type="text" 
+                            placeholder="请输入密码"
+                            inputmode="numeric"
+                            no-border 
+                            custom-class="!bg-[#F6F7F8] !border !border-solid !border-[#EAECF0] !rounded-16rpx" 
+                            custom-input-class="!px-32rpx !h-104rpx"
+                            @input="mobile.handleInputMobile"
+                        />
+                    </view>
+                </view>
+
+                <view>
+                    <view class="font-400 text-30rpx text-[#606266] leading-44rpx">再次确认</view>
+                    <view class="mt-20rpx">
+                        <wd-input 
+                            v-model="model.mobile" 
+                            type="text" 
+                            placeholder="再次确认新的密码"
+                            inputmode="numeric"
+                            no-border 
+                            custom-class="!bg-[#F6F7F8] !border !border-solid !border-[#EAECF0] !rounded-16rpx" 
+                            custom-input-class="!px-32rpx !h-104rpx"
+                            @input="mobile.handleInputMobile"
+                        />
+                    </view>
+                </view>
+            </wd-form>
+        </view>
+
+        <view class="h-90rpx leading-90rpx mx-60rpx rounded-8rpx text-center mt-112rpx bg-[#4C9F44] text-[#fff]" :class="disabled ? 'opacity-40' : ''" @click="mobile.handleToLogin">确定</view>
+
+        <!-- 手机号修改成功 -->
+        <wd-popup v-model="showEditSuccessPopup" lock-scroll custom-style="border-radius: 32rpx 32rpx 0rpx 0rpx;" position="bottom">
+            <view class="relative pt-64rpx pb-74rpx">
+                <view class="flex justify-center items-center">
+                    <view class="bg-[#4C9F44] w-280rpx rounded-280rpx">
+                        <wd-img width="280rpx" height="280rpx" :src="`${OSS}images/reserve_room/reserve_room_image7.png`"/>
+                    </view>
+                </view>
+                <view class="text-[#303133] text-36rpx leading-46rpx text-center mt-48rpx">密码修改成功</view>
+                <view class="text-[#9CA3AF] text-28rpx leading-44rpx mt-16rpx text-center">请记住你的登录密码</view>
+                <view class="w-630rpx h-90rpx leading-90rpx text-center bg-[#4C9F44] rounded-8rpx text-[#fff] mt-174rpx mx-auto" @click="mobile.handleToBack">好的</view>
+            </view>
+        </wd-popup>
+    </view>
+</template>
+
+
+<script lang="ts" setup>
+    import {mobile as testMobile} from '@/utils/test'
+    import { useToast  } from 'wot-design-uni'
+
+	const OSS = inject('OSS')
+    const toast = useToast()
+    const disabled = ref<boolean>(true)
+
+	/** 页面 **/
+    let pageType = 'login' // 页面类型 login:登录 edit:修改手机号
+    const page = ref<{title: string, desc: string}>({title: '其他手机号登录', desc: '请输入你要登录的手机号'})
+    const showEditSuccessPopup = ref<boolean>(false) // 显示手机号修改成功弹窗
+    const userId = ref<number>(0) // 用户ID，修改手机号时需要传
+
+	/** 验证码倒计时 **/
+    const countDownTime = ref<number>(1 * 60 * 1000)  // 60s倒计时
+    const startCountDown = ref<boolean>(false) // 是否开始倒计时
+    const countDown = ref<any>(null) // 倒计时组件
+
+	/** 表单相关 **/
+    const model = reactive<{
+        mobile: string
+        code: string
+    }>({
+        mobile: '',
+        code: ''
+    })
+	/** 结束 **/
+
+	/** 服务协议和隐私政策 **/
+    const agree = ref<boolean>(false)
+	/** 结束 **/
+
+    onLoad((args) => {
+        // 从个人登录页面进入
+        if (args.type === 'edit') {
+            userId.value = Number(args.userId) || 0 // userId仅做测试使用，实际请传真实用户ID
+            
+            page.value.title = '修改手机号'
+            page.value.desc = '手机号一年内可修改2次'
+            pageType = 'edit'
+        }
+    })
+
+    const mobile = {
+        // 验证手机号
+        handleInputMobile: (e: {value: string}) => {
+            model.mobile = e.value
+            disabled.value = !testMobile(model.mobile)
+        },
+
+        // 发送验证码
+        handleCountDown: () => {
+            if (disabled.value) {
+                toast.show({
+                    iconClass: 'info-circle',
+                    msg: '手机号码错误请重新输入',
+                    direction: 'vertical'
+                })
+                return
+            }
+
+            startCountDown.value = true
+            nextTick(() => {
+                countDown.value?.start()
+
+                // 发送验证码请求
+            })
+        },
+
+        // 验证码倒计时结束
+        handleFinishCountDown: () => {
+            startCountDown.value = false
+        },
+        
+        // 登录
+        handleToLogin: () => {
+            // TODO 如果是edit的话就是修改手机号
+
+            if (pageType === 'login' && !agree.value) {
+                toast.show({
+                    iconClass: 'info-circle',
+                    msg: '请同意服务协议和隐私政策',
+                    direction: 'vertical'
+                })
+                return
+            }
+
+            if (!testMobile(model.mobile)) {
+                toast.show({
+                    iconClass: 'info-circle',
+                    msg: '手机号码错误请重新输入',
+                    direction: 'vertical'
+                })
+                return
+            }
+
+            if (!model.code) {
+                toast.show({
+                    iconClass: 'info-circle',
+                    msg: '验证码错误',
+                    direction: 'vertical'
+                })
+                return
+            }
+        },
+
+        // 获取手机号
+        handleGetPhoneNumber: (e: object) => {
+            console.log("🚀 ~ e:", e)
+        },
+
+        handleAgree: (e: any) => {
+            console.log('e', e)
+        },
+
+        // 跳转到服务协议页面
+        handleToService: () => {
+            disabled.value = !disabled.value
+            console.log("🚀 ~ disabled:", disabled)
+        },
+
+        // 跳转到隐私政策页面
+        handleToPrivacy: () => {
+
+        },
+
+        // 修改手机成功后返回
+        handleToBack: () => {
+            uni.navigateBack()
+        }
+    }
+</script>
+
+<style lang="scss">
+    page {
+        background-color: #fff;
+    }
+
+    .service {
+        :deep() {
+            .wd-checkbox {
+                display: flex;
+                align-content: flex-start;
+            }
+
+            .wd-checkbox__label {
+                margin-left: 6rpx;
+            }
+        }
+    }
+</style>
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 @@
+<!-- 使用 type="home" 属性设置首页，其他页面不需要设置，默认为page -->
+<route lang="jsonc" type="page">{
+    "needLogin": true,
+	"style": {
+		"navigationStyle": "custom"
+	}
+}</route>
+<template>
+	<view class="pb-180rpx">
+        <!-- 费用明细 -->
+        <wd-popup v-model="showCostPopup" lock-scroll custom-style="border-radius: 32rpx 32rpx 0rpx 0rpx;" @close="showCostPopup = false" position="bottom">
+            <view class='bg-[#FBFBFB] py-40rpx realtive'>
+                <view class="absolute top-18rpx right-30rpx" @click="showCostPopup = false">
+                    <wd-img width="60rpx" height='60rpx' :src="`${OSS}icon/icon_close.png`"></wd-img>
+                </view>
+                <view class="text-36rpx text-[#121212] leading-50rpx text-center">费用明细</view>
+                <view class="mx-30rpx bg-white rounded-16rpx px-30rpx pt-40rpx mt-40rpx pb-30rpx">
+                    <view class="flex justify-between items-center text-30rpx text-[#303133] leading-42rpx">
+                        <view>茶室费</view>
+                        <view>￥{{ bill.service.total }}</view>
+                    </view>
+
+                    <view class="flex justify-between items-center text-24rpx text-[#909399] leading-34rpx mt-16rpx">
+                        <view>茶室费（￥{{ teaRoomPrice }}元/小时）</view>
+                        <view>x{{ bill.service.num }}</view>
+                    </view>
+
+                    <view class="mt-52rpx">
+                        <view class="flex justify-between items-center text-30rpx text-[#303133] leading-42rpx">
+                            <view>优惠</view>
+                            <view class="text-[#4C9F44]">-￥{{ bill.totalDiscount }}</view>
+                        </view>
+                        <view class="flex justify-between items-center text-24rpx text-[#909399] leading-34rpx mt-16rpx">
+                            <view>优惠券</view>
+                            <view>-￥{{ bill.coupon || 0 }}</view>
+                        </view>
+                        <view class="flex justify-between items-center text-24rpx text-[#909399] leading-34rpx mt-16rpx">
+                            <view>团购券</view>
+                            <view>-￥{{ bill.groupCoupon || 0 }}</view>
+                        </view>
+                        <view class="flex justify-between items-center text-24rpx text-[#909399] leading-34rpx mt-16rpx">
+                            <view>会员八折</view>
+                            <view>-￥{{ bill.discount || 0 }}</view>
+                        </view>
+                    </view>
+
+                    <view class="my-30rpx">
+                        <wd-gap height="2rpx" bgColor='#F6F7F9'></wd-gap>
+                    </view>
+
+                    <view class="flex justify-between items-center text-30rpx text-[#303133] leading-42rpx">
+                        <view>实付金额</view>
+                        <view>￥{{ bill.total }}</view>
+                    </view>
+                </view>
+            </view>
+        </wd-popup>
+
+        <!-- 支付 -->
+        <wd-popup v-model="showPayPopup" lock-scroll custom-style="border-radius: 32rpx 32rpx 0rpx 0rpx;" @close="showPayPopup = false" position="bottom">
+            <view class='bg-[#FBFBFB] py-40rpx realtive'>
+                <view class="absolute top-18rpx right-30rpx" @click="showPayPopup = false">
+                    <wd-img width="60rpx" height='60rpx' :src="`${OSS}icon/icon_close.png`"></wd-img>
+                </view>
+                <view class="text-36rpx text-[#121212] leading-50rpx text-center">支付</view>
+                <view class="mx-30rpx bg-white rounded-16rpx px-30rpx pt-40rpx mt-40rpx pb-30rpx">
+                    <wd-radio-group v-model="pay" shape="dot" checked-color="#4C9F44">
+                        <view class="pay" v-for="(item, index) in payList" :key="index" @click="pay = item.id">
+                            <view class="flex justify-between items-center" v-if="pay == item.value" >
+                                <view class="flex items-center">
+                                    <wd-img width="50rpx" height="50rpx" :src="item.icon"></wd-img>
+                                    <view class="ml-20rpx text-30rpx text-[#303133] leading-42rpx">{{ item.name }}</view>
+                                </view>
+                                <view class="flex items-center">
+                                    <wd-radio :value="item.value">
+                                        <view class="text-[#303133] text-26rpx leading-36rpx mr-20rpx">可用202.22</view>
+                                    </wd-radio>
+                                </view>
+                            </view>
+                        </view>
+                    </wd-radio-group>
+                </view>
+
+                <view class='bg-[#4C9F44] text-[#fff] rounded-8rpx h-90rpx leading-90rpx mx-60rpx box-border text-center mt-170rpx' @click="Detail.handlePay">确定付款</view>
+            </view>
+        </wd-popup>
+
+        <!-- 选择预定时间 -->
+        <booking-time v-model="showBookTimePopup" :day="sevenDay" @selectedTime="Detail.handleChooseReserveTime"></booking-time>
+
+		<view>
+			<navbar :title="isGroupBuying ? '团购套餐' : '预定'" custom-class='!bg-[#F6F7F8]'></navbar>
+		</view>
+
+        <view>
+            <view class="mt-20rpx mx-30rpx swiper">
+                <wd-swiper value-key="image" height="320rpx"
+                    :indicator="{ type: 'dots-bar' }" :list="swiperList" v-model:current="current" mode="aspectFit">
+                </wd-swiper>
+            </view>
+
+            <view class="bg-white rounded-16rpx py-26rpx px-30rpx mt-24rpx mx-30rpx">
+                <view class="font-bold text-36rpx text-[#303133] leading-50rpx">{{ isGroupBuying ? teaRoomPackage.title : teaRoom.name }}</view>
+                <view class="mt-14rpx flex" v-if="!isGroupBuying">
+                    <template v-for="(label, labelIndex) in teaRoom.label" :key="labelIndex">
+                        <view class="mr-20rpx flex items-start" v-if="label.category_id == 1">
+                            <wd-tag color="#40AE36" bg-color="#40AE36" plain custom-class="!rounded-4rpx">文艺小清新</wd-tag>
+                        </view>
+                        <view class="flex items-start" v-if="label.category_id == 2">
+                            <wd-tag color="#F55726" bg-color="#F55726" plain>全息投影</wd-tag>
+                        </view>
+                    </template>
+                </view>
+                <view class="flex justify-between items-center" :class="`${ isGroupBuying ? 'mt-24rpx' : ''}`">
+                    <view class="text-[#303133] text-26rpx leading-48rpx font-500" v-if="isGroupBuying">{{ teaRoomPackage.introduce }}</view>
+                    <!-- <view class="text-[#6A6363] flex-1 text-22rpx leading-32rpx text-right">已售 10+</view> -->
+                </view>
+                <view v-if="isGroupBuying">
+                    <view class="mt-20rpx mb-24rpx" >
+                        <wd-gap height="2rpx" bgColor="#F6F7F9"></wd-gap>
+                    </view>
+                    <view class="text-[#303133] text-28rpx leading-48rpx">
+                        <rich-text :nodes="teaRoomPackage.details"></rich-text>
+                        <!-- <view>
+                            <text class="font-bold mr-26rpx">须知</text>
+                            <text class="font-500">{{ teaRoomPackage.details }}</text>
+                        </view>
+                        <view class="mt-22rpx">
+                            <text class="font-bold mr-26rpx">保障</text>
+                            <text class="font-500">随时退</text>
+                        </view> -->
+                    </view>
+                </view>
+            </view>
+
+            <view v-if="!isGroupBuying">
+                <!-- 使用说明 -->
+                <view class="bg-white rounded-16rpx py-26rpx px-30rpx mt-24rpx mx-30rpx">
+                    <view class="text-[#303133] text-32rpx leading-44rpx font-bold mb-24rpx">使用说明</view>
+                    <view class="">
+                        <rich-text :nodes="teaRoom.textarea1"></rich-text>
+                    </view>
+                </view>
+
+                <!-- 预定时间 -->
+                <view class="bg-white rounded-16rpx py-26rpx px-30rpx mt-24rpx mx-30rpx" @click="showBookTimePopup = true">
+                    <view class="text-[#303133] text-32rpx leading-44rpx font-bold mb-24rpx">预定时间</view>
+                    <view class="flex items-center justify-between">
+                        <view class="text-[26rpx] text-[#606266] leading-36rpx">{{ sevenDay.minimum_time }}小时起订</view>
+                        <view class="flex items-center">
+                            <view class="text-[28rpx] text-[#909399] leading-40rpx w-430rpx line-1 text-right">
+                                <template v-if="reserveTime.length > 0">
+                                    {{ reserveTime[0] }} {{  reserveTime[1].join(',')  }}
+                                </template>
+                                <template v-else>
+                                    请选择
+                                </template> 
+                            </view>
+                            <view>
+                                <wd-icon name="chevron-right" size="32rpx" color="#909399"></wd-icon>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+
+                <!-- 优惠券 -->
+                <view class="bg-white rounded-16rpx py-26rpx px-30rpx mt-24rpx mx-30rpx" @click="Detail.handleToCoupon(CouponType.Discount)">
+                    <view class="text-[#303133] text-32rpx leading-44rpx font-bold mb-24rpx">优惠券</view>
+                    <view class="flex items-center justify-between">
+                        <view class="text-[26rpx] text-[#606266] leading-36rpx">优惠券</view>
+                        <view class="flex items-center">
+                            <view class="text-[28rpx] text-[#909399] leading-40rpx">
+                                <template v-if="selectedCoupon?.id > 0">
+                                    {{ selectedCoupon.name  }}
+                                </template>
+                                <template v-else>
+                                    请选择
+                                </template>
+                            </view>
+                            <view class="mt-4rpx">
+                                <wd-icon name="chevron-right" size="22px" color="#909399"></wd-icon>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+
+                <!-- 团购券 -->
+                <view class="bg-white rounded-16rpx py-26rpx px-30rpx mt-24rpx mx-30rpx" @click="Detail.handleToCoupon(CouponType.GroupBuy)">
+                    <view class="text-[#303133] text-32rpx leading-44rpx font-bold mb-24rpx">团购券</view>
+                    <view class="flex items-center justify-between">
+                        <view class="text-[26rpx] text-[#606266] leading-36rpx">团购券</view>
+                        <view class="flex items-center">
+                            <view class="text-[28rpx] text-[#909399] leading-40rpx">
+                                <template v-if="selectedGroupCoupon?.id > 0">
+                                    {{ selectedGroupCoupon.name  }}
+                                </template>
+                                <template v-else>
+                                    请选择
+                                </template>
+                            </view>
+                            <view class="mt-4rpx">
+                                <wd-icon name="chevron-right" size="22px" color="#909399"></wd-icon>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+
+            <view v-if="isGroupBuying">
+                <!-- 套餐详情 -->
+                <view class="bg-white rounded-16rpx py-26rpx px-30rpx mt-24rpx mx-30rpx">
+                    <view class="text-[#303133] text-32rpx leading-44rpx font-bold mb-24rpx">套餐详情</view>
+                    <view class="">
+                        <rich-text :nodes="teaRoomPackage.introduce_details"></rich-text>
+                    </view>
+                </view>
+
+                <!-- 购买须知 -->
+                <view class="bg-white rounded-16rpx py-26rpx px-30rpx mt-24rpx mx-30rpx">
+                    <view class="text-[#303133] text-32rpx leading-44rpx font-bold mb-24rpx">购买须知</view>
+                    <view class="">
+                        <rich-text :nodes="teaRoomPackage.buy_details"></rich-text>
+                    </view>
+                </view>
+            </view>
+	    </view>
+    </view>
+</template>
+
+<script lang="ts" setup>
+    import {toast} from '@/utils/toast'
+    import { ReserveServiceCategory, OrderType } from '@/utils/order'
+    import type { ITeaSpecialistFuture7DaysResult } from '@/api/types/tea'
+    import { getNext7Days, getTeaRoomBalance, createTeaRoomOrder } from '@/api/tea-room'
+    import { CouponType } from '@/utils/coupon'
+    import { router, toTimes, toPlus, toMinus } from '@/utils/tools'
+    import type { IUserInfoVo } from '@/api/types/login'
+	import { useUserStore } from '@/store'
+	import { getTeaRoomDetail, createTeaRoomPackageOrder, getTeaRoomPackageDetail, calculateTeaRoomPrice } from '@/api/tea-room'
+    import PriceFormat from '@/components/PriceFormat.vue'
+    import BookingTime from '@/components/BookingTime.vue'
+	import { getUserInfo } from '@/api/user'
+
+	const OSS = inject('OSS')
+
+    // 用户信息
+	const userInfo = ref<IUserInfoVo>(null)
+
+    const swiperList = ref<string[]>([])
+	const current = ref<number>(0)
+    const html: string = '<p>这里是富文本内容，需要后台传递</p>'
+    const isGroupBuying = ref<boolean>(false)// 是否是团购套餐
+    const pay = ref<number>(1) // 支付方式
+    const payList = ref<Array<any>>([
+        {
+            id: 1,
+            name: '平台余额',
+            icon: `${OSS}icon/icon_platform_balance.png`,
+            balance: 0,
+            value: 1
+        },
+        {
+            id: 2,
+            name: '门店余额',
+            icon: `${OSS}icon/icon_store_balance.png`,
+            balance: 0,
+            value: 2
+        },
+        {
+            id: 3,
+            name: '微信支付',
+            icon: `${OSS}icon/icon_weichat.png`,
+            balance: 0,
+            value: 3
+        }
+    ])
+
+    // 选择预定时间
+    const showBookTimePopup = ref<boolean>(false)
+    const sevenDay = reactive<ITeaSpecialistFuture7DaysResult>({
+        minimum_time: 0,
+        time: []
+    })
+    const reserveTime = ref<Array<any>>([])
+
+    // 计算费用明细 service(服务费) coupon(优惠券) discount(会员优惠) totalDiscount(总优惠) total(总费用) groupCoupon(团购券)
+    const bill = ref<{service: any, discount:number, totalDiscount: number, coupon: number, groupCoupon: number, total: number}>({
+        service: {
+            total: 0,
+            unitPrice: 0,
+            num: 0,
+            startTime: 0,
+            endTime: 0,
+            dayTime: '',
+            startHour: '',
+            endHour: ''
+        },
+        discount: 0,
+        totalDiscount: 0,
+        coupon: 0,
+        groupCoupon: 0,
+        total: 0
+    })
+
+    // 费用明细相关
+    const showCostPopup = ref<boolean>(false) // 费用明细popup
+    const showPayPopup = ref<boolean>(false) // 支付popup
+
+    // 包间内容
+    const storeId = ref<number>(0) // 门店ID 
+    const id = ref<number>(0) // id
+    const teaRoom = ref<any>({})
+    const teaRoomPrice = ref<number>(0)
+
+    // 门店余额
+    const storeMoney = ref<number>(0)
+
+    // 选择的优惠券
+    const selectedCoupon = ref<{id: number, name: string}>({id: 0, name: ''})
+    const selectedGroupCoupon = ref<{id: number, name: string}>({id: 0, name: ''})
+
+    // 用户信息
+	const user = ref<any>(null)
+
+    // 套餐
+    const teaRoomPackage = ref<any>({})
+
+	onLoad((args) => {
+        storeId.value = Number(args.storeId)
+        id.value = Number(args.id)
+        teaRoomPrice.value = Number(args.price) || 0
+
+		if (args.type == ReserveServiceCategory.GroupBuying) {
+            isGroupBuying.value = true
+            pay.value = 3
+            Detail.handleInitGroupBuying()
+        }
+        Detail.handleInitReserveRoom()
+
+        // 获取用户需求详
+        getUserInfo().then(res => {
+            user.value = res
+        })
+	})
+
+    const Detail = {
+        /**
+         *  初始包间详情
+         */
+        handleInitReserveRoom: async () => {
+            // 包间详情
+            const userStore = useUserStore()
+            userInfo.value = userStore.userInfo 
+            
+            const res = await getTeaRoomDetail({ 
+                id: storeId.value,
+                latitude: uni.getStorageSync('latitude'),
+                longitude: uni.getStorageSync('longitude'),
+                user_id: userInfo.value.id || 0
+            })
+            teaRoom.value = res.details
+            swiperList.value = teaRoom.value.img_arr
+
+            // 预定时间
+            const next7 = await getNext7Days()
+            Object.assign(sevenDay, next7)
+
+            // 获取门店余额
+            const balance = await getTeaRoomBalance({ store_id: storeId.value })
+            storeMoney.value = balance.data.money || 0
+        },
+
+        /*
+         * 初始化套餐详情
+         */
+        handleInitGroupBuying: async () => {
+            const res = await getTeaRoomPackageDetail({ id: id.value })
+            teaRoomPackage.value = res.details
+        },
+
+        /**
+         * 选中预定时间
+         */
+        handleChooseReserveTime: (params: any) => {
+            reserveTime.value = params
+
+            bill.value.service = {
+                total: 0,
+                unitPrice: 0,
+                num:  params[3],
+                startTime: params[2][0],
+                endTime: params[2][params[2].length - 1],
+                dayTime: params[0],
+                startHour: params[1][0],
+                endHour: params[1][params[1].length - 1]
+            }
+
+            Detail.handleCalculateTeaRoomPrice()
+        },
+
+        /**
+         * 跳转优惠券页面
+         */
+        handleToCoupon(type) {
+            if (reserveTime.value.length == 0) {
+                toast.info('请选择预定时间')
+                return
+            }
+            uni.$on('chooseCoupon', params => {
+                console.log("🚀 ~ params:", params)
+                uni.$off('chooseCoupon')
+
+                if (type === CouponType.Discount) {
+                    selectedCoupon.value = {id: params.coupon.user_coupon_id, name: `${params.coupon.name}减${params.coupon.coupon_price}` }
+                    bill.value.coupon = params.coupon.coupon_price
+                } else {
+                    selectedGroupCoupon.value = {id: params.coupon.id, name: `团购券-${params.coupon.tea_store_group.title}` }
+                    bill.value.groupCoupon = params.coupon.coupon_price
+                }
+
+                Detail.handleCalculateTeaRoomPrice()
+            })
+
+            // 获取预定了几个小时
+            const count = bill.value.service.num
+            router.navigateTo(`/bundle/coupon/coupon?id=${id.value}&numbers=${count}&type=${type}&storeId=${storeId.value}`)
+        },
+
+        // 选择支付方式
+        handleGetPayValue: (value: number) => {
+            pay.value = value
+        },
+
+        /**
+         * 提交订单
+         */
+        handleSubmitOrder: async () => {
+            // 只有预定茶室才会选择时间
+            if (!isGroupBuying.value && bill.value.service.num == 0) {
+                toast.info('请选择预定时间')
+                return
+            }
+
+            uni.showLoading({
+                title: '提交中...'
+            })
+
+            try {
+                let res: any = null
+                if (isGroupBuying.value) {
+                    res = await createTeaRoomPackageOrder({
+                        group_id: id.value
+                    })
+                } else {
+                    res = await createTeaRoomOrder({
+                        store_id: storeId.value,
+                        room_id: id.value,
+                        day_time: bill.value.service.dayTime,
+                        start_time: bill.value.service.startHour,
+                        end_time: bill.value.service.endHour,
+                        user_coupon_id: selectedCoupon.value.id || 0,
+                        hours: bill.value.service.num,
+                        group_coupon_id: selectedGroupCoupon.value.id || 0
+                    })
+                }
+                
+                uni.hideLoading()
+
+                // 支付后的处理
+                uni.$on('payment', params => {
+                    setTimeout(() => {
+                        uni.$off("payment")
+                        if (params.result) {
+                            uni.redirectTo({
+                                url: `/pages/notice/reserve?type=${OrderType.TeaRoomOrder}&orderId=${params.orderId}&isGroupBuying=${isGroupBuying.value ? 1 : 0}`
+                            })
+                        } else {
+                            if (isGroupBuying.value) {
+                                router.redirectTo(`/bundle/order/platform/order-list`)
+                            } else {
+                                router.redirectTo(`/bundle/order/tea-room/order-list?isGroupBuying=${isGroupBuying.value ? 1 : 0}`)
+                            }
+                        }
+                    }, 1000)
+                })
+
+                setTimeout(() => {
+                    const name = isGroupBuying.value ? teaRoomPackage.value.title : teaRoom.value.name
+
+                    router.navigateTo(
+                        `/pages/cashier/cashier?from=${OrderType.TeaRoomOrder}&orderId=${res.id}&name=${name}&storeId=${storeId.value}&isGroupBuying=${isGroupBuying.value ? 1 : 0}`
+                    )
+                }, 800)
+            } catch (error) {
+                uni.hideLoading()
+                toast.info('订单提交失败，请稍后重试')
+                return
+            }
+        },
+
+        /**
+         * 计算茶室价格
+         */
+        handleCalculateTeaRoomPrice: async () => {
+            const res = await calculateTeaRoomPrice({
+                room_id: id.value,
+                coupon_id: selectedCoupon.value.id || 0,
+                group_coupon_id: selectedGroupCoupon.value.id,
+                nums: bill.value.service.num,
+            })
+
+            bill.value.service.total = res.details.room_price // 茶室价格
+            bill.value.discount = res.details.discount_room_price // 茶室总价
+            bill.value.totalDiscount = res.details.discount_all_price // 总优惠
+            bill.value.groupCoupon = res.details.group_price // 团购优惠
+            bill.value.total = res.details.order_amount // 订单金额
+        }
+    }
+</script>
+
+<style lang="scss">
+	page {
+		background-color: $cz-page-background;
+	}
+
+    .swiper {
+        :deep() {
+            .wd-swiper-nav__item--dots-bar {
+                width: 56rpx !important;
+                height: 6rpx !important;
+                border-radius: 3rpx !important;
+            }
+
+            .is-active {
+                background-color: #2B9F93 !important;
+            }
+        }
+    }
+
+    .pay {
+        :deep() {
+            .wd-radio {
+                margin-top: 0 !important;
+            }
+        }
+    }
+</style>
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 @@
+<route lang="jsonc" type="page">{
+	"layout": "default",
+	"style": {
+        "navigationStyle": "custom",
+		"navigationBarBackgroundColor": "#fff"
+	}
+}</route>
+
+<template>
+	<view class="pb-40rpx">
+        <view>
+            <navbar title="消费明细" custom-class="!bg-[#F6F7F9]"></navbar>
+        </view>
+
+        <view class="mt-28rpx mx-32rpx">
+            <mescroll-body ref="mescrollItem0" @init="mescrollInit" @down="downCallback" @up="BillDetail.upCallback" :down="downOption" :up="upOption">
+                <view class="bg-white rounded-16rpx py-28rpx mb-20rpx">
+                    <view class="flex items-center">
+                        <view class="w-8rpx h-32rpx bg-[#4C9F44] mr-22rpx"></view>
+                        <view class="font-bold text-28rpx leading-40rpx text-[#303133]">订单号：1744601722882174</view>
+                    </view>
+                    <view class="mx-18rpx mt-16rpx mb-22rpx">
+                        <wd-gap height="2rpx" bg-color="#E5E5E5"></wd-gap>
+                    </view>
+                    <view class="flex items-center justify-between px-18rpx">
+                        <view class="font-400 text-28rpx text-[#606266] leading-40rpx">
+                            <view class="mb-16rpx">门店：茶址24小时-碧云店</view>
+                            <view class="mb-16rpx">类型：包间预定</view>
+                            <view class="mb-16rpx">支付方式：平台余额</view>
+                            <view>支付时间：2025-04-14 11:35</view>
+                        </view>
+                        <view class="text-right">
+                            <price-format weight="bold" color="#303133" :first-size="44" :second-size="44" :subscript-size="28" :price="23.02"></price-format>
+                            <view class="mt-6rpx font-400 text-28rpx leading-40rpx text-[#303133]">金额</view>
+                        </view>
+                    </view>
+                </view>
+            </mescroll-body>
+	    </view>
+	</view>
+</template>
+
+
+<script lang="ts" setup>
+    import { toTimes, copy } from '@/utils/tools'
+	import { router } from '@/utils/tools'
+	import { onPageScroll, onReachBottom } from '@dcloudio/uni-app'
+	import useMescroll from "@/uni_modules/mescroll-uni/hooks/useMescroll.js"
+
+    // mescroll
+	const { mescrollInit, downCallback, getMescroll } = useMescroll(onPageScroll, onReachBottom) // 调用mescroll的hook
+    const downOption = {
+		auto: true
+	}
+	const upOption = {
+		auto: true,
+		textNoMore: '~ 已经到底啦 ~', //无更多数据的提示
+	}
+	const list = ref<Array<any>>([]) // 茶室列表
+    
+	const OSS = inject('OSS')
+
+    const mark = ref<string>('')
+
+	onLoad((args) => {
+	})
+
+    const BillDetail = {
+        /**
+         * 分页加载
+         * @param mescroll 
+         */
+		upCallback: (mescroll) => {
+			// 需要留一下数据为空的时候显示的空数据图标内容
+            // getTeaRoomOrderList(filter).then((res) => {
+			// 	const curPageData = res.list || [] // 当前页数据
+			// 	if(mescroll.num == 1) list.value = [] // 第一页需手动制空列表
+			// 	list.value = list.value.concat(curPageData) //追加新数据
+			// 	mescroll.endSuccess(curPageData.length, Boolean(res.more))
+			// }).catch(() => {
+				mescroll.endErr() // 请求失败, 结束加载
+			// })
+		},
+
+        // 打电话
+        handleCall: (phone) =>  {
+            uni.makePhoneCall({
+                phoneNumber: phone
+            })
+        }
+    }
+</script>
+	
+<style lang="scss">
+    page {
+	    background-color: $cz-page-background;
+    }
+
+</style>
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 @@
+<route lang="jsonc" type="page">{
+	"layout": "default",
+	"style": {
+        "navigationStyle": "custom",
+		"navigationBarBackgroundColor": "#fff"
+	}
+}</route>
+
+<template>
+	<view class="pb-40rpx">
+        <view>
+            <navbar title="用户详情" custom-class="!bg-[#F6F7F9]"></navbar>
+        </view>
+
+        <view class="mt-28rpx mx-30rpx">
+            <view class="bg-white rounded-16rpx px-28rpx pt-40rpx pb-26rpx">
+                <view>
+                    <view class="flex items-center">
+                        <wd-img width="140rpx" height='140rpx' src="https://shchazhi.oss-cn-hangzhou.aliyuncs.com/fronted/icon/icon_avatar.png" :round="true"></wd-img>
+                        <view class="ml-20rpx">
+                            <view class="flex items-center">
+                                <view class="font-bold text-28rpx text-[#303133] leading-40rpx mr-12rpx">用户昵称</view>
+                                <!-- TODO 如果是vip的话才显示这个皇冠 -->
+                                <view>
+                                    <wd-img width="40rpx" height='40rpx' :src="`${OSS}icon/icon_crown.png`"></wd-img>
+                                </view>
+                            </view>
+                            <view class="mt-18rpx font-400 text-28rpx text-[#303133] leading-40rpx">手机号：18857339563</view>
+                        </view>
+                    </view>
+
+                    <!-- TODO VIP显示这块内容 -->
+                    <view class="relative mt-22rpx">
+                        <wd-img width="650rpx" height='70rpx' :src="`${OSS}images/store/user/image1.png`"></wd-img>
+                        <view class="absolute top-18rpx left-28rpx flex items-center">
+                            <wd-img width="40rpx" height='40rpx' :src="`${OSS}icon/icon_vip.png`"></wd-img>
+                            <view class="font-400 text-24rpx text-[#EECC99] leading-34rpx ml-18rpx">2026.03.06到期</view>
+                        </view>
+                    </view>
+
+                    <view class="flex items-center justify-around px-90rpx mt-46rpx">
+                        <view class="flex flex-col items-center justify-start">
+                            <view class="font-400 text-24rpx text-[#606266] text-34rpx">平台余额</view>
+                            <view class="font-bold text-32rpx text-[#303133] leading-34rpx mt-34rpx">3,1.46</view>
+                        </view>
+                        <view class="h-98rpx">
+                            <wd-divider vertical color="#EAEEF2" custom-class="!h-98rpx"></wd-divider>
+                        </view>
+                        <view class="flex flex-col items-center justify-start">
+                            <view class="font-400 text-24rpx text-[#606266] text-34rpx">门店余额</view>
+                            <view class="font-bold text-32rpx text-[#303133] leading-34rpx mt-34rpx">3,662.46</view>
+                        </view>
+                    </view>
+
+                    <view class="mt-50rpx relative">
+                        <wd-img width="650rpx" height='216rpx' :src="`${OSS}images/store/user/image2.png`"></wd-img>
+                        <view class="absolute top-24rpx left-40rpx">
+                            <view class="">消费金额</view>
+                            <view class="mt-22rpx">
+                                <price-format color="#FF5951" :first-size="34" :second-size="34" :subscript-size="34" :price="23.02"></price-format>
+                            </view>
+                            <view 
+                                @click="router.navigateTo('/bundle/user/bill-detail')"
+                                class="bg-[#3C7FFF] w-124rpx h-48rpx rounded-24rpx text-[#fff] text-center leading-48rpx text-28rpx font-bold mt-12rpx">
+                                    去查看
+                            </view>
+                        </view>
+                    </view>
+
+                    <view class="mt-26rpx mb-18rpx">
+                        <wd-gap height="2rpx" bg-color="#E5E5E5"></wd-gap>
+                    </view>
+
+                    <view class="font-400 text-26rpx text-[#9CA3AF] leading-36rpx">注册日期：2025-04-23</view>
+                </view>
+            </view>
+
+            <view class="bg-white rounded-16rpx px-30rpx pt-36rpx pb-34rpx mt-20rpx">
+                <view class="flex items-center">
+                    <wd-img width="40rpx" height='40rpx' :src="`${OSS}icon/icon_qizhi.png`"></wd-img>
+                    <view class="text-30rpx leading-42rpx text-[#303133] ml-10rpx">备注</view>
+                </view>
+
+                <view class="add-textarea">
+                    <wd-textarea v-model="mark"
+                        placeholder="有想说的可以在这里写哦！"
+                        custom-class='!rounded-18rpx !border-2rpx !border-[#EFF0EF] !bg-[#F8F9FA] !mt-20rpx'
+                        custom-textarea-class='!bg-[#F8F9FA] !h-100rpx' :maxlength='30' show-word-limit />
+                </view>
+
+                <view class="bg-[#4C9F44] rounded-8rpx text-[#fff] w-626rpx h-90rpx text-center leading-90rpx mt-52rpx">修改备注</view>
+            </view>
+	    </view>
+	</view>
+</template>
+
+
+<script lang="ts" setup>
+    import { toTimes, copy } from '@/utils/tools'
+	import { router } from '@/utils/tools'
+
+	const OSS = inject('OSS')
+
+    const mark = ref<string>('')
+
+	onLoad((args) => {
+	})
+
+    const UserList = {
+        // 打电话
+        handleCall: (phone) =>  {
+            uni.makePhoneCall({
+                phoneNumber: phone
+            })
+        }
+    }
+</script>
+	
+<style lang="scss">
+    page {
+	    background-color: $cz-page-background;
+    }
+
+    .add-textarea {
+        :deep() {
+            .wd-textarea__value,
+            .wd-textarea__count {
+                background: transparent !important;
+            }
+        }
+    }
+</style>
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 @@
+<route lang="jsonc" type="page">{
+	"layout": "default",
+	"style": {
+        "navigationStyle": "custom",
+		"navigationBarBackgroundColor": "#fff"
+	}
+}</route>
+
+<template>
+	<view>
+        <view>
+            <navbar title="用户列表" custom-class="!bg-[transparent]"></navbar>
+        </view>
+
+        <view>
+            <mescroll-body ref="mescrollItem0" @init="mescrollInit" @down="downCallback" @up="UserList.upCallback" :down="downOption" :up="upOption">
+                <view class="mb-22rpx">
+                    <view class="mx-64rpx flex justify-between items-center mb-10rpx">
+                        <view class="flex items-center" @click="router.navigateTo('/bundle/user/user-detail')">
+                            <wd-img width="100rpx" height='100rpx' src="https://shchazhi.oss-cn-hangzhou.aliyuncs.com/fronted/icon/icon_avatar.png" :round="true"></wd-img>
+                            <view class="ml-20rpx">
+                                <view class="flex items-center">
+                                    <view class="font-bold text-28rpx text-[#303133] leading-40rpx  mr-12rpx">用户昵称</view>
+                                    <!-- TODO 如果是vip的话才显示这个皇冠 -->
+                                    <view>
+                                        <wd-img width="40rpx" height='40rpx' :src="`${OSS}icon/icon_crown.png`"></wd-img>
+                                    </view>
+                                </view>
+                                <view class="mt-14rpx font-400 text-26rpx text-[#303133] leading-36rpx">13525626532</view>
+                                <view class="mt-10rpx text-24rpx text-[#F29747] leading-34rpx w-400rpx line-1">这里是备注信息，备注信息这里是备注信息，备注信息</view>
+                            </view>
+                        </view>
+                        <view @click="UserList.handleCall">
+                            <wd-img width="64rpx" height='64rpx' :src="`${OSS}icon/icon_phone3.png`"></wd-img>
+                        </view>
+                    </view>
+
+                    <view class="mx-30rpx">
+                        <wd-gap height="2rpx" bg-color="#E5E5E5"></wd-gap>                
+                    </view>
+                </view>
+            </mescroll-body>
+	    </view>
+	</view>
+</template>
+
+
+<script lang="ts" setup>
+	import { router } from '@/utils/tools'
+    import { toTimes, copy } from '@/utils/tools'
+	import { onPageScroll, onReachBottom } from '@dcloudio/uni-app'
+	import useMescroll from "@/uni_modules/mescroll-uni/hooks/useMescroll.js"
+
+    // mescroll
+	const { mescrollInit, downCallback, getMescroll } = useMescroll(onPageScroll, onReachBottom) // 调用mescroll的hook
+    const downOption = {
+		auto: true
+	}
+	const upOption = {
+		auto: true,
+		textNoMore: '~ 已经到底啦 ~', //无更多数据的提示
+	}
+	const list = ref<Array<any>>([]) // 茶室列表
+
+	const OSS = inject('OSS')
+
+	onLoad((args) => {
+	})
+
+    const UserList = {
+        /**
+         * 分页加载
+         * @param mescroll 
+         */
+		upCallback: (mescroll) => {
+			// 需要留一下数据为空的时候显示的空数据图标内容
+            // getTeaRoomOrderList(filter).then((res) => {
+			// 	const curPageData = res.list || [] // 当前页数据
+			// 	if(mescroll.num == 1) list.value = [] // 第一页需手动制空列表
+			// 	list.value = list.value.concat(curPageData) //追加新数据
+			// 	mescroll.endSuccess(curPageData.length, Boolean(res.more))
+			// }).catch(() => {
+				mescroll.endErr() // 请求失败, 结束加载
+			// })
+		},
+
+        /**
+         * 电话
+         * @param phone 
+         */
+        handleCall: (phone) =>  {
+            uni.makePhoneCall({
+                phoneNumber: phone
+            })
+        }
+    }
+</script>
+	
+<style lang="scss">
+    page {
+        background-color: #fff;
+    }
+</style>
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 @@
             </view>
         </view>
 
+
+        <!-- 茶室管理端-订单管理 -->
+        <view v-if="type === OrderSource.Admin" class="bg-white rounded-10rpx p-30rpx">
+            <view class="flex justify-between items-center">
+                <view class="flex items-center">
+                    <view class="mr-10rpx flex items-center">
+                        <wd-img width="40rpx" height="40rpx" :src="`${OSS}icon/icon_tea_room.png`"></wd-img>
+                    </view>
+                    <view class="flex items-center w-400rpx" @click="router.navigateTo(`/pages/order/order-detail?storeId=${order.store_id}`)">
+                        <view class="font-bold text-30rpx leading-42rpx text-[#303133] mr-10rpx  line-1">{{ order.store_name }}</view>
+                    </view>
+                </view>
+                <view class="font-400 text-28rpx leading-40rpx mt-12rpx text-[#4C9F44]">
+                    <text v-if="order.order_status === AdminOrderStatus.ToUse" class="text-[#FF5951]" >待使用</text>
+                    <text v-if="order.order_status === AdminOrderStatus.Consuming">使用中</text>
+                    <text v-if="order.order_status === AdminOrderStatus.Finished" class="text-[#606266]">完成</text>
+                    <text v-if="order.order_status === AdminOrderStatus.Cancelled" class="text-[#C9C9C9]">订单取消</text>
+                </view>
+            </view>
+            <view class="mt-22rpx">
+                <view class="flex items-center">
+                    <view class="mr-28rpx">
+                        <wd-img width="200rpx" height="200rpx" :src="`${OSS}images/home/home_image5.png`"></wd-img>
+                    </view>
+                    <view class="flex-1">
+                        <view @click="ComboCard.handleToOrderDetail">
+                            <view class="font-500 text-30rpx text-[#303133] leading-42rpx line-1 w-400rpx">{{ order.room_name }}</view>
+                            <view class="font-400 leading-36rpx text-26rpx text-[#606266] mt-34rpx">
+                                <view>预约时间：{{ order.day_time }}  {{ order.start_time }}-{{ order.end_time }}</view>
+                                <view class="mt-18rpx">预约时长：{{ order.hours }}小时</view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+
+                <!-- 操作按钮 -->
+                <template v-if="order.order_status === AdminOrderStatus.ToUse || order.order_status === AdminOrderStatus.Consuming">
+                    <view class="text-center flex items-center text-28rpx mt-28rpx justify-end">
+                        <view class="w-178rpx h-70rpx rounded-8rpx border-[2rpx] border-[#9CA3AF] text-[#303133] mr-28rpx flex items-center justify-center"
+                            @click="ComboCard.handleCancelOrder(OrderSource.TeaRoom)">释放时间</view>
+                        <view class="w-178rpx h-70rpx rounded-8rpx border-[2rpx] border-[#4C9F44] text-[#4C9F44] flex items-center justify-center"
+                            @click="ComboCard.handleToPayOrder(OrderSource.TeaRoom)">取消订单</view>
+                    </view>
+                </template>
+             
+                <template v-if="order.order_status === AdminOrderStatus.Finished || order.order_status === AdminOrderStatus.Cancelled">
+                    <view class="text-center flex items-center text-28rpx mt-28rpx justify-end">
+                        <view class="w-178rpx h-70rpx rounded-8rpx border-[2rpx] border-[#9CA3AF] text-[#303133] mr-28rpx flex items-center justify-center"
+                            @click="ComboCard.handleCancelOrder(OrderSource.TeaRoom)">删除</view>
+                    </view>
+                </template>
+            </view>
+        </view>
+
         <!-- 取消订单, 删除订单 -->
         <wd-message-box selector="wd-message-box-slot"></wd-message-box>
     </view>
 </template>
 
 <script lang="ts" setup name="ComboCard">
-    import { OrderSource, OrderStatus, TeaRoomOrderStatus, TeaRoomPackageOrderStatus } from '@/utils/order'
+    import { OrderSource, OrderStatus, AdminOrderStatus, TeaRoomPackageOrderStatus } from '@/utils/order'
     import { useMessage } from 'wot-design-uni'
     import { toast } from '@/utils/toast'
     import { handleTRCancelOrderHooks, handleTRDeleteOrderHooks, handleTRToPayHooks, handleToTRStoreHooks, handleTGOrderRefundHooks } from '@/hooks/useOrder'
@@ -173,7 +227,7 @@
          * 详情页
          */
         handleToOrderDetail: () => {
-
+            router.navigateTo('/bundle/setmeal/detail')
         },
 
         /**
@@ -234,6 +288,113 @@
          * 编辑商品
          */
         handleEdit: () => {
+        },
+
+        /**
+         * 跳转到对对应室的详情页
+         */
+        handleToStore: () => {
+            handleToTRStoreHooks(props.order.store_id, props.order.operation_type)
+        },
+
+        /**
+         * 删除订单
+         */
+        handleDeleteOrder: (source: string) => {
+            message.confirm({
+                title: '确定删除订单？',
+                msg: '删除订单后无法恢复，是否确认删除订单？',
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                cancelButtonProps: {
+                    customClass: '!bg-[#F6F7F8] !text-[#303133] !text-32rpx !leading-44rpx !rounded-8rpx',
+                },
+                confirmButtonProps: {
+                    customClass: '!bg-[#4C9F44] !text-[#fff] !text-32rpx !leading-44rpx !rounded-8rpx',
+                }
+            }).then((res) => {
+                switch (source) {
+                    case OrderSource.Combo:
+                        // TODO 这里调用删除直营订单的接口
+                        break;
+                    case OrderSource.DouYin:
+                        // TODO 这里调用删除抖音订单的接口
+                        break;
+                    case OrderSource.TeaRoom:
+                        // 这里调用删除茶室订单的接口
+                        handleTRDeleteOrderHooks(props.order.id)
+                        break;
+                    case OrderSource.TeaSpecialist:
+                        // TODO 这里调用删除茶室订单的接口
+                        break;
+                    default:
+                        break;
+                }
+            }).catch(() => {
+                // 点击取消按钮回调事件
+            })
+        },
+
+        /**
+         * 取消订单
+         */
+        handleCancelOrder: (source: string) => {
+            message.confirm({
+                title: '确定取消订单？',
+                msg: '取消订单后无法恢复，优惠券可退回',
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                cancelButtonProps: {
+                    customClass: '!bg-[#F6F7F8] !text-[#303133] !text-32rpx !leading-44rpx !rounded-8rpx',
+                },
+                confirmButtonProps: {
+                    customClass: '!bg-[#4C9F44] !text-[#fff] !text-32rpx !leading-44rpx !rounded-8rpx',
+                }
+            }).then((res) => {
+                if (res.action == 'confirm') {
+                    switch (source) {
+                        case OrderSource.Combo:
+                            // TODO 这里调用删除直营订单的接口
+                            break;
+                        case OrderSource.DouYin:
+                            // TODO 这里调用删除抖音订单的接口
+                            break;
+                        case OrderSource.TeaRoom:
+                            // 这里调用删除茶室订单的接口
+                            handleTRCancelOrderHooks(props.order.id)
+                            break;
+                        case OrderSource.TeaSpecialist:
+                            // TODO 这里调用删除茶室订单的接口
+                            break;
+                        default:
+                            break;
+                    }
+                }
+            }).catch(() => {
+                // 点击取消按钮回调事件
+            })
+        },
+
+        /**
+         * 支付
+         */
+        handleToPayOrder: (source: string) => {
+            switch (source) {
+                case OrderSource.Combo:
+                    router.navigateTo(`/bundle/order/platform/order-detail?orderStatus=${props.orderStatus}&toPay=true`)
+                    break;
+                case OrderSource.DouYin:
+                    router.navigateTo(`/bundle/order/douyin/douyin-order-detail?orderStatus=${props.orderStatus}&toPay=true`)
+                    break;
+                case OrderSource.TeaRoom:
+                    handleTRToPayHooks(props.order.id, props.order.room_name, props.order.store_id)
+                    break;
+                case OrderSource.TeaSpecialist:
+                    router.navigateTo( `/bundle/order/tea-specialist/order-detail?orderStatus=${props.orderStatus}&toPay=true`)
+                    break;
+                default:
+                    break;
+            }
         }
     }
 </script>
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 @@
-<route lang="jsonc" type="page">
-{
-  "layout": "tabbar",
-  "style": {
-    "navigationBarTitleText": "关于"
-  }
-}
-</route>
-
-<script lang="ts" setup>
-import RequestComp from './components/request.vue'
-
-// 奇怪：同样的代码放在 vue 里面不会校验到错误，放在 .ts 文件里面会校验到错误
-// const testOxlint = (name: string) => {
-//   console.log('oxlint')
-// }
-// testOxlint('oxlint')
-console.log('about')
-
-function gotoAlova() {
-  uni.navigateTo({
-    url: '/pages/about/alova',
-  })
-}
-function gotoVueQuery() {
-  uni.navigateTo({
-    url: '/pages/about/vue-query',
-  })
-}
-function gotoSubPage() {
-  uni.navigateTo({
-    url: '/bundle/demo/index',
-  })
-}
-// uniLayout里面的变量通过 expose 暴露出来后可以在 onReady 钩子获取到（onLoad 钩子不行）
-const uniLayout = ref()
-onLoad(() => {
-  console.log('onLoad:', uniLayout.value) // onLoad: undefined
-})
-onReady(() => {
-  console.log('onReady:', uniLayout.value) // onReady: Proxy(Object)
-  console.log('onReady:', uniLayout.value.testUniLayoutExposedData) // onReady: testUniLayoutExposedData
-})
-</script>
-
-<template>
-  <view>
-    <view class="mt-8 text-center text-xl text-gray-400">
-      组件使用、请求调用、unocss
-    </view>
-    <RequestComp />
-    <view class="mb-6 h-1px bg-#eee" />
-    <view class="text-center">
-      <button type="primary" size="mini" class="w-160px" @click="gotoAlova">
-        前往 alova 示例页面
-      </button>
-    </view>
-    <view class="text-center">
-      <button type="primary" size="mini" class="w-160px" @click="gotoVueQuery">
-        vue-query 示例页面
-      </button>
-    </view>
-    <view class="text-center">
-      <button type="primary" size="mini" class="w-160px" @click="gotoSubPage">
-        前往分包页面
-      </button>
-    </view>
-    <view class="mt-6 text-center text-sm">
-      <view class="inline-block w-80% text-gray-400">
-        为了方便脚手架动态生成不同UI模板，本页的按钮统一使用UI库无关的原生button
-      </view>
-    </view>
-  </view>
-</template>
-
-<style lang="scss" scoped>
-.test-css {
-  // 16rpx=>0.5rem
-  padding-bottom: 16rpx;
-  // mt-4=>1rem=>16px;
-  margin-top: 16px;
-  text-align: center;
-}
-</style>
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 @@
-<route lang="jsonc" type="page">
-{
-  "layout": "default",
-  "style": {
-    "navigationBarTitleText": "Alova 请求演示"
-  }
-}
-</route>
-
-<script lang="ts" setup>
-import { useRequest } from 'alova/client'
-import { foo } from '@/api/foo-alova'
-
-const initialData = undefined
-
-const { loading, data, send } = useRequest(foo, {
-  initialData,
-  immediate: true,
-})
-console.log(data)
-function reset() {
-  data.value = initialData
-}
-</script>
-
-<template>
-  <view class="p-6 text-center">
-    <button type="primary" size="mini" class="my-6 w-160px" @click="send">
-      发送请求
-    </button>
-    <view class="h-16">
-      <view v-if="loading">
-        loading...
-      </view>
-      <block v-else>
-        <view class="text-xl">
-          请求数据如下
-        </view>
-        <view class="text-green leading-8">
-          {{ JSON.stringify(data) }}
-        </view>
-      </block>
-
-      <view class="text-red">
-        {{ data?.id }}
-      </view>
-    </view>
-    <button type="default" size="mini" class="my-6 w-160px" @click="reset">
-      重置数据
-    </button>
-  </view>
-</template>
-
-<style lang="scss" scoped>
-//
-</style>
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 @@
-<script lang="ts" setup>
-import type { IFooItem } from '@/api/foo'
-import { getFooAPI } from '@/api/foo'
-
-// const initialData = {
-//   name: 'initialData',
-//   id: '1234',
-// }
-const initialData = undefined
-
-const { loading, error, data, run } = useRequest<IFooItem>(() => getFooAPI('菲鸽'), {
-  immediate: true,
-  initialData,
-})
-
-function reset() {
-  data.value = initialData
-}
-</script>
-
-<template>
-  <view class="p-6 text-center">
-    <view class="my-2">
-      pages 里面的 vue 文件会扫描成页面，将自动添加到 pages.json 里面。
-    </view>
-    <view class="my-2 text-green-400">
-      但是 pages/components 里面的 vue 不会。
-    </view>
-
-    <view class="my-4 text-center">
-      <button type="primary" size="mini" class="w-160px" @click="run">
-        发送请求
-      </button>
-    </view>
-    <view class="h-16">
-      <view v-if="loading">
-        loading...
-      </view>
-      <block v-else>
-        <view class="text-xl">
-          请求数据如下
-        </view>
-        <view class="text-green leading-8">
-          {{ JSON.stringify(data) }}
-        </view>
-      </block>
-    </view>
-    <view class="my-4 text-center">
-      <button type="warn" size="mini" class="w-160px" :disabled="!data" @click="reset">
-        重置数据
-      </button>
-    </view>
-  </view>
-</template>
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 @@
-<route lang="jsonc" type="page">
-{
-  "layout": "default",
-  "style": {
-    "navigationBarTitleText": "Vue Query 请求演示"
-  }
-}
-</route>
-
-<script lang="ts" setup>
-import { useQuery } from '@tanstack/vue-query'
-import { foo } from '@/api/foo'
-import { getFooQueryOptions } from '@/api/foo-vue-query'
-
-// 简单使用
-onShow(async () => {
-  const res = await foo()
-  console.log('res: ', res)
-})
-
-// vue-query 版
-const {
-  data,
-  error,
-  isLoading: loading,
-  refetch: send,
-} = useQuery(getFooQueryOptions('菲鸽-vue-query'))
-</script>
-
-<template>
-  <view class="p-6 text-center">
-    <button type="primary" size="mini" class="my-6 w-160px" @click="send">
-      发送请求
-    </button>
-    <view class="h-16">
-      <view v-if="loading">
-        loading...
-      </view>
-      <block v-else>
-        <view class="text-xl">
-          请求数据如下
-        </view>
-        <view class="text-green leading-8">
-          {{ JSON.stringify(data) }}
-        </view>
-      </block>
-    </view>
-  </view>
-</template>
-
-<style lang="scss" scoped>
-//
-</style>
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 @@
-<!-- 使用 type="home" 属性设置首页，其他页面不需要设置，默认为page -->
-<route lang="jsonc" type="page">{
-    "needLogin": true,
-	"layout": "tabbar",
-	"style": {
-		// 'custom' 表示开启自定义导航栏，默认 'default'
-		"navigationStyle": "default",
-		"navigationBarTitleText": "选择城市"
-	}
-}</route>
-
-<template>
-    <view class="">
-        <view class="search-box mx-30rpx mt-30rpx">
-            <wd-search
-				placeholder="请输入城市名称"
-				placeholder-left></wd-search>
-        </view>
-
-        <view class="mt-52rpx mx-30rpx">
-            <view class="text-[#333] leading-42rpx text-30rpx font-bold">当前定位</view>
-            <view class="mt-40rpx">
-                <view class="bg-[#F8F9FA] rounded-28rpx w-162rpx h-56rpx text-[#606266] flex items-center justify-center">
-                    <wd-img width="28rpx" height="28rpx" :src="`${OSS}icon/icon_location2.png`"></wd-img>
-                    <view class="text-26rpx text-[#606266] leading-36rpx">{{ city || LOCATION_DEFAULT_CITY }}</view>
-                </view>
-            </view>
-        </view>
-
-         <view class="mt-50rpx mx-30rpx">
-            <view class="text-[#333] leading-42rpx text-30rpx font-bold">已开通城市</view>
-            <view class="mt-40rpx grid grid-cols-4 gap-20rpx w-full">
-                <view class="bg-[#F8F9FA] rounded-28rpx h-56rpx text-[#606266] flex items-center justify-center"  
-				v-for="(item, index) in openCityList" :key="index"
-				@click="City.handleChooseCity(item)"
-				>
-                    <wd-img width="28rpx" height="28rpx" :src="`${OSS}icon/icon_location2.png`"></wd-img>
-                    <view class="text-26rpx text-[#606266] leading-36rpx">{{ item.name }}</view>
-                </view>
-            </view>
-        </view>
-    </view>
-</template>
-
-<script lang="ts" setup>
-	import { router } from '@/utils/tools'
-	import { getOpenCityList } from '@/api/tea-room'
-	import { LOCATION_CITY_KEY, LOCATION_LAT_KEY, LOCATION_LNG_KEY } from '@/hooks/useLocation'
-
-	const OSS = inject('OSS')
-
-	// 经纬度
-	const latitude = ref<number>(0)
-	const longitude = ref<number>(0)
-	const city = ref<string>('')
-
-	// 已开通城市列表
-	const openCityList = ref<Array<any>>([])
-
-	onLoad((args) => {
-		if (args.lat && args.lng) {
-			latitude.value = Number(args.lat)
-			longitude.value = Number(args.lng)
-		}
-
-		City.handleInit()
-	})
-
-    const City = {
-		handleInit: async () => {
-			city.value = uni.getStorageSync(LOCATION_CITY_KEY)
-			const res = await getOpenCityList()
-			openCityList.value = res.list
-		},
-
-		/**
-		 * 选择城市
-		 */
-		handleChooseCity: (item: any) => {
-
-			const params = {
-                latitude: item.latitude,
-                longitude: item.longitude,
-                city: item.name
-            }
-            uni.$emit('locationUpdate', params)
-
-			uni.setStorageSync(LOCATION_LAT_KEY, item.latitude)
-			uni.setStorageSync(LOCATION_LNG_KEY, item.longitude)
-			uni.setStorageSync(LOCATION_CITY_KEY, item.name)
-			router.navigateBack()
-		}
-	}
-
-</script>
-
-<style lang="scss">
-page {
-    background-color: #fff;
-}
-
-.search-box {
-	display: flex;
-	height: 100%;
-	margin-right: 32px;
-	--wot-search-padding: 0;
-	--wot-search-side-padding: 0;
-
-	:deep() {
-		.wd-search {
-			background: transparent !important;
-			width: 100% !important;
-		}
-
-        .wd-search__block {
-            height: 72rpx;
-			background-color: #F8F9FA !important;
-		}
-
-		.wd-search__input {
-			// #ifndef MP
-			padding-right: 0 !important;
-			// #endif
-		}
-	}
-}
-</style>
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 @@
 					<view class="font-400 text-24rpx text-[#303133] leading-34rpx">套餐管理</view>
 				</view>
 
-				<view class="flex flex-col justify-center items-center w-[25%]">
+				<view class="flex flex-col justify-center items-center w-[25%]" @click="router.navigateTo('/bundle/user/user-list')">
 					<wd-img width="90rpx" height="90rpx" :src="`${OSS}images/store/home/image6.png`" mode="aspectFit" />
 					<view class="font-400 text-24rpx text-[#303133] leading-34rpx">用户列表</view>
 				</view>
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 822e83d2030094fda87c0815fb2a4fcbc40e7b25..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11665
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

diff --git a/src/pages/my/img/modify.png b/src/pages/my/img/modify.png
deleted file mode 100644
index 875631e6b1b9bb6c5355867afc503c7c0287d25a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 664
zcmV;J0%!e+P)<h;3K|Lk000e1NJLTq003D4001Zm1^@s6m33Cj00001b5ch_0Itp)
z=>Px%Qb|NXRA@u(n!StEKp4iKCm-A%7JC6dz-F&F(0(n%-6Cw>ARdY~hlSb*qNt4@
zScsrtbrxDEh?Z7@*a&u_mDu<X93mpR*|YJi<ZK*G(1Z2x2)Z*x<_)9?;d$oy&5+5=
zyo6p>3A`0))2f4tqY&AvkSz`b1F*=lXA0R8<Pz|*$PGhYRLB#C{4PyrT2a*dPF^Ok
zr<AV+`OVzi)TY_l{Q!CZc7fapV`f0c6K-Q8<u-);zTZ#cR_lTxPZLNQNx(s<zd|mu
z>?nfZCV(vt+R<o>b&yS(Mnx3eBYC{h$sL9pgKQQS!qLjgV~__OwxRJ>V~`7x`yfv=
zKDFb3Ymh$<2FHRheBjvM3%d&PmwrF_Iz7FllboGCuOJs9*Fj#fW1*^i-R;KPlcWH-
zS#j7Qz~NwUfMNK=j=ZW?%j%)XZIWjdhdlx;^86)!ZDiQ9@mraN$TG-neq*qkz8uM`
z0H*BP_^qyx9rS<sx%dQfs{=1@Ey}-(S0s0POTa;J{e^P@d6eh#26*bg%UcUwRy*kW
zYJ+Gba?Oxe9r$@^Q9=GJ(q09YbWvhw46JS153}qrgW#bZ8^2ZmJbt<h@|535CZB!`
z@{2T$c0|!5kcTF3<*(wpl7I?y9N+mlAD;9V%Vd*pRNQg|L2ygY{r(?#oieTShCHKX
zTK^8ae!*d<vkzo>cVSEiKwAqA>w&KYxt^51^?S|njqDj?&ViKjnL@TWHilWY$RN0+
ykS#(ktL;Z3&lR#o$ffj$JfBy{mLZpg^gjTv6?BFpVeMW30000<MNUMnLSTZo5;*<<

diff --git a/src/pages/my/img/修改 (1).png b/src/pages/my/img/修改 (1).png
deleted file mode 100644
index f419519574be2f50f53a27b9501c1510ad63d730..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 394
zcmV;50d@X~P)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px$L`g(JR5(wi(?Kf)aU90+?~~kJB*}%Nlv3`SQsT%>ao`<z30v|8lp_ZR4vLgq
zI5?1^++DWV;-HnXDLv+2Gu!O$?9OaEHOKkP@BjRNk0|)qo&b)3S>PDhl=PE)t|E@@
zN#F*k1A9OjxC53GEEh^4;qN6$ueM9kWaq#=uq3J86-ptWz`Uf7<OH_ofNNk!Qn@44
z4GEa-0pJOEl(dlv6+{kz)p*j|HmFBrMN-I$Cdl?s7!~+#%_Mc4WReDw1?>V`z?7tF
zdNtxqGLbCk1vr(o-3!tL*&YObfptlTscR0m({Ylv&9*%XyhTg4DCsiJWEj{FO9wP%
z(%Ohd*tVyEXW#<(14e)u;0sujbk(g+X=n^Mi~IBrg!dr|{zOtOuami5%L969e-TW!
o7otEz(EU8s09AnTeiWec4~F`aG@UE(lK=n!07*qoM6N<$f>x`nRsaA1

diff --git a/src/pages/my/img/头像.png b/src/pages/my/img/头像.png
deleted file mode 100644
index ffd344e989e07ebb70c7d1d6079836d6a7b532b2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11769
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
b6ZroCLk%^xYjv|z00000NkvXXu0mjffK)U9

diff --git a/src/pages/my/img/播放 (5).png b/src/pages/my/img/播放 (5).png
deleted file mode 100644
index 618a95da5b375ab6df7f08bd33de9e5326c78854..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 734
zcmV<40wMj0P)<h;3K|Lk000e1NJLTq000&M000*V1^@s659q(100001b5ch_0Itp)
z=>Px%m`OxIR7gvml}m_EVHn1L4<d?OvLG}=7MKNABU4JDT$6?CViK{SToy7lWieQq
zhRtL|AySfZmxWuDOUbRsCBi~3rCf*CdH$WFW9IzLjCXVDeDC}FzVE#}pD1GyF$P!+
z%m#)7-BQ<Iz)Ro+a7fa_B81xhjEDh1Jx~i=1C9b$fcL5IK%fR#089e*0u7Qr<XL}#
zBcc*G348=rO1fX}M*bfW<AB{je_)oRXPN&Wa6}9RuBTUABgt3p&?3Sq+LflPTGDF=
zmB10v1Gt)8@2;d39nuOMB4Q6v1x%LInt?a?>RyoaGanZbk`x_n77^WndqA_KMnyzV
z;0>@y()og7-bjnMQPPhNay|_>oWO?|?3UULj4#S-L}aIZ1+13jHY>C=-*<qm2JZ)+
zNZL~5odbKh6}SK_&x%xVLvuzM{2*zsb&}3?0-U+L1GXn^)>u%J8Nd#MKLHaZJ?;WH
zbG-;GmE<&)EFwk&w+wc_j+FHLKfn&Dm(-90R{&29_O)ut&3v02=l6Dp90Atm$2lU#
z0+$WGS*oIRtP3Z8l-A{RLGk7Tbq4QrwI!|Z1o$)10&J4>wTyq0C)(htzyY8_()WTB
zWSU_?S}4g~RIZObY_8R^Y@{93B&oRo?0?n}3(Y?*B37k2ugbu4fP+A#Bp0*GmZWqL
zVA)*a>CC|X?n|odidvo8rQ}~brF!E>!6H;^(aP&_?^KKX0W&4N?aZ+wVlZ$jeH`XW
z`r^2@FGyd&UE;BH)3-?aR;K#B0Bg6Ou`_9IJ;fy}dh;y$^MGxM9yr)z>zCz48Z#mR
zRRdEJRrIEHz;TOv{s8U3xzX&C22W1{CnTpImabVBZYK}vS>Tc+_jWt`4Rd@XT>vNh
QUjP6A07*qoM6N<$f_61Xga7~l

diff --git a/src/pages/my/img/组 116095.png b/src/pages/my/img/组 116095.png
deleted file mode 100644
index 244da48e1403e43f872c929dc644aaebf1b09578..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 266
zcmeAS@N?(olHy`uVBq!ia0vp^Y(UJ#0V1dK=^Fzn#^NA%Cx&(BWL^R}M?75|LnOjO
z&)aexau8sBFjKVu0c*}tU6Wn6IK`UE%97F*JHj{Iu&!Vc<mOc3VD!{%`;%k9ne^PX
z$9htOP`u$;_I~phzb3LA*=_Jcj>|FpE}P3z*$MNwn`d`;%uFt8QV_~dF<bKT%%;9&
zQ-YpPIQsqZDz_fSFPE%j&FoJY@EktXeac@c;%{S6f120I!xDa6p`QNAb4)L8xc#V%
zZ=TmNmkqAGf6I2)oej6tnrC##)Ih3}t$bhd1@1|$Y|~15ZY}-sfPMAz0Ok3P6;VL{
OFnGH9xvX<aXaWG+r(}x&

diff --git a/src/pages/my/img/组 116107.png b/src/pages/my/img/组 116107.png
deleted file mode 100644
index 050cf4a7d0631bbd0ed30668c64f3c720d39c60d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3965
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
XiDTNyMOk%>00000NkvXXu0mjf9|CCk

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 @@
-<route lang="jsonc" type="page">
-	{
-		"layout": "tabbar",
-		"style": {
-			"navigationStyle": "custom"
-		}
+<route lang="jsonc" type="page">{
+	"layout": "tabbar",
+	"style": {
+		"navigationStyle": "custom"
 	}
-</route>
+}</route>
 
 <script lang="ts" setup>
 import type { IUserResult } from '@/api/types/user'
 import { getUserInfo } from '@/api/user'
 import { useUserStore } from '@/store'
 import { router } from '@/utils/tools'
-import headerBgImg from './img/bg.png'
-import modifyBgImg from './img/modify.png'
-import editIconImg from './img/修改 (1).png'
-import defaultAvatarImg from './img/头像.png'
-import playIconImg from './img/播放 (5).png'
 
 const OSS = inject('OSS')
 const navbarHeight = inject('navbarHeight')
 const rightPadding = inject('capsuleOffset')
 
-// 本地图片资源
-const defaultAvatar = defaultAvatarImg as string
-const editIcon = editIconImg as string
-const playIcon = playIconImg as string
-const headerBg = headerBgImg as string
-const modifyBg = modifyBgImg as string
-
-// 调试：检查背景图片路径
-console.log('headerBg:', headerBg)
-
 // 登录信息相关
 const user = ref<IUserResult>({
-  id: 0,
-  sn: 0,
-  sex: '未知',
-  account: '',
-  nickname: '',
-  real_name: '',
-  avatar: '',
-  collect_count: 0,
-  coupon_count: 0,
-  create_time: '',
-  has_auth: false,
-  has_password: false,
-  member: 0,
-  mobile: '',
-  user_money: '0.00',
-  version: '',
+	id: 0,
+	sn: 0,
+	sex: '未知',
+	account: '',
+	nickname: '',
+	real_name: '',
+	avatar: '',
+	collect_count: 0,
+	coupon_count: 0,
+	create_time: '',
+	has_auth: false,
+	has_password: false,
+	member: 0,
+	mobile: '',
+	user_money: '0.00',
+	version: '',
 })
 const isLogin = ref<boolean>(false)
 
@@ -59,280 +42,280 @@ const sheetMenu = ref<{ name: string }[]>([])
 
 // 门店信息
 const storeInfo = ref({
-  douyin_uid: '236598984587',
-  address: '上海浦东新区新金桥路58号新银东大厦 15楼F室',
-  business_hours: '08:00-22:00',
-  contact_phone: '021-8888888',
+	douyin_uid: '236598984587',
+	address: '上海浦东新区新金桥路58号新银东大厦 15楼F室',
+	business_hours: '08:00-22:00',
+	contact_phone: '021-8888888',
 })
 
 // 门店媒体列表（视频/图片）
 const storeMediaList = ref([
-  { type: 'video', url: `${OSS}images/my/store_video_thumb.jpg`, overlay: null },
-  { type: 'image', url: `${OSS}images/my/store_image1.jpg`, overlay: null },
-  { type: 'image', url: `${OSS}images/my/store_image2.jpg`, overlay: null },
-  { type: 'image', url: `${OSS}images/my/store_image3.jpg`, overlay: null },
-  { type: 'image', url: `${OSS}images/my/store_image4.jpg`, overlay: null },
-  { type: 'image', url: `${OSS}images/my/store_image5.jpg`, overlay: 8 },
+	{ type: 'video', url: `${OSS}images/my/store_video_thumb.jpg`, overlay: null },
+	{ type: 'image', url: `${OSS}images/my/store_image1.jpg`, overlay: null },
+	{ type: 'image', url: `${OSS}images/my/store_image2.jpg`, overlay: null },
+	{ type: 'image', url: `${OSS}images/my/store_image3.jpg`, overlay: null },
+	{ type: 'image', url: `${OSS}images/my/store_image4.jpg`, overlay: null },
+	{ type: 'image', url: `${OSS}images/my/store_image5.jpg`, overlay: 8 },
 ])
 
 // 格式化账号显示（152****3412格式）
 function formatAccount(account: string) {
-  if (!account)
-    return ''
-  if (account.length <= 7)
-    return account
-  return `${account.substring(0, 3)}****${account.substring(account.length - 4)}`
+	if (!account)
+		return ''
+	if (account.length <= 7)
+		return account
+	return `${account.substring(0, 3)}****${account.substring(account.length - 4)}`
 }
 
 onShow(() => {
-  const userStore = useUserStore()
-  isLogin.value = userStore.isLoggedIn
-  console.log('🚀 ~ isLogin.value:', 1)
-  if (isLogin.value) {
-    console.log('🚀 ~ isLogin.value:', 3)
-    // 获取用户详情信息接口
-    getUserInfo().then((res) => {
-      user.value = res
-    })
-  }
-  else {
-    console.log('🚀 ~ isLogin.value:', 4)
-    Object.keys(user.value).forEach((key) => {
-      user.value[key] = ''
-    })
-  }
+	const userStore = useUserStore()
+	isLogin.value = userStore.isLoggedIn
+	console.log('🚀 ~ isLogin.value:', 1)
+	if (isLogin.value) {
+		console.log('🚀 ~ isLogin.value:', 3)
+		// 获取用户详情信息接口
+		getUserInfo().then((res) => {
+			user.value = res
+		})
+	}
+	else {
+		console.log('🚀 ~ isLogin.value:', 4)
+		Object.keys(user.value).forEach((key) => {
+			user.value[key] = ''
+		})
+	}
 })
 
 onLoad(() => {
-  uni.$on('clearUser', () => {
-    console.log('🚀 ~ isLogin.value:', 2)
+	uni.$on('clearUser', () => {
+		console.log('🚀 ~ isLogin.value:', 2)
 
-    const userStore = useUserStore()
-    isLogin.value = userStore.isLoggedIn
+		const userStore = useUserStore()
+		isLogin.value = userStore.isLoggedIn
 
-    Object.keys(user.value).forEach((key) => {
-      user.value[key] = ''
-    })
-  })
+		Object.keys(user.value).forEach((key) => {
+			user.value[key] = ''
+		})
+	})
 })
 
 onUnload(() => {
-  uni.$off('clearUser')
+	uni.$off('clearUser')
 })
 
 const My = {
-  // 跳转到个人信息
-  handleToProfile: () => {
-    if (!isLogin.value) {
-      router.navigateTo('/pages/my/profile')
-    }
-    else {
-      router.navigateTo('/pages/login/login')
-    }
-  },
+	// 跳转到个人信息
+	handleToProfile: () => {
+		if (!isLogin.value) {
+			router.navigateTo('/bundle/profile/profile')
+		}
+		else {
+			router.navigateTo('/pages/login/login')
+		}
+	},
 
-  // 点击显示客服电话
-  handleShowService: () => {
-    showServiceMobile.value = true
-    sheetMenu.value = [
-      { name: '400-800-8888' },
-    ]
-  },
+	// 点击显示客服电话
+	handleShowService: () => {
+		showServiceMobile.value = true
+		sheetMenu.value = [
+			{ name: '400-800-8888' },
+		]
+	},
 
-  // 选择菜单-拨打客服电话
-  handleSelectMenu: (item: any) => {
-    uni.makePhoneCall({
-      phoneNumber: item.item.name,
-    })
-  },
+	// 选择菜单-拨打客服电话
+	handleSelectMenu: (item: any) => {
+		uni.makePhoneCall({
+			phoneNumber: item.item.name,
+		})
+	},
 
-  // 跳转到设置页面
-  handleToSettings: () => {
-    // TODO: 跳转到设置页面
-    console.log('跳转到设置页面')
-  },
+	// 跳转到设置页面
+	handleToSettings: () => {
+		// TODO: 跳转到设置页面
+		console.log('跳转到设置页面')
+	},
 
-  // 编辑门店信息
-  handleEditStore: () => {
-    // TODO: 编辑门店信息
-    console.log('编辑门店信息')
-  },
+	// 编辑门店信息
+	handleEditStore: () => {
+		// TODO: 编辑门店信息
+		console.log('编辑门店信息')
+	},
 
-  // 预览媒体（视频/图片）
-  handlePreviewMedia: (index: number) => {
-    const item = storeMediaList.value[index]
-    if (item.type === 'video') {
-      // TODO: 播放视频
-      console.log('播放视频', item.url)
-    }
-    else {
-      // 预览图片
-      const urls = storeMediaList.value
-        .filter(i => i.type === 'image' && !i.overlay)
-        .map(i => i.url)
-      uni.previewImage({
-        current: index,
-        urls,
-      })
-    }
-  },
+	// 预览媒体（视频/图片）
+	handlePreviewMedia: (index: number) => {
+		const item = storeMediaList.value[index]
+		if (item.type === 'video') {
+			// TODO: 播放视频
+			console.log('播放视频', item.url)
+		}
+		else {
+			// 预览图片
+			const urls = storeMediaList.value
+				.filter(i => i.type === 'image' && !i.overlay)
+				.map(i => i.url)
+			uni.previewImage({
+				current: index,
+				urls,
+			})
+		}
+	},
 }
 </script>
 
 <template>
-  <view>
-    <view class="home-bg fixed left-0 top-0 w-[100%]" :style="{ backgroundImage: headerBg ? `url('${headerBg}')` : 'none' }">
-      <wd-navbar safe-area-inset-top :bordered="false" custom-style="background-color: transparent !important;">
-        <template #left>
-          <view class="ml-16rpx flex items-center" @click="My.handleToSettings" />
-        </template>
-        <template #right>
-          <view class="right-slot mr-16rpx flex">
-            <view class="mr-16rpx flex flex-col" @click="My.handleShowService">
-              <wd-icon name="setting" color="#fff" size="16px" />
-            </view>
-          </view>
-        </template>
-      </wd-navbar>
-    </view>
+	<view>
+		<view class="home-bg fixed left-0 top-0 w-[100%]"
+			:style="{ backgroundImage: `url('${OSS}images/store/my/image2.png')` }">
+			<wd-navbar safe-area-inset-top :bordered="false" custom-style="background-color: transparent !important;">
+				<template #left>
+					<view class="ml-16rpx flex items-center" @click="My.handleToSettings" />
+				</template>
+				<template #right>
+					<view class="right-slot mr-16rpx flex">
+						<view class="mr-16rpx flex flex-col" @click="My.handleShowService">
+							<wd-icon name="setting" color="#fff" size="16px" />
+						</view>
+					</view>
+				</template>
+			</wd-navbar>
+		</view>
 
-    <view class="pb-0rpx" :style="{ paddingTop: `${navbarHeight}px` }">
-      <!-- 账号昵称显示 -->
-      <view class="user-info-bg relative z-10 ml-30rpx mr-30rpx flex items-center" :style="{ backgroundImage: headerBg ? `url('${headerBg}')` : 'none' }">
-        <view class="relative z-10">
-          <wd-img width="120rpx" height="120rpx" :src="(isLogin && user.avatar) ? user.avatar : defaultAvatar" mode="aspectFill" round />
-        </view>
-        <view class="relative z-10 ml-22rpx flex flex-1 items-center justify-between">
-          <view class="flex-1" @click="My.handleToProfile">
-            <view class="ml-8rpx flex items-center text-36rpx leading-50rpx" style="color: #fff;">
-              {{ isLogin ? user.nickname : '立即登录' }}
-              <wd-icon v-if="isLogin" name="arrow-right" size="24rpx" color="#fff" class="ml-8rpx" />
-            </view>
-            <view v-if="isLogin" class="ml-8rpx mt-8rpx text-24rpx leading-34rpx" style="color: #fff;">
-              账号: {{ formatAccount(user.account || user.mobile) }}
-            </view>
-          </view>
-          <view class="relative ml-20rpx" @click="router.navigateTo('/bundle/wallet/wallet')">
-            <view class="h-148rpx w-300rpx">
-              <wd-img width="100%" height="100%" :src="`${OSS}images/my/my_image3.png`" mode="aspectFill" />
-            </view>
-            <view class="absolute bottom-12rpx left-24rpx">
-              <view class="flex items-center">
-                <view class="text-30rpx text-[#303133] font-bold leading-36rpx">
-                  ￥{{ isLogin ? user.user_money : '0.00' }}
-                </view>
-              </view>
-              <view class="ml-0rpx mt-4rpx text-20rpx text-[#909399] leading-28rpx">
-                钱包余额
-              </view>
-            </view>
-          </view>
-        </view>
-      </view>
+		<view class="pb-0rpx" :style="{ paddingTop: `${navbarHeight}px` }">
+			<!-- 账号昵称显示 -->
+			<view class="user-info-bg relative z-10 ml-30rpx mr-30rpx flex items-center"
+				:style="{ backgroundImage: `url('${OSS}images/store/my/image2.png')` }">
+				<view class="relative z-10">
+					<wd-img width="120rpx" height="120rpx" :src="(isLogin && user.avatar) ? user.avatar : `${OSS}images/store/my/image1.png`"
+						mode="aspectFill" round />
+				</view>
+				<view class="relative z-10 ml-22rpx flex flex-1 items-center justify-between">
+					<view class="flex-1" @click="My.handleToProfile">
+						<view class="ml-8rpx flex items-center text-36rpx leading-50rpx" style="color: #fff;">
+							{{ isLogin ? user.nickname : '立即登录' }}
+							<wd-icon v-if="isLogin" name="arrow-right" size="24rpx" color="#fff" class="ml-8rpx" />
+						</view>
+						<view v-if="isLogin" class="ml-8rpx mt-8rpx text-24rpx leading-34rpx" style="color: #fff;">
+							账号: {{ formatAccount(user.account || user.mobile) }}
+						</view>
+					</view>
+					<view class="relative ml-20rpx" @click="router.navigateTo('/bundle/wallet/wallet')">
+						<view class="h-148rpx w-300rpx">
+							<wd-img width="100%" height="100%" :src="`${OSS}images/my/my_image3.png`"
+								mode="aspectFill" />
+						</view>
+						<view class="absolute bottom-12rpx left-24rpx">
+							<view class="flex items-center">
+								<view class="text-30rpx text-[#303133] font-bold leading-36rpx">
+									￥{{ isLogin ? user.user_money : '0.00' }}
+								</view>
+							</view>
+							<view class="ml-0rpx mt-4rpx text-20rpx text-[#909399] leading-28rpx">
+								钱包余额
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
 
-      <!-- 门店信息区域 -->
-      <view class="store-info-card mt-28rpx bg-white py-30rpx pl-30rpx">
-        <view class="mb-24rpx text-32rpx text-[#303133] font-bold leading-44rpx">
-          门店茶址24小时智能茶室(中新店)地址
-        </view>
-        <view class="mb-16rpx flex items-center text-24rpx text-[#606266] leading-40rpx">
-          <text class="w-140rpx">抖音uid:</text>
-          <text class="flex-1 text-[#000]">{{ storeInfo.douyin_uid || '236598984587' }}</text>
-        </view>
-        <view class="mb-16rpx flex items-center text-24rpx text-[#606266] leading-40rpx">
-          <text class="w-140rpx">门店地址:</text>
-          <text class="flex-1 text-[#000]">{{ storeInfo.address || '上海浦东新区新金桥路58号新银东大厦 15楼F室' }}</text>
-        </view>
-        <view class="relative mb-16rpx flex items-center">
-          <view class="flex items-center text-24rpx text-[#606266] leading-40rpx">
-            <text class="w-140rpx">营业时间:</text>
-            <text class="flex-1 text-[#000]">{{ storeInfo.business_hours || '08:00-22:00' }}</text>
-          </view>
-          <view class="modify-btn absolute right-0 flex items-center px-20rpx py-8rpx" :style="{ backgroundImage: modifyBg ? `url('${modifyBg}')` : 'none' }" @click="My.handleEditStore">
-            <wd-img width="24rpx" height="24rpx" :src="editIcon" class="mr-8rpx" />
-            <text class="text-24rpx text-[#fff]">修改</text>
-          </view>
-        </view>
-        <view class="flex items-center text-24rpx text-[#606266] leading-40rpx">
-          <text class="w-140rpx">联系电话:</text>
-          <text class="flex-1 text-[#000]">{{ storeInfo.contact_phone || '021-8888888' }}</text>
-        </view>
-      </view>
+			<!-- 门店信息区域 -->
+			<view class="store-info-card mt-28rpx bg-white py-30rpx pl-30rpx">
+				<view class="mb-24rpx text-32rpx text-[#303133] font-bold leading-44rpx">
+					门店茶址24小时智能茶室(中新店)地址
+				</view>
+				<view class="mb-16rpx flex items-center text-24rpx text-[#606266] leading-40rpx">
+					<text class="w-140rpx">抖音uid:</text>
+					<text class="flex-1 text-[#000]">{{ storeInfo.douyin_uid || '236598984587' }}</text>
+				</view>
+				<view class="mb-16rpx flex items-center text-24rpx text-[#606266] leading-40rpx">
+					<text class="w-140rpx">门店地址:</text>
+					<text class="flex-1 text-[#000]">{{ storeInfo.address || '上海浦东新区新金桥路58号新银东大厦 15楼F室' }}</text>
+				</view>
+				<view class="relative mb-16rpx flex items-center">
+					<view class="flex items-center text-24rpx text-[#606266] leading-40rpx">
+						<text class="w-140rpx">营业时间:</text>
+						<text class="flex-1 text-[#000]">{{ storeInfo.business_hours || '08:00-22:00' }}</text>
+					</view>
+					<view class="modify-btn absolute right-0 flex items-center px-20rpx py-8rpx"
+						:style="{ backgroundImage: `url('${OSS}images/store/my/image3.png')` }"
+						@click="My.handleEditStore">
+						<wd-img width="24rpx" height="24rpx" :src="`${OSS}images/store/my/image4.png`" class="mr-8rpx" />
+						<text class="text-24rpx text-[#fff]">修改</text>
+					</view>
+				</view>
+				<view class="flex items-center text-24rpx text-[#606266] leading-40rpx">
+					<text class="w-140rpx">联系电话:</text>
+					<text class="flex-1 text-[#000]">{{ storeInfo.contact_phone || '021-8888888' }}</text>
+				</view>
+			</view>
 
-      <!-- 门店视频/图片区域 -->
-      <view class="bg-white px-30rpx">
-        <view class="mb-24rpx text-32rpx text-[#303133] font-bold leading-44rpx">
-          门店视频/图片
-        </view>
-        <view class="grid grid-cols-3 gap-16rpx">
-          <view
-            v-for="(item, index) in storeMediaList"
-            :key="index"
-            class="relative aspect-square w-full overflow-hidden rounded-8rpx"
-            @click="My.handlePreviewMedia(index)"
-          >
-            <wd-img
-              width="100%"
-              height="100%"
-              :src="item.url"
-              mode="aspectFill"
-            />
-            <!-- 视频播放图标 -->
-            <view v-if="item.type === 'video'" class="absolute inset-0 flex items-center justify-center">
-              <wd-img width="60rpx" height="60rpx" :src="playIcon" />
-            </view>
-            <!-- +8 遮罩 -->
-            <view v-if="item.overlay" class="absolute inset-0 flex items-center justify-center bg-black bg-opacity-50">
-              <text class="text-32rpx text-[#fff] font-bold">+{{ item.overlay }}</text>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
+			<!-- 门店视频/图片区域 -->
+			<view class="bg-white px-30rpx">
+				<view class="mb-24rpx text-32rpx text-[#303133] font-bold leading-44rpx">
+					门店视频/图片
+				</view>
+				<view class="grid grid-cols-3 gap-16rpx">
+					<view v-for="(item, index) in storeMediaList" :key="index"
+						class="relative aspect-square w-full overflow-hidden rounded-8rpx"
+						@click="My.handlePreviewMedia(index)">
+						<wd-img width="100%" height="100%" :src="item.url" mode="aspectFill" />
+						<!-- 视频播放图标 -->
+						<view v-if="item.type === 'video'" class="absolute inset-0 flex items-center justify-center">
+							<wd-img width="60rpx" height="60rpx" :src="`${OSS}images/store/my/image5.png')`" />
+						</view>
+						<!-- +8 遮罩 -->
+						<view v-if="item.overlay"
+							class="absolute inset-0 flex items-center justify-center bg-black bg-opacity-50">
+							<text class="text-32rpx text-[#fff] font-bold">+{{ item.overlay }}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
 
-    <!-- 客服电话 -->
-    <wd-action-sheet v-model="showServiceMobile" :actions="sheetMenu" cancel-text="取消" @close="showServiceMobile = false" @select="My.handleSelectMenu" />
-  </view>
+		<!-- 客服电话 -->
+		<wd-action-sheet v-model="showServiceMobile" :actions="sheetMenu" cancel-text="取消"
+			@close="showServiceMobile = false" @select="My.handleSelectMenu" />
+	</view>
 </template>
 
 <style lang="scss">
-	page {
-  background: #fff;
+page {
+	background: #fff;
 }
 
 .home-bg {
-  background-size: 100% 100%;
-  background-repeat: no-repeat;
-  background-position: top center;
-  min-height: 450rpx;
+	background-size: 100% 100%;
+	background-repeat: no-repeat;
+	background-position: top center;
+	min-height: 450rpx;
 }
 
 .user-info-bg {
-  background-size: 100% auto;
-  background-repeat: no-repeat;
-  background-position: top center;
-  padding-top: 20rpx;
-  padding-bottom: 20rpx;
-  min-height: 200rpx;
+	background-size: 100% auto;
+	background-repeat: no-repeat;
+	background-position: top center;
+	padding-top: 20rpx;
+	padding-bottom: 20rpx;
+	min-height: 200rpx;
 }
 
 .store-info-card {
-  position: relative;
-  z-index: 10;
-  border-radius: 32rpx 32rpx 0 0;
+	position: relative;
+	z-index: 10;
+	border-radius: 32rpx 32rpx 0 0;
 }
 
 .modify-btn {
-  position: absolute;
-  background-size: 100% 100%;
-  background-repeat: no-repeat;
-  background-position: center;
-  min-width: 160rpx;
-  height: 90rpx;
-  justify-content: space-around;
+	position: absolute;
+	background-size: 100% 100%;
+	background-repeat: no-repeat;
+	background-position: center;
+	min-width: 160rpx;
+	height: 90rpx;
+	justify-content: space-around;
 }
 
 .right-slot {
-  padding-right: v-bind(rightPadding);
+	padding-right: v-bind(rightPadding);
 }
 </style>
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 @@
-<route lang="jsonc" type="page">
-{
-  "layout": "default",
-  "style": {
-    "navigationStyle": "custom"
-  }
-}
-</route>
+<route lang="jsonc" type="page">{
+	"layout": "default",
+	"style": {
+		"navigationStyle": "custom"
+	}
+}</route>
 
 <script lang="ts" setup>
 import type { IUserResult } from '@/api/types/user'
@@ -13,340 +11,321 @@ import { updateUserInfo } from '@/api/user'
 import { toast } from '@/utils/toast'
 import { router } from '@/utils/tools'
 import { uploadFileUrl, useUpload } from '@/utils/uploadFile'
-import defaultAvatarImg from './img/头像.png'
 
 const OSS = inject('OSS')
 const navbarHeight = inject('navbarHeight')
 
-// 本地图片资源
-const defaultAvatar = defaultAvatarImg as string
-
 // 用户信息相关
 const user = ref<IUserResult>({
-  id: 0,
-  sn: 0,
-  sex: '未知',
-  account: '',
-  nickname: '',
-  real_name: '',
-  avatar: '',
-  collect_count: 0,
-  coupon_count: 0,
-  create_time: '',
-  has_auth: false,
-  has_password: false,
-  member: 0,
-  mobile: '',
-  user_money: '0.00',
-  version: '',
+	id: 0,
+	sn: 0,
+	sex: '未知',
+	account: '',
+	nickname: '',
+	real_name: '',
+	avatar: '',
+	collect_count: 0,
+	coupon_count: 0,
+	create_time: '',
+	has_auth: false,
+	has_password: false,
+	member: 0,
+	mobile: '',
+	user_money: '0.00',
+	version: '',
 })
 
 // Action Sheet 相关
 const showAvatarActionSheet = ref(false)
 const avatarActions = ref([
-  {
-    name: '拍照',
-    value: 'camera',
-  },
-  {
-    name: '从手机相册选择',
-    value: 'album',
-  },
+	{
+		name: '拍照',
+		value: 'camera',
+	},
+	{
+		name: '从手机相册选择',
+		value: 'album',
+	},
 ])
 
 // 编辑昵称相关
 const showEditNicknamePopup = ref(false)
 const nicknameInput = ref('')
 
+console.log(`${OSS}images/store/my/image1.png`)
 /**
  * 上传头像文件
  */
 function handleUploadAvatar(filePath: string) {
-  const { run: uploadFile } = useUpload<string>(
-    uploadFileUrl.USER_AVATAR,
-    {},
-    {
-      maxSize: 5,
-      onSuccess: async (res) => {
-        try {
-          const avatarUrl = typeof res === 'string' ? res : (res as any).uri || (res as any).url
-          await updateUserInfo({ field: 'avatar', value: avatarUrl })
-          user.value.avatar = avatarUrl
-          toast.info('头像上传成功')
-        }
-        catch (error) {
-          console.error('更新头像失败:', error)
-          toast.info('头像上传失败')
-        }
-      },
-      onError: (err) => {
-        console.error('上传失败:', err)
-        toast.info('头像上传失败')
-      },
-    },
-    filePath,
-  )
-  uploadFile()
+	const { run: uploadFile } = useUpload<string>(
+		uploadFileUrl.USER_AVATAR,
+		{},
+		{
+			maxSize: 5,
+			onSuccess: async (res) => {
+				try {
+					const avatarUrl = typeof res === 'string' ? res : (res as any).uri || (res as any).url
+					await updateUserInfo({ field: 'avatar', value: avatarUrl })
+					user.value.avatar = avatarUrl
+					toast.info('头像上传成功')
+				}
+				catch (error) {
+					console.error('更新头像失败:', error)
+					toast.info('头像上传失败')
+				}
+			},
+			onError: (err) => {
+				console.error('上传失败:', err)
+				toast.info('头像上传失败')
+			},
+		},
+		filePath,
+	)
+	uploadFile()
 }
 
 /**
  * 掩码处理手机号
  */
 const maskedMobile = computed(() => {
-  if (!user.value.mobile || user.value.mobile.length !== 11)
-    return '+86 155****5456'
-  // 只处理11位手机号
-  return `+86 ${user.value.mobile.replace(/^(\d{3})\d{4}(\d{4})$/, '$1****$2')}`
+	if (!user.value.mobile || user.value.mobile.length !== 11)
+		return '+86 155****5456'
+	// 只处理11位手机号
+	return `+86 ${user.value.mobile.replace(/^(\d{3})\d{4}(\d{4})$/, '$1****$2')}`
 })
 
 /**
  * 验证昵称是否有效（1-10字符，一个汉字为一个字符）
  */
 const isNicknameValid = computed(() => {
-  const trimmed = nicknameInput.value.trim()
-  return trimmed.length >= 1 && trimmed.length <= 10
+	const trimmed = nicknameInput.value.trim()
+	return trimmed.length >= 1 && trimmed.length <= 10
 })
 
 const Profile = {
-  /**
-   * 初始化用户信息
-   */
-  handleInit: () => {
-    // getUserInfo().then((res) => {
-    //   user.value = res
-    // })
-  },
+	/**
+	 * 初始化用户信息
+	 */
+	handleInit: () => {
+		// getUserInfo().then((res) => {
+		//   user.value = res
+		// })
+	},
 
-  /**
-   * 编辑头像 - 显示选择面板
-   */
-  handleEditAvatar: () => {
-    showAvatarActionSheet.value = true
-  },
+	/**
+	 * 编辑头像 - 显示选择面板
+	 */
+	handleEditAvatar: () => {
+		showAvatarActionSheet.value = true
+	},
 
-  /**
-   * 处理头像选择
-   */
-  handleSelectAvatarAction: (item: any) => {
-    showAvatarActionSheet.value = false
+	/**
+	 * 处理头像选择
+	 */
+	handleSelectAvatarAction: (item: any) => {
+		showAvatarActionSheet.value = false
 
-    if (item.value === 'camera') {
-      // 拍照
-      Profile.handleChooseImage(['camera'])
-    }
-    else if (item.value === 'album') {
-      // 从相册选择
-      Profile.handleChooseImage(['album'])
-    }
-  },
+		if (item.value === 'camera') {
+			// 拍照
+			Profile.handleChooseImage(['camera'])
+		}
+		else if (item.value === 'album') {
+			// 从相册选择
+			Profile.handleChooseImage(['album'])
+		}
+	},
 
-  /**
-   * 选择图片
-   */
-  handleChooseImage: (sourceType: ('camera' | 'album')[]) => {
-    // #ifdef MP-WEIXIN
-    uni.chooseMedia({
-      count: 1,
-      mediaType: ['image'],
-      sourceType,
-      success: (res) => {
-        const file = res.tempFiles[0]
-        if (file) {
-          handleUploadAvatar(file.tempFilePath)
-        }
-      },
-      fail: (err) => {
-        console.error('选择图片失败:', err)
-        if (err.errMsg && !err.errMsg.includes('cancel')) {
-          toast.info('选择图片失败')
-        }
-      },
-    })
-    // #endif
+	/**
+	 * 选择图片
+	 */
+	handleChooseImage: (sourceType: ('camera' | 'album')[]) => {
+		// #ifdef MP-WEIXIN
+		uni.chooseMedia({
+			count: 1,
+			mediaType: ['image'],
+			sourceType,
+			success: (res) => {
+				const file = res.tempFiles[0]
+				if (file) {
+					handleUploadAvatar(file.tempFilePath)
+				}
+			},
+			fail: (err) => {
+				console.error('选择图片失败:', err)
+				if (err.errMsg && !err.errMsg.includes('cancel')) {
+					toast.info('选择图片失败')
+				}
+			},
+		})
+		// #endif
 
-    // #ifndef MP-WEIXIN
-    uni.chooseImage({
-      count: 1,
-      sizeType: ['compressed'],
-      sourceType,
-      success: (res) => {
-        if (res.tempFilePaths && res.tempFilePaths.length > 0) {
-          handleUploadAvatar(res.tempFilePaths[0])
-        }
-      },
-      fail: (err) => {
-        console.error('选择图片失败:', err)
-        if (err.errMsg && !err.errMsg.includes('cancel')) {
-          toast.info('选择图片失败')
-        }
-      },
-    })
-    // #endif
-  },
+		// #ifndef MP-WEIXIN
+		uni.chooseImage({
+			count: 1,
+			sizeType: ['compressed'],
+			sourceType,
+			success: (res) => {
+				if (res.tempFilePaths && res.tempFilePaths.length > 0) {
+					handleUploadAvatar(res.tempFilePaths[0])
+				}
+			},
+			fail: (err) => {
+				console.error('选择图片失败:', err)
+				if (err.errMsg && !err.errMsg.includes('cancel')) {
+					toast.info('选择图片失败')
+				}
+			},
+		})
+		// #endif
+	},
 
-  /**
-   * 编辑昵称 - 显示弹窗
-   */
-  handleEditNickname: () => {
-    nicknameInput.value = user.value.nickname || ''
-    showEditNicknamePopup.value = true
-  },
+	/**
+	 * 编辑昵称 - 显示弹窗
+	 */
+	handleEditNickname: () => {
+		nicknameInput.value = user.value.nickname || ''
+		showEditNicknamePopup.value = true
+	},
 
-  /**
-   * 关闭编辑昵称弹窗
-   */
-  handleCloseEditNickname: () => {
-    showEditNicknamePopup.value = false
-    nicknameInput.value = ''
-  },
+	/**
+	 * 关闭编辑昵称弹窗
+	 */
+	handleCloseEditNickname: () => {
+		showEditNicknamePopup.value = false
+		nicknameInput.value = ''
+	},
 
-  /**
-   * 保存昵称
-   */
-  handleSaveNickname: async () => {
-    const trimmed = nicknameInput.value.trim()
-    if (!trimmed || trimmed.length < 1 || trimmed.length > 10) {
-      toast.info('昵称限制1-10字符')
-      return
-    }
+	/**
+	 * 保存昵称
+	 */
+	handleSaveNickname: async () => {
+		const trimmed = nicknameInput.value.trim()
+		if (!trimmed || trimmed.length < 1 || trimmed.length > 10) {
+			toast.info('昵称限制1-10字符')
+			return
+		}
 
-    try {
-      await updateUserInfo({ field: 'nickname', value: trimmed })
-      user.value.nickname = trimmed
-      showEditNicknamePopup.value = false
-      toast.info('昵称修改成功')
-    }
-    catch (error) {
-      console.error('更新昵称失败:', error)
-      toast.info('昵称修改失败')
-    }
-  },
+		try {
+			await updateUserInfo({ field: 'nickname', value: trimmed })
+			user.value.nickname = trimmed
+			showEditNicknamePopup.value = false
+			toast.info('昵称修改成功')
+		}
+		catch (error) {
+			console.error('更新昵称失败:', error)
+			toast.info('昵称修改失败')
+		}
+	},
 
-  /**
-   * 修改手机号
-   */
-  handleEditMobile: () => {
-    router.navigateTo('/pages/login/mobile?type=edit')
-  },
+	/**
+	 * 修改手机号
+	 */
+	handleEditMobile: () => {
+		router.navigateTo('/pages/login/mobile?type=edit')
+	},
 
-  /**
-   * 修改密码
-   */
-  handleEditPassword: () => {
-    // TODO: 实现修改密码功能
-    console.log('修改密码')
-  },
+	/**
+	 * 修改密码
+	 */
+	handleEditPassword: () => {
+		// TODO: 实现修改密码功能
+		console.log('修改密码')
+	},
 
-  /**
-   * 修改绑定用户
-   */
-  handleEditBoundUser: () => {
-    // TODO: 实现修改绑定用户功能
-    console.log('修改绑定用户')
-  },
+	/**
+	 * 修改绑定用户
+	 */
+	handleEditBoundUser: () => {
+		// TODO: 实现修改绑定用户功能
+		console.log('修改绑定用户')
+	},
 }
 
 onLoad(() => {
-  Profile.handleInit()
+	Profile.handleInit()
 })
 </script>
 
 <template>
-  <view>
-    <!-- 导航栏 -->
-    <view>
-      <navbar title="个人信息" custom-class="!bg-white">
-        <template #right />
-      </navbar>
-    </view>
+	<view>
+		<!-- 导航栏 -->
+		<view>
+			<navbar title="个人信息" custom-class="!bg-white">
+				<template #right />
+			</navbar>
+		</view>
 
-    <view class="mx-30rpx mt-20rpx">
-      <wd-cell-group>
-        <!-- 头像 -->
-        <wd-cell is-link title="头像" @click="Profile.handleEditAvatar">
-          <template #value>
-            <wd-img width="64rpx" height="64rpx" :src="(user.avatar && typeof user.avatar === 'string' && user.avatar.trim()) ? user.avatar : defaultAvatar" mode="aspectFill" round />
-          </template>
-        </wd-cell>
+		<view class="mx-30rpx mt-20rpx">
+			<wd-cell-group>
+				<!-- 头像 -->
+				<wd-cell is-link title="头像" @click="Profile.handleEditAvatar">
+					<template #value>
+						<wd-img width="64rpx" height="64rpx"
+							:src="(user.avatar && typeof user.avatar === 'string' && user.avatar.trim()) ? user.avatar : `${OSS}images/store/my/image1.png`"
+							mode="aspectFill" round />
+					</template>
+				</wd-cell>
 
-        <!-- 昵称 -->
-        <wd-cell is-link title="昵称" :value="(user.nickname || '昵称名字')" @click="Profile.handleEditNickname" />
+				<!-- 昵称 -->
+				<wd-cell is-link title="昵称" :value="(user.nickname || '昵称名字')" @click="Profile.handleEditNickname" />
 
-        <!-- 修改手机号 -->
-        <wd-cell is-link title="修改手机号" :value="maskedMobile" @click="Profile.handleEditMobile" />
+				<!-- 修改手机号 -->
+				<wd-cell is-link title="修改手机号" :value="maskedMobile" @click="Profile.handleEditMobile" />
 
-        <!-- 修改密码 -->
-        <wd-cell is-link title="修改密码" @click="Profile.handleEditPassword" />
+				<!-- 修改密码 -->
+				<wd-cell is-link title="修改密码" @click="Profile.handleEditPassword" />
 
-        <!-- 修改绑定用户 -->
-        <wd-cell is-link title="修改绑定用户" @click="Profile.handleEditBoundUser" />
-      </wd-cell-group>
-    </view>
+				<!-- 修改绑定用户 -->
+				<wd-cell is-link title="修改绑定用户" @click="Profile.handleEditBoundUser" />
+			</wd-cell-group>
+		</view>
 
-    <!-- 头像选择 Action Sheet -->
-    <wd-action-sheet
-      v-model="showAvatarActionSheet"
-      :actions="avatarActions"
-      cancel-text="取消"
-      @close="showAvatarActionSheet = false"
-      @select="Profile.handleSelectAvatarAction"
-    />
+		<!-- 头像选择 Action Sheet -->
+		<wd-action-sheet v-model="showAvatarActionSheet" :actions="avatarActions" cancel-text="取消"
+			@close="showAvatarActionSheet = false" @select="Profile.handleSelectAvatarAction" />
 
-    <!-- 编辑昵称弹窗 -->
-    <wd-popup
-      v-model="showEditNicknamePopup"
-      lock-scroll
-      custom-style="border-radius: 32rpx 32rpx 0rpx 0rpx;"
-      position="bottom"
-      @close="Profile.handleCloseEditNickname"
-    >
-      <view class="relative bg-white px-30rpx pb-78rpx pt-50rpx">
-        <!-- 关闭按钮 -->
-        <view class="absolute right-30rpx top-18rpx" @click="Profile.handleCloseEditNickname">
-          <wd-icon name="close" size="20px" color="#C0C4CC" />
-        </view>
+		<!-- 编辑昵称弹窗 -->
+		<wd-popup v-model="showEditNicknamePopup" lock-scroll custom-style="border-radius: 32rpx 32rpx 0rpx 0rpx;"
+			position="bottom" @close="Profile.handleCloseEditNickname">
+			<view class="relative bg-white px-30rpx pb-78rpx pt-50rpx">
+				<!-- 关闭按钮 -->
+				<view class="absolute right-30rpx top-18rpx" @click="Profile.handleCloseEditNickname">
+					<wd-icon name="close" size="20px" color="#C0C4CC" />
+				</view>
 
-        <!-- 标题 -->
-        <view class="mb-40rpx text-center text-36rpx text-[#121212] leading-50rpx">
-          修改昵称
-        </view>
+				<!-- 标题 -->
+				<view class="mb-40rpx text-center text-36rpx text-[#121212] leading-50rpx">
+					修改昵称
+				</view>
 
-        <!-- 输入框 -->
-        <view class="mb-20rpx">
-          <view class="mb-20rpx text-30rpx text-[#303133] leading-44rpx">
-            昵称:
-          </view>
-          <wd-input
-            v-model="nicknameInput"
-            type="text"
-            placeholder="请输入昵称"
-            no-border
-            custom-class="!bg-[#F6F7F8] !border !border-solid !border-[#EAECF0] !rounded-16rpx"
-            custom-input-class="!px-32rpx !h-104rpx"
-            :maxlength="10"
-          />
-        </view>
+				<!-- 输入框 -->
+				<view class="mb-20rpx">
+					<view class="mb-20rpx text-30rpx text-[#303133] leading-44rpx">
+						昵称:
+					</view>
+					<wd-input v-model="nicknameInput" type="text" placeholder="请输入昵称" no-border
+						custom-class="!bg-[#F6F7F8] !border !border-solid !border-[#EAECF0] !rounded-16rpx"
+						custom-input-class="!px-32rpx !h-104rpx" :maxlength="10" />
+				</view>
 
-        <!-- 提示文字 -->
-        <view class="mb-40rpx text-24rpx text-[#606266] leading-34rpx">
-          昵称限制1-10字符,一个汉字为一个字符
-        </view>
+				<!-- 提示文字 -->
+				<view class="mb-40rpx text-24rpx text-[#606266] leading-34rpx">
+					昵称限制1-10字符,一个汉字为一个字符
+				</view>
 
-        <!-- 保存按钮 -->
-        <view
-          class="h-90rpx rounded-8rpx bg-[#4C9F44] text-center text-[#fff] leading-90rpx"
-          :class="{ 'opacity-40': !isNicknameValid }"
-          @click="isNicknameValid && Profile.handleSaveNickname()"
-        >
-          保存
-        </view>
-      </view>
-    </wd-popup>
-  </view>
+				<!-- 保存按钮 -->
+				<view class="h-90rpx rounded-8rpx bg-[#4C9F44] text-center text-[#fff] leading-90rpx"
+					:class="{ 'opacity-40': !isNicknameValid }"
+					@click="isNicknameValid && Profile.handleSaveNickname()">
+					保存
+				</view>
+			</view>
+		</wd-popup>
+	</view>
 </template>
 
 <style lang="scss">
 page {
-  background: #f6f7f8;
+	background: #f6f7f8;
 }
 </style>
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 @@
+<route lang="jsonc" type="page">
+{
+    "needLogin": true,
+    "layout": "default",
+    "style": {
+		"navigationStyle": "custom"
+    }
+}
+</route>
+
+<template>
+    <view class="pb-254rpx">
+        <!-- 一键续订 -->
+        <!-- <wd-popup v-model="showRenewPopup" lock-scroll custom-style="border-radius: 32rpx 32rpx 0rpx 0rpx;" position="bottom">
+            <view class="relative pb-26rpx">
+                <view class="absolute top-18rpx right-30rpx" @click="showRenewPopup = false">
+                    <wd-img width="60rpx" height='60rpx' :src="`${OSS}icon/icon_close.png`"></wd-img>
+                </view>
+                <view class="text-36rpx text-[#121212] leading-50rpx text-center pt-50rpx pb-40rpx">续订包间</view>
+                <view>
+                    <view class="mx-60rpx">
+                        <view class="text-[#01000D] text-32rpx leading-44rpx">续订时间</view>
+                        <view class="grid grid-cols-4 gap-x-20rpx gap-y-20rpx mt-28rpx">
+                            <view v-for="item in timeList" :key="item.time"
+                                class="h-72rpx rounded-16rpx flex items-center justify-center text-28rpx leading-40rpx"
+                                :class="[item.id == selectedRenewTime ? 'bg-[#4C9F44] text-[#fff]' : 'bg-[#F7F7F7] text-[#606266]']" 
+                                @click="selectedRenewTime = item.id">
+                                {{ item.time }}
+                            </view>
+                        </view>
+                    </view>
+
+                    <view class="mx-60rpx mt-60rpx">
+                        <view class="text-[#01000D] text-32rpx leading-44rpx">支付方式</view>
+                        <view class="mt-28rpx">
+                            <wd-radio-group v-model="pay" shape="dot" checked-color="#4C9F44">
+                                <view class="flex justify-between items-center mb-40rpx" v-for="(item, index) in payList" :key="index" @click="pay = item.id">
+                                    <view class="flex items-center">
+                                        <wd-img width="50rpx" height="50rpx" :src="item.icon"></wd-img>
+                                        <view class="ml-20rpx text-30rpx text-[#303133] leading-42rpx">{{ item.name }}</view>
+                                    </view>
+                                    <view class="flex items-center">
+                                        <wd-radio :value="item.value">
+                                            <view class="text-[#303133] text-26rpx leading-36rpx mr-20rpx" v-if="item.id == 1">可用202.22</view>
+                                        </wd-radio>
+                                    </view>
+                                </view>
+                            </wd-radio-group>
+                        </view>
+                    </view>
+
+                    <view class="mt-102rpx">
+                        <wd-gap height="2rpx" bg-color="#EFF0F2"></wd-gap>
+                    </view>
+
+                    <view class="flex justify-between items-center mt-50rpx mx-60rpx">
+                        <view class="flex items-center">
+                            <view class="text-24rpx text-[#303133] leading-34rpx">合计：</view>
+                            <view class="flex items-center h-56rpx mr-16rpx">
+                                <price-format color="#FF5951" :first-size="40" :second-size="40" :subscript-size="28" :price="23.02"></price-format>
+                                <view class="ml-20rpx">
+                                    <price-format color="#909399" :first-size="26" :second-size="26" :subscript-size="26" :price="23.02" lineThrough></price-format>
+                                </view>
+                            </view>
+                        </view>
+                        <view>
+                            <wd-button custom-class='!bg-[#4C9F44] !rounded-8rpx !h-70rpx'>立即预定</wd-button>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </wd-popup> -->
+        <wd-popup v-model="showRenewPopup" lock-scroll custom-style="border-radius: 32rpx 32rpx 0rpx 0rpx;" position="bottom">
+            <view class="relative pb-26rpx">
+                <view class="absolute top-18rpx right-30rpx" @click="showRenewPopup = false; ">
+                    <wd-img width="60rpx" height='60rpx' :src="`${OSS}icon/icon_close.png`"></wd-img>
+                </view>
+                <view class="text-36rpx text-[#121212] leading-50rpx text-center pt-50rpx pb-40rpx">续订包间</view>
+                <!-- 预定时间 -->
+                <view class="bg-white rounded-16rpx py-26rpx px-30rpx mt-24rpx mx-30rpx" @click="showBookTimePopup = true;">
+                    <view class="text-[#303133] text-32rpx leading-44rpx font-bold mb-24rpx">预定时间</view>
+                    <view class="flex items-center justify-between">
+                        <view class="text-[26rpx] text-[#606266] leading-36rpx">{{ sevenDay.minimum_time }}小时起订</view>
+                        <view class="flex items-center">
+                            <view class="text-[28rpx] text-[#909399] leading-40rpx w-430rpx line-1 text-right">
+                                <template v-if="reserveTime.length > 0">
+                                    {{ reserveTime[0] }} {{  reserveTime[1].join(',')  }}
+                                </template>
+                                <template v-else>
+                                    请选择
+                                </template> 
+                            </view>
+                            <view>
+                                <wd-icon name="chevron-right" size="32rpx" color="#909399"></wd-icon>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+
+                <view class="mt-102rpx">
+                    <wd-gap height="2rpx" bg-color="#EFF0F2"></wd-gap>
+                </view>
+
+                <view class="flex justify-between items-center mt-50rpx mx-60rpx">
+                    <view class="flex items-center">
+                        <view class="text-24rpx text-[#303133] leading-34rpx">合计：</view>
+                        <view class="flex items-center h-56rpx mr-16rpx">
+                            <price-format color="#FF5951" :first-size="40" :second-size="40" :subscript-size="28" :price="totalReserveMoney"></price-format>
+                            <!-- <view class="ml-20rpx">
+                                <price-format color="#909399" :first-size="26" :second-size="26" :subscript-size="26" :price="23.02" lineThrough></price-format>
+                            </view> -->
+                        </view>
+                    </view>
+                    <view>
+                        <wd-button custom-class='!bg-[#4C9F44] !rounded-8rpx !h-70rpx' @click="OrderDetail.handleRenewReserve">立即预定</wd-button>
+                    </view>
+                </view>
+            </view>
+        </wd-popup>
+
+        <!-- 续订成功 -->
+        <wd-popup v-model="showRenewSuccessPopup" lock-scroll custom-style="border-radius: 32rpx 32rpx 0rpx 0rpx;" position="bottom">
+            <view class="relative pt-64rpx pb-74rpx">
+                <view class="flex justify-center items-center">
+                    <view class="bg-[#4C9F44] w-280rpx rounded-280rpx">
+                        <wd-img width="280rpx" height="280rpx" :src="`${OSS}images/reserve_room/reserve_room_image7.png`"/>
+                    </view>
+                </view>
+                <view class="text-[#303133] text-36rpx leading-46rpx text-center mt-48rpx">包间续订成功</view>
+                <view class="text-[#9CA3AF] text-28rpx leading-44rpx mt-16rpx text-center">可以刷新页面查看预约时间</view>
+                <view class="w-630rpx h-90rpx leading-90rpx text-center bg-[#4C9F44] rounded-8rpx text-[#fff] mt-174rpx mx-auto" @click="showRenewSuccessPopup = false">好的</view>
+            </view>
+        </wd-popup>
+
+        <!-- 取消订单 -->
+        <wd-message-box selector="wd-message-box-slot"></wd-message-box>
+
+        <!-- 费用详情 -->
+        <wd-popup v-model="showCostPopup" lock-scroll custom-style="border-radius: 32rpx 32rpx 0rpx 0rpx;" position="bottom">
+            <view class="relative pb-30rpx">
+                <view class="absolute top-18rpx right-30rpx" @click="showCostPopup = false">
+                    <wd-img width="60rpx" height='60rpx' :src="`${OSS}icon/icon_close.png`"></wd-img>
+                </view>
+                <view class="text-36rpx text-[#121212] leading-50rpx text-center pt-50rpx pb-40rpx">费用明细</view>
+                <view class="collapse">
+                    <view class="px-30rpx">
+                        <view class="flex justify-between items-center">
+                            <view class="font-bold text-30rpx leading-42rpx text-[#303133]">茶室费</view>
+                            <view class="font-bold text-30rpx leading-42rpx text-[#303133] flex items-center">
+                                ￥640.00
+                            </view>
+                        </view>
+                        <view class="rounded-16rpx py-20rpx">
+                            <view class="mb-26rpx">
+                                <view class="font-400 text-28rpx leading-40rpx text-[#303133] flex items-center justify-between mb-16rpx">
+                                    <view>茶室费（￥160元/小时）</view>
+                                    <view>x4</view>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+
+                    <view class="px-30rpx">
+                        <view class="flex justify-between items-center">
+                            <view class="font-bold text-30rpx leading-42rpx text-[#303133]">优惠</view>
+                            <view class="font-bold text-30rpx leading-42rpx text-[#303133] flex items-center text-[#4C9F44]">
+                                -￥148.00
+                            </view>
+                        </view>
+                        <view class="rounded-16rpx pt-20rpx">
+                            <view class="font-400 text-28rpx leading-40rpx text-[#303133] flex items-center justify-between mb-16rpx">
+                                <view>优惠券</view>
+                                <view>-￥20</view>
+                            </view>
+
+                            <view class="font-400 text-28rpx leading-40rpx text-[#303133] flex items-center justify-between mb-16rpx">
+                                <view>会员八折</view>
+                                <view>-￥20</view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+                <view class="mx-60rpx mt-30rpx">
+                    <wd-gap height="2rpx" bg-color="#F6F7F9"></wd-gap>
+                </view>
+                <view class="mx-60rpx text-30rpx text-[#303133] leading-42rpx flex items-center justify-between mt-30rpx">
+                    <view>实际退款</view>
+                    <view>￥698.90</view>
+                </view>
+            </view>
+        </wd-popup>
+
+        <!-- 选择预定时间 -->
+        <booking-time v-model="showBookTimePopup" :day="sevenDay" @selectedTime="OrderDetail.handleChooseReserveTime"></booking-time>
+
+        <view>
+            <navbar :title="title" custom-class='!bg-[#F6F7F8]'></navbar>
+        </view>
+
+        <view class="mx-30rpx coupon-bg" >
+            <view class="flex items-center px-30rpx pt-30rpx pb-40rpx">
+                <view class="mr-30rpx">
+                    <wd-img width="190rpx" height="190rpx" :src="order.room_msg.img" mode="scaleToFill"></wd-img>
+                </view>
+                <view class="flex-1">
+                    <view class="flex justify-between items-center" @click="OrderDetail.handleToStore">
+                        <view class="flex items-center font-bold text-30rpx leading-42rpx text-[#303133] mr-10rpx">
+                            <view class="line-1 w-300rpx">
+                                {{ order.room_msg.title }}
+                            </view>
+                        </view>
+                        <view class="text-26rpx leading-36rpx text-[#909399]">￥{{ order.room_all_price }}</view>
+                    </view>
+                    <view class="flex justify-between items-center text-26rpx leading-36rpx text-[#909399] mt-18rpx">
+                        ￥{{ order.room_price }}/小时
+                    </view>
+                </view>
+            </view>
+
+            <view class="mt-28rpx pb-36rpx">
+                <view class="text-30rpx leading-42rpx text-[#303133] px-30rpx">预约信息</view>
+                <view class="font-500 text-26rpx leading-48rpx text-[#606266] mt-20rpx">
+                    <view class="mb-20rpx px-30rpx">预约时间：{{ order.day_time }}  {{ order.renew_dtime.start_time || order.start_time }}-{{ order.renew_dtime.end_time || order.end_time }}</view>
+                    <view class="flex justify-between items-center pl-30rpx" >  
+                        <view>预约时长：{{ order.hours }}小时</view>
+                    </view>
+                </view>
+            </view>
+        </view>
+
+        <!-- 订单信息 -->
+        <view class="bg-white rounded-16rpx px-30rpx py-34rpx mx-30rpx mt-20rpx">
+            <view class="text-[#303133] text-32rpx leading-44rpx">订单信息</view>
+            <view class="text-28rpx leading-40rpx text-[#606266] flex items-center justify-between mt-22rpx">
+                <view>订单编号</view>
+                <view>
+                    <text>{{ order.order_sn }}</text>
+                    <wd-divider vertical />
+                    <text class="text-[#4C9F44]" @click="copy(order.order_sn)">复制</text>
+                </view>
+            </view>
+            <view class="text-28rpx leading-40rpx text-[#606266] flex items-center justify-between mt-22rpx">
+                <view>创建时间</view>
+                <view>{{ order.dtime }}</view>
+            </view>
+            <view class="text-28rpx leading-40rpx text-[#606266] flex items-center justify-between mt-22rpx">
+                <view>支付方式</view>
+                <view>管理员添加</view>
+            </view>
+            <view class="text-28rpx leading-40rpx text-[#606266] flex items-center justify-between mt-22rpx">
+                <view>用户手机号</view>
+                <view>1110</view>
+            </view>
+            <view class="my-22rpx">
+                <wd-gap height="2rpx" bg-color='#F6F7F9'></wd-gap>
+            </view>
+            <view class="text-28rpx leading-40rpx text-[#606266] flex items-center justify-between mt-22rpx">
+                <view>续单时长</view>
+                <view>{{ order.update_dtime }}</view>
+            </view>            
+            <view class="text-28rpx leading-40rpx text-[#606266] flex items-center justify-between mt-22rpx">
+                <view>续单费用</view>
+                <view>{{ order.update_dtime }}</view>
+            </view>
+        </view>
+
+        <!-- 操作按钮 -->
+        <view class="w-full fixed bottom-0 left-0 right-0 bg-white h-152rpx">
+            <!-- 待使用 -->
+            <view class="flex items-center justify-between mx-58rpx mt-34rpx" v-if="orderStatus == AdminOrderStatus.ToUse || orderStatus == AdminOrderStatus.Consuming">
+                <view class="flex items-center">
+                    <view class="text-28rpx leading-40rpx text-[#606266] mr-16rpx" @click="OrderDetail.handleCancelOrder">取消订单</view>
+                </view>
+                <view class="w-360rpx h-90rpx leading-90rpx text-center bg-[#4C9F44] rounded-8rpx text-[#fff]" @click="OrderDetail.handleToPay">释放时间</view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script lang="ts" setup>
+    import { TeaRoomOrderStatusTextValue, TeaRoomOrderStatus, AdminOrderStatus } from '@/utils/order'
+    import { useMessage } from 'wot-design-uni'
+    import {toast} from '@/utils/toast'
+    import { getTeaRoomOrderDetail } from '@/api/tea-room'
+    import { handleTRCancelOrderHooks, handleTRToPayHooks, handleToTRStoreHooks } from '@/hooks/useOrder'
+    import type { ITeaSpecialistOrderDetailsResult } from '@/api/types/tea'
+    import { router } from '@/utils/tools'
+    import { ReserveServiceCategory, OrderType } from '@/utils/order'
+    import type { ITeaSpecialistFuture7DaysResult } from '@/api/types/tea'
+    import { getNext7Days, renewTeaRoomOrder } from '@/api/tea-room'
+    import { toTimes, copy } from '@/utils/tools'
+
+	const OSS = inject('OSS')
+    const title = ref<string>('')
+    const orderStatus = ref<number>(0) // 订单状态：待使用、退款等
+
+    // 续订包间
+    const showRenewPopup = ref<boolean>(false)
+    const timeList = [
+        {id: 1, time: '1小时'},
+        {id: 2, time: '2小时'},
+        {id: 3, time: '3小时'},
+        {id: 4, time: '4小时'},
+        {id: 5, time: '5小时'},
+        {id: 6, time: '6小时'},
+    ]
+    const selectedRenewTime = ref<number>(0) // 选择的续订时间
+    const pay = ref<number>(1) // 支付方式
+    const payList = ref<Array<any>>([
+        {
+            id: 1,
+            name: '平台余额',
+            icon: `${OSS}icon/icon_platform_balance.png`,
+            balance: 0,
+            value: 1
+        },
+        {
+            id: 3,
+            name: '微信支付',
+            icon: `${OSS}icon/icon_weichat.png`,
+            balance: 0,
+            value: 3
+        }
+    ])
+
+    const showRenewSuccessPopup = ref<boolean>(false)
+
+    // 选择预定时间
+    const showBookTimePopup = ref<boolean>(false)
+    const sevenDay = reactive<ITeaSpecialistFuture7DaysResult>({
+        minimum_time: 0,
+        time: []
+    })
+    const reserveTime = ref<Array<any>>([])
+
+    // 订单倒计时取消
+    const time = ref<number>(30 * 60 * 60 * 1000)
+
+    // 取消订单弹窗
+    const message = useMessage('wd-message-box-slot')
+
+    // 费用明细
+    const showCostPopup = ref<boolean>(false) // 是否显示退款详情弹出框
+
+    // 订单
+    const orderId = ref<number>(0)
+    const order = ref<ITeaSpecialistOrderDetailsResult>({
+        order_amount: '',
+        order_sn: '',
+        store_id: 0,
+        room_msg: {
+            id: 0,
+            price: 0,
+            img: '',
+            title: '',
+        },
+        store_msg: {
+            id: 0,
+            address: '',
+            name: '',
+            operation_type: 1,
+            image: '',
+            latitude: '',
+            longitude: '',
+            contact_phone: ''
+        },
+        time1: 0,
+        order_status: 0,
+        room_all_price: 0,
+        room_price: 0,
+        day_time: '',
+        start_time: '',
+        end_time: '',
+        hours: 0,
+        distance: 0,
+        pay_way: 0,
+        pay_way_title: '',
+        dtime: '',
+        update_dtime: '',
+        renew_price: 0,
+        renew_dtime: {
+            start_time: '',
+            end_time: '',
+            renew_price: 0
+        }
+    })
+
+    // 一键续订的金额
+    const totalReserveMoney = ref<number>(0)
+
+    onLoad(async (args) => {
+        orderId.value = args.orderId
+        // 获取订单详情
+        OrderDetail.handleInit()
+
+        // 预定时间
+        const next7 = await getNext7Days()
+        Object.assign(sevenDay, next7)
+    })
+
+    onUnload(() => {
+        uni.$off('refreshOrderDetail')
+    })
+
+    onShareAppMessage(async (e) => {
+        if (e.from === 'button') {
+            return {
+                title: `我在${order.value.store_msg.name}预定了${order.value.room_msg.title}，一起来吧！`,
+                path: `/pages/share/tea-room/share-order-detail?orderId=${orderId.value}`,
+            }
+        }
+    })
+
+    const OrderDetail = {
+        /**
+         * 获取订单详情
+         */
+        handleInit: async () => {
+            const res = await getTeaRoomOrderDetail({
+                id: orderId.value,
+                latitude: uni.getStorageSync('latitude'), 
+                longitude: uni.getStorageSync('longitude')
+            })
+            order.value = res.details
+            console.log("🚀 ~ order.value :", order.value )
+            title.value = TeaRoomOrderStatusTextValue[order.value.order_status].title || '订单详情'
+            orderStatus.value = order.value.order_status
+        },
+
+        /**
+         * 支付订单
+         */
+        handleToPay: () => {
+            uni.$on('refreshOrderDetail', () => {
+                OrderDetail.handleInit()
+                uni.$off('refreshOrderDetail')
+            })
+
+            handleTRToPayHooks(orderId.value, order.value.store_msg.name, order.value.store_msg.id)
+        },
+
+        /**
+         * 获取订单详情
+         */
+        handleCancelOrder: () => {
+            message.confirm({
+                title: '确定取消订单？',
+                msg: '取消订单后无法恢复，优惠券可退回',
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                cancelButtonProps: {
+                    customClass: '!bg-[#F6F7F8] !text-[#303133] !text-32rpx !leading-44rpx !rounded-8rpx',
+                },
+                confirmButtonProps: {
+                    customClass: '!bg-[#4C9F44] !text-[#fff] !text-32rpx !leading-44rpx !rounded-8rpx',
+                }
+            }).then((res) => {
+               if (res.action == 'confirm') {
+                    // 点击确认按钮回调事件
+                    uni.$on('refreshOrderDetail', () => {
+                        OrderDetail.handleInit()
+                        uni.$off('refreshOrderDetail')
+                    })
+
+                    handleTRCancelOrderHooks(orderId.value)
+                }
+                toast.info('订单取消成功')
+            }).catch(() => {
+                // 点击取消按钮回调事件
+            })
+        },
+
+        /**
+         * 再次预定
+         */
+        handleAgainReserve: () => {
+            router.navigateTo(
+                `/bundle/tea-room/detail?storeId=${order.value.store_msg.id}&roomId=${order.value.room_msg.id}&type=${ReserveServiceCategory.ReserveRoom}&price=${order.value.room_msg.price}`
+            )
+        },
+
+        /**
+         * 选中预定时间
+         */
+        handleChooseReserveTime: (params: any) => {
+            reserveTime.value = params
+
+            // 一键续订的金额
+            totalReserveMoney.value = Number(toTimes(params[3], order.value.room_price))
+        },
+        
+        /**
+         * 确认一键续订
+         */
+        handleRenewReserve: async () => {
+            uni.showLoading({ title: '加载中...' })
+
+            try {
+                await renewTeaRoomOrder({
+                    id: orderId.value,
+                    start_time: reserveTime.value[2][0],
+                    end_time: reserveTime.value[2][reserveTime.value[2].length - 1],
+                    renew_hour: reserveTime.value[3],
+                })
+
+                uni.$on('payment', params => {
+                    uni.$off("payment")
+                    if (params.result) {
+                        OrderDetail.handleInit()
+                        showRenewSuccessPopup.value = true
+                    } else {
+                        message.alert({
+                            title: '提示',
+                            msg: '您已取消续订',
+                            confirmButtonText: '确定',
+                            confirmButtonProps: {
+                                customClass: '!bg-[#4C9F44] !text-[#fff] !text-32rpx !leading-44rpx !rounded-8rpx',
+                            }
+                        })
+                    }
+                })
+
+                uni.hideLoading()
+                showRenewPopup.value = false
+
+                router.navigateTo(
+                    `/pages/cashier/cashier?from=${OrderType.TeaRoomOrder}&renew=renewTeaRoomOrder&orderId=${orderId.value}&teaRoomName=${order.value.store_msg.name}&storeId=${order.value.store_msg.id}`
+                )
+            } catch (err) {
+                uni.hideLoading()
+                toast.info('续订失败')
+                return false
+            }
+        },
+
+        /**
+         * 跳转到对对应室的详情页
+         */
+        handleToStore: () => {
+            handleToTRStoreHooks(order.value.store_id, order.value.store_msg.operation_type)
+        },
+
+        /**
+         * 处理导航逻辑
+         */
+        handleLocation: () => {
+            uni.openLocation({
+                latitude: Number(order.value.store_msg.latitude),
+                longitude: Number(order.value.store_msg.longitude),
+                name: order.value.store_msg.name,
+                address: order.value.store_msg.address,
+                scale: 18
+            })
+        },
+
+        /**
+         * 处理拨打电话逻辑
+         */
+        handleCallPhone: () => {
+            uni.makePhoneCall({
+                phoneNumber: order.value.store_msg.contact_phone
+            })
+        },
+
+    }
+</script>
+
+
+<style lang="scss">
+    page {
+	    background-color: $cz-page-background;
+    }
+
+    .coupon-bg {
+        background-image: url(#{$OSS}images/order/order_image2.png);
+        background-repeat: no-repeat;
+        background-size: 100% 100%;
+    }
+
+    .collapse {
+        :deep() {
+            .wd-collapse-item::after,
+            .wd-collapse-item__header.is-expanded::after {
+                background: none !important;
+            }
+
+            .wd-collapse-item__body  {
+                padding-top: 0 !important;
+                padding-bottom: 0 !important;
+            }
+        }
+    }
+</style>
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 @@
+<!-- 使用 type="home" 属性设置首页，其他页面不需要设置，默认为page -->
+<route lang="jsonc">{
+	"layout": "tabbar",
+	"style": {
+		// 'custom' 表示开启自定义导航栏，默认 'default'
+		"navigationStyle": "custom",
+		"navigationBarTitleText": "首页"
+	}
+}</route>
+
+<template>
+    <view class="">
+        <view class="order-list sticky top-0 left-0 z-50 bg-[#F6F7F8] pb-10rpx">
+            <wd-navbar safeAreaInsetTop custom-class='!bg-[#F6F7F8]' :bordered="false" placeholder>
+                <template #left>
+                    <!-- <view class="search-box">
+                        <wd-search v-model="keywords" hide-cancel placeholder-left light placeholder="搜索订单信息"></wd-search>
+                    </view> -->
+                    <view class="search-box flex items-center ml-26rpx" @click="Order.handleToSearch">
+                        <wd-search placeholder="搜索茶址名称" hide-cancel disabled :placeholder-left="true"
+                            placeholderStyle="text-align:left;padding-left: 24rpx;line-heigt: 44rpx;color: #C9C9C9; font-size: 32rpx;font-weight: normal;">
+                        </wd-search>
+                    </view>
+                </template>
+            </wd-navbar>
+            <view class="tabs">
+                <wd-tabs v-model="tab" swipeable slidable="always" :lazy="false" @click="Order.handleChangeTabs">
+                    <wd-tab title="全部" :name="AdminOrderStatusText.All"></wd-tab>
+                    <wd-tab title="待使用" :name="AdminOrderStatusText.ToUse"></wd-tab>
+                    <wd-tab title="使用中" :name="AdminOrderStatusText.Consuming"></wd-tab>
+                    <wd-tab title="已完成" :name="AdminOrderStatusText.Finished"></wd-tab>
+                </wd-tabs>
+            </view>
+        </view>
+
+         <view class="tabs mt-18rpx mx-30rpx">
+            <mescroll-body ref="mescrollItem0" @init="mescrollInit" @down="downCallback" @up="Order.upCallback" :down="downOption" :up="upOption">
+                <view class="mb-20rpx" v-for="(item, index) in list" :key="index">
+                    <combo-card :type="OrderSource.Admin" :order="item"></combo-card>
+                </view>
+            </mescroll-body>
+        </view>
+    </view>
+</template>
+
+<script lang="ts" setup>
+    import { getTeaSpecialistOrderList } from '@/api/teaSpecialist-order'
+    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 { OrderSource,  AdminOrderStatusText, TeaSpecialistOrderStatusText, TeaSpecialistOrderStatusValue } from '@/utils/order'
+    import { router } from '@/utils/tools'
+
+    /* mescroll */
+	const { mescrollInit, downCallback, getMescroll } = useMescroll(onPageScroll, onReachBottom) // 调用mescroll的hook
+    const downOption = {
+		auto: true
+	}
+	const upOption = {
+		auto: true,
+		textNoMore: '~ 已经到底啦 ~', //无更多数据的提示
+	}
+	const list = ref<Array<any>>([]) // 茶艺师列表
+    const keywords = ref<string>('')
+    const orderStatus = ref<string>('')
+
+        
+    // tab
+    const tab = ref<string>('all')
+
+    onLoad((args) => {
+        uni.$on('refreshOrderList', () => {
+            list.value = []
+            getMescroll().resetUpScroll()
+        })
+
+        // 根据传过来的参数决定显示哪个tab
+        if (args.orderStatus) {
+            tab.value = args.orderStatus
+        }
+    })
+
+    onUnload(() => {
+        uni.$off('refreshOrderList')
+    })
+
+    const Order = {
+        // 上拉加载的回调: 其中num:当前页 从1开始, size:每页数据条数,默认10
+		upCallback: (mescroll) => {
+			// const filter = {
+			// 	page: mescroll.num, 
+			// 	size: mescroll.size,
+			// 	order_status: orderStatus.value,
+			// 	search: keywords.value
+			// }
+
+			// getTeaSpecialistOrderList(filter).then((res) => {
+			// 	const curPageData = res.list || [] // 当前页数据
+			// 	if(mescroll.num == 1) list.value = [] // 第一页需手动制空列表
+			// 	list.value = list.value.concat(curPageData) //追加新数据
+			// 	mescroll.endSuccess(curPageData.length, Boolean(res.more))
+			// }).catch(() => {
+				mescroll.endErr() // 请求失败, 结束加载
+			// })
+		},
+
+        /**
+		 * 跳转茶室搜索
+		 */
+		handleToSearch: () => {
+			uni.$on('refreshTeaRoomList', params => {
+				keywords.value = params.keywords
+				Order.handleResetSearch()
+				
+				uni.$off('refreshTeaRoomList')
+			})
+			router.navigateTo(`/pages/search/search?keywords=${keywords.value}`)
+		},
+
+        
+		/**
+		 * 重置搜索
+		 */
+		handleResetSearch: () => {
+		    console.log("🚀 ~ location:", 456)
+
+			list.value = []
+			getMescroll().resetUpScroll()
+		},
+
+
+        // 切换tab
+        handleChangeTabs: (e: {index: number, name: string}) => {
+            tab.value = e.name
+            if (e.name === TeaSpecialistOrderStatusText.Pending) {
+                orderStatus.value =  '0'
+            } else {
+                orderStatus.value = TeaSpecialistOrderStatusValue[e.name] || ''
+            }
+
+            // 切换tab时,重置当前的mescroll
+            list.value = []
+            getMescroll().resetUpScroll();
+        },
+
+        // 返回上一页
+        handleBack: () => {
+            uni.navigateBack({
+                delta: 1
+            })
+        },
+    }
+
+</script>
+
+<style lang="scss">
+    page {
+	    background-color: $cz-page-background;
+    }
+
+    .order-list {
+        :deep() {
+            .wd-navbar__left {
+                width: 100%;
+            }
+        }
+    }
+
+    .tabs {
+        :deep() {
+            .wd-tabs,
+            .wd-tabs__nav  {
+                background-color: transparent !important;
+            }
+
+            .wd-tabs__nav-item {
+                font-weight: 400 !important;
+                font-size: 28rpx !important;
+                color: #606266 !important;
+                line-height: 40rpx !important;
+                padding: 0 30rpx !important;
+            }
+
+            .wd-tabs__nav-item.is-active {
+                font-weight: 500 !important;
+                color: #303133 !important;
+                font-size: 32rpx !important;
+                line-height: 44rpx !important;
+            }
+        }
+    }
+
+    .search-box {
+        display: flex;
+        height: 100%;
+        margin-right: 40px;
+        --wot-search-padding: 0;
+        --wot-search-side-padding: 0;
+
+        :deep() {
+            .wd-search {
+                background: transparent !important;
+                width: 100% !important;
+            }
+
+            .wd-search__block {
+                background-color: #fff !important;
+            }
+
+            .wd-search__input {
+                // #ifdef MP
+                padding-left: 32px !important;
+                padding-right: 32px !important;
+                // #endif
+
+                // #ifndef MP
+                padding-right: 0 !important;
+                // #endif
+            }
+        }
+    }
+</style>
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 @@
-<!-- 使用 type="home" 属性设置首页，其他页面不需要设置，默认为page -->
-<route lang="jsonc" type="page">{
-	"layout": "tabbar",
-	"style": {
-		// 'custom' 表示开启自定义导航栏，默认 'default'
-		"navigationStyle": "custom",
-		"navigationBarTitleText": "首页"
-	}
-}</route>
-
-<template>
-	<view>
-		<view class="home-bg w-[100%] fixed top-0 left-0 z-100">
-			<wd-navbar safeAreaInsetTop :bordered="false" custom-style="background-color: transparent !important;">
-				<template #left>
-					<view class="search-box flex items-center ml-26rpx">
-						<wd-search v-model="keywords" placeholder="请输入内容" hide-cancel disabled placeholder-left
-							@search="Reserve.handleSearch()"
-							placeholderStyle="text-align:left;padding-left: 24rpx;line-heigt: 44rpx;color: #C9C9C9; font-size: 32rpx;font-weight: normal;">
-						</wd-search>
-					</view>
-				</template>
-			</wd-navbar>
-
-			<view class="tabs">
-				<wd-tabs v-model="tab" swipeable slidable="always" @change="Reserve.handleChangeTab" :lazy="false">
-					<wd-tab title="茶室预约"></wd-tab>
-					<wd-tab title="茶艺师预约"></wd-tab>
-				</wd-tabs>
-			</view>
-		</view>
-
-		<view class="mx-30rpx" :style="{ paddingTop: navbarHeight + 'px' }">
-			<mescroll-body ref="mescrollItem0" @init="mescrollInit" @down="downCallback" @up="Reserve.upCallback" :down="downOption" :up="upOption">
-				<template v-if="tab === 0">
-					<view class="mb-20rpx" v-for="(item, index) in list" :key="index">
-						<combo-card :type="OrderSource.TeaRoom" :order="item"></combo-card>
-					</view>
-				</template>
-
-				<template v-if="tab === 1">
-					<view class="mb-20rpx" v-for="(item, index) in list" :key="index">
-                    	<combo-card :type="OrderSource.TeaSpecialist" :order="item"></combo-card>
-					</view>
-				</template>
-            </mescroll-body>
-		</view>
-
-		<!-- <view class="mx-30rpx" :style="{ paddingTop: navbarHeight + 'px' }"> -->
-			<!-- 茶室预约 -->
-			<!-- <view v-if="tab === 0">
-				<mescroll-body @init="mescrollInit" @down="downCallback" @up="Reserve.upCallback" :up="upOption">
-					<view v-for="(item, index) in 5" :key="index" >
-						<view class="mb-20rpx" @click="Reserve.handleToReserveRoomOrder">
-							<combo-card :type="OrderSource.TeaRoom" :order-status="OrderStatus.Consuming"></combo-card>
-						</view>
-					</view>
-				</mescroll-body>
-			</view> -->
-			
-			<!-- 茶艺师预约 -->
-			<!-- <view v-if="tab === 1">
-				<mescroll-body @init="mescrollInit" @down="downCallback" @up="Reserve.upCallback" :up="upOption">
-					<view v-for="(item, index) in 5" :key="index" >
-						<view class="mb-20rpx" @click="Reserve.handleToTeaSpecialistOrder">
-							<combo-card :type="OrderSource.TeaSpecialist" :order-status="OrderStatus.Consuming"></combo-card>
-						</view>
-					</view>
-				</mescroll-body>
-			</view> -->
-		<!-- </view> -->
-	</view>
-</template>
-
-<script lang="ts" setup>
-	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 { OrderSource, OrderStatus } from '@/utils/order'
-	import { router } from '@/utils/tools'
-    import { getTeaRoomOrderList } from '@/api/tea-room'
-    import { getTeaSpecialistOrderList } from '@/api/teaSpecialist-order'
-
-	const OSS = inject('OSS')
-	const navbarHeight = Number(inject('navbarHeight')) + 42 + 14 // 42为tabs的高度 14是边距值
-
-	// tab切换
-    const tab = ref<number>(0)
-	const reserveType = ref<number>(0) // 0:茶室预约 1:茶艺师预约
-
-    // mescroll
-	const { mescrollInit, downCallback, getMescroll } = useMescroll(onPageScroll, onReachBottom) // 调用mescroll的hook
-    const downOption = {
-		auto: true
-	}
-	const upOption = {
-		empty: {
-			icon : OSS + 'icon/icon_reserver_empty.png',
-			tip: '暂无预约信息',
-		},
-		auto: true,
-		textNoMore: '~ 已经到底啦 ~', //无更多数据的提示
-	}
-    const orderStatus = ref<string>('')
-	const list = ref<Array<any>>([]) // 茶室列表
-    const keywords = ref<string>('') // 搜索关键词
-
-	onLoad(() => {
-	})
-
-	const Reserve = {
-		// 上拉加载的回调: 其中num:当前页 从1开始, size:每页数据条数,默认10
-		upCallback: (mescroll) => {
-			// 需要留一下数据为空的时候显示的空数据图标内容
-            const filter = {
-				page: mescroll.num, 
-				size: mescroll.size,
-				order_status: orderStatus.value,
-				search: keywords.value
-			}
-
-			if (tab.value === 0) {
-  				getTeaRoomOrderList(filter).then((res) => {
-					const curPageData = res.list || [] // 当前页数据
-					if(mescroll.num == 1) list.value = [] // 第一页需手动制空列表
-					list.value = list.value.concat(curPageData) //追加新数据
-					mescroll.endSuccess(curPageData.length, Boolean(res.more))
-				}).catch(() => {
-					mescroll.endErr() // 请求失败, 结束加载
-				})
-			} else if (tab.value === 1) {
-				// 茶艺师预约接口调用
-				getTeaSpecialistOrderList(filter).then((res) => {
-					const curPageData = res.list || [] // 当前页数据
-					if(mescroll.num == 1) list.value = [] // 第一页需手动制空列表
-					list.value = list.value.concat(curPageData) //追加新数据
-					mescroll.endSuccess(curPageData.length, Boolean(res.more))
-				}).catch(() => {
-					mescroll.endErr() // 请求失败, 结束加载
-				})
-			}
-		},
-
-		/**
-		 * tab切换获取index
-		 * @param item 
-		 */
-        handleChangeTab: (item: { index: number }) => {
-			tab.value = item.index
-			
-            // 切换tab时,重置当前的mescroll
-            list.value = []
-            getMescroll().resetUpScroll();
-        },
-
-		/**
-		 * 搜索
-		 */
-		handleSearch: () => {
-			list.value = []
-			getMescroll().resetUpScroll();
-		}
-	}
-</script>
-
-<style lang="scss">
-	page {
-		background-color: $cz-page-background;
-	}
-
-	.home-bg {
-		background-color: $cz-page-background;
-		background-image: url(#{$OSS}images/home/home_bg.png);
-		// background-size: 100% 300rpx;
-		background-size: cover;
-		background-repeat: no-repeat;
-		padding-bottom: 20rpx;
-		// background-position: top center;
-	}
-
-	.search-box {
-		display: flex;
-		height: 100%;
-		margin-right: 40px;
-		--wot-search-padding: 0;
-		--wot-search-side-padding: 0;
-
-		:deep() {
-			.wd-search {
-				background: transparent !important;
-				width: 100% !important;
-			}
-
-			.wd-search__block {
-				background-color: #fff !important;
-			}
-
-			.wd-search__input {
-				// #ifdef MP
-				padding-left: 32px !important;
-				padding-right: 32px !important;
-				// #endif
-
-				// #ifndef MP
-				padding-right: 0 !important;
-				// #endif
-			}
-		}
-	}
-
-	.tabs {
-		:deep() {
-			.wd-tabs,
-			.wd-tabs__nav {
-				background: transparent !important;
-			}
-			.wd-tabs__nav-item {
-				font-size: 32rpx !important;
-				color: #303133 !important;
-				line-height: 42rpx !important;
-				padding: 0 30rpx !important;
-			}
-
-			.wd-tabs__nav-item.is-active {
-				font-weight: 500 !important;
-			}
-
-			.wd-tabs__line {
-				bottom: 0 !important;
-				width: 60rpx !important;
-				height: 16rpx !important;
-				background-color: transparent !important;
-				background-image: url(#{$OSS}images/reserve_room/reserve_room_image1.png) !important;
-				background-size: cover !important;
-			}
-		}
-	}
-</style>
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 @@
-<route lang="jsonc" type="page">
-{
-    "layout": "default",
-    "style": {
-		"navigationStyle": "custom"
-    }
-}
-</route>
-
-<template>
-    <view class="pb-100rpx">
-        <view>
-            <wd-navbar safeAreaInsetTop :bordered="false" :fixed="true" :placeholder="true" :zIndex="10">
-                <template #left>
-                    <view class="h-48rpx flex items-center" @click="ShareOrderDetail.handleToHome">
-                        <view class="mt-4rpx">
-                            <wd-icon name="home" size="22px" color="#121212"></wd-icon>
-                        </view>
-                        <view class="text-[#303133] text-36rpx ml-24rpx leading-48rpx">分享订单</view>
-                    </view>
-                </template>
-            </wd-navbar>
-        </view>
-
-        <!-- 描述信息 -->
-        <view class="text-[#909399] text-26rpx leading-36rpx mb-40rpx mt-20rpx">
-            <view class="ml-80rpx" v-if="orderStatus === TeaRoomOrderStatus.Pay || orderStatus === TeaRoomOrderStatus.Consumption">使用过程中有任何问题，请联系客服</view>
-            <view class="flex items-center justify-center" v-if="orderStatus === TeaRoomOrderStatus.Pending">
-                <view class="flex items-center mr-6rpx">
-                    <wd-img width="36rpx" height="36rpx" :src="`${OSS}icon/icon_time.png`"/>
-                </view>
-                <view class="flex items-center text-26rpx leading-36rpx text-[#909399]">
-                    <view>还剩</view>
-                    <view class="mx-6rpx">
-                        <wd-count-down :time="order.time1" custom-class="!text-[#FF5951]"	/>
-                    </view>
-                    <view>订单自动取消</view>
-                </view>
-            </view>
-            <view class="ml-80rpx" v-if="orderStatus === TeaRoomOrderStatus.Finished">品一口香茗，让生活慢下来，从一杯好茶开始</view>
-        </view>
-
-        <view class="mx-30rpx coupon-bg" >
-            <view class="flex items-center px-30rpx pt-30rpx pb-40rpx">
-                <view class="mr-30rpx">
-                    <wd-img width="190rpx" height="190rpx" :src="order.room_msg.img" mode="scaleToFill"></wd-img>
-                </view>
-                <view class="flex-1">
-                    <view class="flex justify-between items-center">
-                        <view class="flex items-center font-bold text-30rpx leading-42rpx text-[#303133] mr-10rpx">
-                            <view class="line-1 w-300rpx">
-                                {{ order.room_msg.title }}
-                            </view>
-                            <wd-icon name="chevron-right" size="32rpx"></wd-icon>
-                        </view>
-                        <view class="text-26rpx leading-36rpx text-[#909399]">￥{{ order.room_all_price }}</view>
-                    </view>
-                    <view class="flex justify-between items-center text-26rpx leading-36rpx text-[#909399] mt-18rpx">
-                        ￥{{ order.room_price }}/小时
-                    </view>
-                    <!-- 等待付款不显示实付金额 -->
-                    <view class="text-[#606266] text-right mt-26rpx" v-if="orderStatus !== TeaRoomOrderStatus.Pending">
-                        <text class="text-24rpx leading-34rpx mr-12rpx">实付</text>
-                        <text class="tetx-32rpx leading-36rpx">￥{{ order.order_amount }}</text>
-                        <wd-icon name="chevron-right" size="32rpx"></wd-icon>
-                    </view>
-                </view>
-            </view>
-
-            <view class="mt-28rpx pb-36rpx">
-                <view class="text-30rpx leading-42rpx text-[#303133] px-30rpx">预约信息</view>
-                <view class="font-500 text-26rpx leading-48rpx text-[#606266] mt-20rpx">
-                    <view class="mb-20rpx px-30rpx">预约时间：{{ order.day_time }}  {{ order.start_time }}-{{ order.end_time }}</view>
-                    <view class="flex justify-between items-center pl-30rpx" >  
-                        <view>预约时长：{{ order.hours }}小时</view>
-                    </view>
-                </view>
-            </view>
-        </view>
-
-        <!-- 已预约和消费中显示开门锁 -->
-        <view class="bg-white rounded-16rpx mx-30rpx mt-20rpx" v-if="orderStatus === TeaRoomOrderStatus.Pay || orderStatus === TeaRoomOrderStatus.Consumption">
-            <view class="pt-32rpx text-[#303133] text-32rpx leading-44rpx px-30rpx">开门锁</view>
-            <view class="mt-20rpx">
-                <wd-gap height="2rpx" bg-color="#F6F7F9"></wd-gap>
-            </view>
-            <view class="">
-                <view class="flex justify-between items-center mt-18rpx pb-18rpx px-62rpx">
-                    <view class="w-224rpx">
-                        <view class="relative h-64rpx">
-                            <wd-img width="224rpx" height="64rpx" :src="`${OSS}images/reserve_room/reserve_room_image5.png`"/>
-                            <view class="text-[#4C9F44] font-bold text-32rpx leading-44rpx absolute top-[50%] transform translate-y-[-50%] right-22rpx">点击开锁</view>
-                        </view>
-                        <view class="text-[#303133] text-30rpx leading-42rpx mt-16rpx text-center">大门锁</view>
-                        <view class="text-[#606266] text-26rpx leading-48rpx mt-4rpx text-center font-500">手动输入 1052 32#</view>
-                    </view>
-                    <view class="border-r-2rpx border-r-solid border-r-[#F6F7F9] h-224rpx"></view>
-                    <view class="w-224rpx">
-                        <view class="relative h-64rpx">
-                            <wd-img width="224rpx" height="64rpx" :src="`${OSS}images/reserve_room/reserve_room_image6.png`"/>
-                            <view class="text-[#4C9F44] font-bold text-32rpx leading-44rpx absolute top-[50%] transform translate-y-[-50%] right-22rpx">点击开锁</view>
-                        </view>
-                        <view class="text-[#303133] text-30rpx leading-42rpx mt-16rpx text-center">房间锁</view>
-                        <view class="text-[#606266] text-26rpx leading-48rpx mt-4rpx text-center font-500">手动输入 1052 32#</view>
-                    </view>
-                </view>
-            </view>
-        </view>
-
-        <!-- 适用门店 -->
-        <view class="bg-white rounded-16rpx px-30rpx pb-32rpx mx-30rpx mt-20rpx">
-            <view class="pt-32rpx text-[#303133] text-32rpx leading-44rpx">适用门店</view>
-            <view class="mt-26rpx flex items-center">
-                <view class="mr-24rpx">
-                    <wd-img width="170rpx" height="170rpx" :src="order.store_msg.image"></wd-img>
-                </view>
-                <view class="flex-1 flex justify-between items-center relative">
-                    <view class="">
-                        <view class="text-[#303133] text-30rpx leading-40rpx line-2">{{ order.store_msg.name }}</view>
-                        <view class="mt-26rpx text-[#909399] text-24rpx leading-34rpx">距您{{ order.distance }}km</view>
-                        <view class="flex items-center mt-14rpx">
-                            <view class="mr-8rpx">
-                                <wd-img width="28rpx" height="28rpx" :src="`${OSS}icon/icon_location.png`"/>
-                            </view>
-                            <view class="ml-2rpx text-26rpx text-[#606266] line-1 w-300rpx">{{ order.store_msg.address }}</view>
-                        </view>
-                    </view>
-                    <view class="flex absolute top-1/2 right-0 -translate-y-1/2">
-                        <view class="text-center mr-20rpx" >
-                            <wd-img width="64rpx" height="64rpx" :src="`${OSS}icon/icon_nav.png`"/>
-                        </view>
-                        <view class="text-center" >
-                            <wd-img width="64rpx" height="64rpx" :src="`${OSS}icon/icon_phone.png`"/>
-                        </view>
-                    </view>
-                </view>
-            </view>
-        </view>
-
-        <!-- 订单信息 -->
-        <view class="bg-white rounded-16rpx px-30rpx py-34rpx mx-30rpx mt-20rpx">
-            <view class="text-[#303133] text-32rpx leading-44rpx">订单信息</view>
-            <view class="text-28rpx leading-40rpx text-[#606266] flex items-center justify-between mt-22rpx">
-                <view>订单编号</view>
-                <view>
-                    <text>{{ order.order_sn }}</text>
-                    <wd-divider vertical />
-                    <text class="text-[#4C9F44]" @click="copy(order.order_sn)">复制</text>
-                </view>
-            </view>
-            <view class="text-28rpx leading-40rpx text-[#606266] flex items-center justify-between mt-22rpx" v-if="orderStatus != TeaRoomOrderStatus.Pending && order.pay_way">
-                <view>交易方式</view>
-                <view>{{ order.pay_way_title }}</view>
-            </view>
-            <view class="text-28rpx leading-40rpx text-[#606266] flex items-center justify-between mt-22rpx">
-                <view>创建时间</view>
-                <view>{{ order.dtime }}</view>
-            </view>
-            <view class="text-28rpx leading-40rpx text-[#606266] flex items-center justify-between mt-22rpx" v-if="orderStatus != TeaRoomOrderStatus.Pending && orderStatus != TeaRoomOrderStatus.Cancelled && order.pay_way_title">
-                <view>付款时间</view>
-                <view>{{ order.update_dtime }}</view>
-            </view>
-        </view>
-    </view>
-</template>
-
-<script lang="ts" setup>
-    import { TeaRoomOrderStatusTextValue, TeaRoomOrderStatus } from '@/utils/order'
-    import { useMessage } from 'wot-design-uni'
-    import {toast} from '@/utils/toast'
-    import { PayList, PayCategory, PayValue } from '@/utils/pay'
-    import { getTeaRoomOrderDetail } from '@/api/tea-room'
-    import { handleTRCancelOrderHooks, handleTRToPayHooks } from '@/hooks/useOrder'
-    import type { ITeaSpecialistOrderDetailsResult } from '@/api/types/tea'
-	import { router, copy } from '@/utils/tools'
-
-	const OSS = inject('OSS')
-    const title = ref<string>('')
-    const orderStatus = ref<number>(0) // 订单状态：待使用、退款等
-
-    // 取消订单弹窗
-    const message = useMessage('wd-message-box-slot')
-
-    // 订单
-    const orderId = ref<number>(0)
-    const order = ref<ITeaSpecialistOrderDetailsResult>({
-        order_amount: '',
-        order_sn: '',
-        store_id: 0,
-        room_msg: {
-            id: 0,
-            price: 0,
-            img: '',
-            title: '',
-        },
-        store_msg: {
-            id: 0,
-            address: '',
-            name: '',   
-            operation_type: 1,
-            image: '',
-            latitude: '',
-            longitude: '',
-            contact_phone: ''
-        },
-        time1: 0,
-        order_status: 0,
-        room_all_price: 0,
-        room_price: 0,
-        day_time: '',
-        start_time: '',
-        end_time: '',
-        hours: 0,
-        distance: 0,
-        pay_way: 0,
-        pay_way_title: '',
-        dtime: '',
-        update_dtime: '',
-        renew_price: 0,
-        renew_dtime: {
-            start_time: '',
-            end_time: '',
-            renew_price: 0
-        }
-    })
-
-    onLoad(async (args) => {
-        orderId.value = args.orderId
-        // 获取订单详情
-        ShareOrderDetail.handleInit()
-    })
-
-    onUnload(() => {
-        uni.$off('refreshOrderDetail')
-    })
-
-    const ShareOrderDetail = {
-        /**
-         * 获取订单详情
-         */
-        handleInit: async () => {
-            const res = await getTeaRoomOrderDetail({
-                id: orderId.value,
-                latitude: uni.getStorageSync('latitude'), 
-                longitude: uni.getStorageSync('longitude')
-            })
-            order.value = res.details
-            console.log("🚀 ~ order.value :", order.value )
-            title.value = TeaRoomOrderStatusTextValue[order.value.order_status].title || '订单详情'
-            orderStatus.value = order.value.order_status
-        },
-
-        /**
-         * 支付订单
-         */
-        handleToPay: () => {
-            uni.$on('refreshOrderDetail', () => {
-                ShareOrderDetail.handleInit()
-                uni.$off('refreshOrderDetail')
-            })
-
-            handleTRToPayHooks(orderId.value, order.value.store_msg.name, order.value.store_msg.id)
-        },
-
-        /**
-         * 获取订单详情
-         */
-        handleCancelOrder: () => {
-            message.confirm({
-                title: '确定取消订单？',
-                msg: '取消订单后无法恢复，优惠券可退回',
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                cancelButtonProps: {
-                    customClass: '!bg-[#F6F7F8] !text-[#303133] !text-32rpx !leading-44rpx !rounded-8rpx',
-                },
-                confirmButtonProps: {
-                    customClass: '!bg-[#4C9F44] !text-[#fff] !text-32rpx !leading-44rpx !rounded-8rpx',
-                }
-            }).then((res) => {
-               if (res.action == 'confirm') {
-                    // 点击确认按钮回调事件
-                    uni.$on('refreshOrderDetail', () => {
-                        ShareOrderDetail.handleInit()
-                        uni.$off('refreshOrderDetail')
-                    })
-
-                    handleTRCancelOrderHooks(orderId.value)
-                }
-                toast.info('订单取消成功')
-            }).catch(() => {
-                // 点击取消按钮回调事件
-            })
-        },
-
-        /**
-         * 跳转到首页
-         */
-        handleToHome: () => {
-            router.reLaunch('/pages/index/index')
-        }
-    }
-</script>
-
-
-<style lang="scss">
-    page {
-	    background-color: $cz-page-background;
-    }
-
-    .coupon-bg {
-        background-image: url(#{$OSS}images/order/order_image2.png);
-        background-repeat: no-repeat;
-        background-size: 100% 100%;
-    }
-
-    .collapse {
-        :deep() {
-            .wd-collapse-item::after,
-            .wd-collapse-item__header.is-expanded::after {
-                background: none !important;
-            }
-
-            .wd-collapse-item__body  {
-                padding-top: 0 !important;
-                padding-bottom: 0 !important;
-            }
-        }
-    }
-</style>
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 @@
+<route lang="jsonc" type="page">{
+    "layout": "default",
+    "style": {
+		"navigationStyle": "custom"
+    }
+}</route>
+
+<template>
+    <view class="pb-40rpx">
+		<view>
+			<navbar title="设备控制" custom-class='!bg-[#F6F7F8]'></navbar>
+		</view>
+
+        <view class="mt-50rpx mx-40rpx">
+            <view class="">
+                <view class="font-bold text-36rpx leading-50rpx text-[#303133]">大门</view>
+                <view class="relative mt-30rpx">
+                    <wd-img width="670rpx" height="202rpx" :src="`${OSS}images/store/store/image1.png`" mode="aspectFill" />
+                    <view class="absolute top-64rpx left-0 px-46rpx flex items-center justify-between w-full">
+                        <view class="flex items-center">
+                            <wd-img width="96rpx" height="96rpx" :src="`${OSS}images/store/store/image4.png`" mode="aspectFill" />
+                            <view class="font-bold text-34rpx leading-48rpx text-[#303133] ml-32rpx">门锁</view>
+                        </view>
+                        <view class="relative h-64rpx">
+                            <wd-img width="224rpx" height="64rpx" :src="`${OSS}images/reserve_room/reserve_room_image5.png`"/>
+                            <view class="text-[#4C9F44] font-bold text-32rpx leading-44rpx absolute top-[50%] transform translate-y-[-50%] left-74rpx">点击开锁</view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+
+            <view class="mt-30rpx">
+                <view class="mb-40rpx" v-for="(item, index) in 5" :key="index">
+                    <view class="font-bold text-36rpx leading-50rpx text-[#303133] mb-30rpx">大楼开门码</view>
+                    <view class="flex items-center justify-between">
+                        <view class="w-240rpx h-280rpx bg-white rounded-32rpx flex flex-col items-center justify-center">
+                            <view class="">
+                                <wd-img width="90rpx" height="90rpx" :src="`${OSS}images/store/store/image2.png`" mode="aspectFill" />
+                            </view>
+                            <view class="font-bold text-34rpx text-[#303133] leading-48rpx">门锁</view>
+                            <view class="bg-[#4C9F44] rounded-20rpx w-168rpx h-60rpx text-center leading-60rpx text-[#fff] mt-10rpx" @cliclk="Device.handleOpenLock">
+                                开锁
+                            </view>
+                        </view>
+                        <view class="w-410rpx h-280rpx bg-white rounded-16rpx pl-60rpx pr-34rpx">
+                            <view class="flex items-top justify-between px-20rpx py-4rpx  pt-40rpx">
+                                <wd-img width="90rpx" height="90rpx" :src="`${OSS}images/store/store/image3.png`" mode="aspectFill" />
+                                <view class="text-28rpx leading-40rpx text-[#303133] mt-12rpx">ON</view>
+                            </view>
+                            <view class="font-bold text-28rpx text-[#303133] leading-40rpx mt-34rpx flex items-center justify-between">
+                                <view class="font-bold text-34rpx leading-48rpx text-[#303133]">插座空开</view>
+                                <wd-switch v-model="item.checked" size="48rpx" active-color="#4C9F44"/>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+              
+            </view>
+        </view>
+    </view>
+</template>
+
+
+<script lang="ts" setup>
+    import { OrderSource, OrderStatus, TeaRoomOrderStatusText, TeaRoomOrderStatusValue } from '@/utils/order'
+    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 { getTeaRoomOrderList } from '@/api/tea-room'
+	import { router } from '@/utils/tools'
+
+    const OSS = inject('OSS')
+
+    const checked = ref<boolean>(false)
+
+    // mescroll
+	const { mescrollInit, downCallback, getMescroll } = useMescroll(onPageScroll, onReachBottom) // 调用mescroll的hook
+    const downOption = {
+		auto: true
+	}
+	const upOption = {
+		auto: true,
+		textNoMore: '~ 已经到底啦 ~', //无更多数据的提示
+	}
+    const orderStatus = ref<string>('')
+	const list = ref<Array<any>>([]) // 茶室列表
+    const keywords = ref<string>('') // 搜索关键词
+
+    // tab
+    const tab = ref<string>('list')
+    const tabList = ref<Array<{title: string, num: number, name: string}>>([
+        { title: '已上架', num: 10, name: 'list'},
+        { title: '已下架', num: 11, name: 'delist' },
+        // { title: '草稿箱', num: 0, name: 'draft' }
+    ])
+
+    onLoad((args) => {
+    })
+
+    onUnload(() => {
+    })
+
+    const Device = {
+        /**
+         * 开锁
+         */
+		handleOpenLock: () => {
+			
+		},
+
+    }
+</script>
+
+<style lang="scss">
+    page {
+	    background-color: $cz-page-background;
+    }
+</style>
diff --git a/src/pages/store/img/bookroom.png b/src/pages/store/img/bookroom.png
deleted file mode 100644
index d80eac71f7fefc070a2339bac9b8e6a77f019ea6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4731
zcmbVQhc_I|*IuhEqFZHkqO4v+wAj^&vV`cOM-U;RBt(l<7m2J8Wi6|P5GAZmh~A=$
zZoOW;CCU=y^ZS0^U+~R2GxwZ3^W1ypoSA3tJP8OBJz8oGY5)L0YoM=feq$5=(<v!#
z#=y97w;MweV6LYLs2t(i0sxrq7-+*SLLB#UUxr!e)b~c<RkucTgKD}MreQFPFd9_i
zKz!$+o0+2f?|zj7(Y425gv~v^QY^NsfU-|cTc3eU0Vc!FP7_a{AfYN3=BHv9x6vQZ
zEmU=QwjCQYGQKsBe-=j<u>Ix7>ybvw_KW9b`+H?gz$~bWdJ+>E%GE=S2HOmXk%P^n
z>0i&tff*vHDeOUhv9g7l$Ob2A{$ATXWKUb)Os&35ix6Ox#P1ozxWrbaH1eIS&l~Ch
z4$@+hn^2r2u_u5_?iQIwyb*aKpOfL+jH-#6i$K^|dW{wTiUT0oBkRLY-?BOya&~qP
zigU_A?=bJEKBX$EXh=2{6QpJ-SIVecMz%vQer=c;E-F)1KZL3Uv>c2mJ}CbO+7T%i
zDC9y4j4@(FhpEqt$@mitk>FBXB%hNvHbchb$CeGJ%q2xfvVs6Phgk<1$ru;fs-p@e
zC_w&MjBmvfZq;*2%C0T<4rmO0`yJj0<V$oDAkRXqB))yrLjzoa-^@&donXqN(Enh3
zL}A!j^Y}J47Cr<enE^EeG|f%mHW11Fwh#~{U?40ffQTpgf4On0K*Q5?BX$~!4D;og
z88$}@CUN>xOAD7ycXwjX3qflqCx+-~yFu!)UF@#uLbCfaX+S{!i8;4w(D$6ifYsIf
z1<m%dGO?CMKYl6u2EKCFoK=PWbJ0wND<PZwY!>wQMb*P^%}EZ_X{Du5Ba9q5N3!mR
z$mtw9L7~;`XKiK*#kg;_WYFf|@2=~=g1MfS7hLB%J7+3B%_{g9V<jUgNlSHflsIjf
z;3P#qkV3p0_LZP6G*@PgT3K<Dux?<uz8>J2^V?rgmT;&c)5V!pH;J+I6~PVS=VR)4
z!?6~2ED2pAl}W79x^8ZT0!Loan=e#`vhLjK*3n7qu@uW3jQ+J%95`DQRA;_tA((>4
zD;1mMCQkG7Cw?!d>J-`dyU_BpNchVM=Vlt#$G(}vKYLnq4w6E#7JTPHv58JdNCPgP
zgLtrvr`Jp6u~e%}BXOVxUu$?T#{GqLmSm%Sa9!04i;G7WJ6~?shX%*FPSGDuMUl=n
z_~Quv>2#ZNSU>&g&(^WrRD_@6QV%A*?syDkMroXGk;1E9XM*t=wj&tzB;+mDNDU?b
z69UuC@`tVMWS5Gw>C~XL#%fnaPR?@AItwwD<5%hrE3Kmh*m7H%7PyeI^7pKp*b_px
zbLdMvd;4e=y^cK>LJwM>FIHT99QFvS30IeslLM#jeU1!P!1;aq&{_*HNC?fDy7$w+
zH-$TC)l@_B;y0>y$E#ew&ZgFbHl?_Dj(Wp<d07@gY`EMfoa>tyz7U0nxX03R#`>@I
zsunq3(v=7qIXbv(uD)$)U7_Vt$@~XB;wQN2nyMcA_vI>5SnE(Z7M&o8ua(%^+6wVL
zBCyK7Y+b`<8VO5aG&uF>xL*`%<PzpfOnGS_DwCqs_wV1Yel;bw(DHIZ^eC76t4$ow
zHD^y}qrCraAOB<g;6AbS)k){3tgFw3!N<5m<>Ym9%Kcj3JzF<-_n)YPGKygeLw9!}
z)|PAP6kb)rbK4gOW2Dboj$#Re<X*y^;#QT~Wl55pRe0tsa&+Ra=R?_7a^b{lyU?AD
z7k@@_Rb7`Z&krp^khaF%XTriRzdgcBg9oLCfdd=!ctY*d5oYlNm5AH%Elk|pw9?Yj
zFGmzxh=*Mnbo!7=j$173?37Bu8!g!H_U^jj*R=h6zO0BK;qUzZXOGjw-M=_L^eAqX
zlI*-EAwk1Y5#Z?m{Xi|CrdDVNhSmR2c1}wLM&7{>L79b(5SJ0Fm7^MZa5(&pEj{l&
zF8E)^y<#`z%pBB^9V88AW^M!cfW7PL(&V*nXy5v(4qovnY)eR6TN^r;)gWot!8>%M
ziG_+uMhWPR{3R+=yMv$1GC)m2gf+G3{bm+V5W4v&7fX_?A;ULa<B7369Iph;w6F|N
zvcx;&o}2H!>vG>7fTGR*&q+<Ip2q&xO&fxgqmI&q=rEC{p`bW~E<XZ_(|3WTF}i~X
zpky~m3~2P_3Q(F5BrG2#kU(Ofi#7v~KrhLP3OY5lwRH=ssu<4C&o?JOy$=D<X+#*f
z_fp+AfAw~HNO7W#r-)6e?#Tp&t$3(6k>X2E4%cD8PP!PG;Vm-cGx@qejD$umpR}~8
zs0j@F6^0-_d|)>(YiMZbw-_Z^aYA()Vao@-tjY=6o6G<7p6820Ge!7mf;kfQBno>t
zvhkal_t`TtGKzwN0$_J{HzgGn<KKUqL4yMWXcuji7WOLw5wdZ##}U>!AP>@@f%5Ue
zE<@*zw-n=qLq!D;ws)ali@rh}cPDdt9igv7?cbYGf`Q%tZo*W_pOj#Y^`SV6``UJf
zLfHRo{#~TOi39zxnP-X%Gb<1&muRf-nPM(EcARmYGUl3>QE2u0cK?BT@x1HSh1gMt
zF>Wlny^h97hQqk@^Jh;4N$4~#Mo-(NYuce^lput#U!hUDX)!S|1%W#ZM+wy>C2ZU6
zpQG{uyk$1KPZX4V|KXQDXd*JlOs;7y+cmP%AMcCjp1%4(Ho#3*WLf@j^GE*e&Q5`>
z%dwj3C6-zP6U8?5ATSb1Yufzv7;-lR>M?33$jP*?k6j=^5L3~zvWpB5h|rd$jPZ%g
zqmaPsOXaZO%bPbti*%v`>*SNN{N`a>8(AWl+<v`ML_vW@J#;D9`<lP#-*F!zJw{X%
z^e)}zY%1{9vSUj46-fWqcnpg>+G7Zss~QaNP08gR5tzPs|2TtLq^)aI;|iLkcB~&E
zVS7Oz$Df}Mf(3BvFW`FBJ?HCl1#&&a`?kJ5xcl-Kn~%xt8|=z-{gBXWQ%Dg+&hU&!
zeeBbN#|GR5=ywqaZ#CJFO!HMwxt(3q_!<Tia`-K-d$s2u=SZ6ePpmfFE$71X@$Rrk
z?<x3&>5p*Xsq~uG+GvNFS`Q;gcLJoltBceX!wssyQ*=8>Vdbj&_D$^4c0BN=s3kUL
z-xsjRdKL;g?xH@sF-ovV^sheL)mVj{M53y_=F7}uHW`~Veh_${_kDSHVU2J6))MpC
z+4cLys;OW;L=KsuiLVsqbr2U>dSuHz5kTEuMu5_E_H#HR%H#Nt487^qnG+579ahJs
zdvxD4v3IG^(-m5b^R1wvGO>ltP|e*!hNptSulx-jeVWx~AQE6fi%JK=GWIfY+v>Zg
z1yB5;kH~fNqy<V#hx@HZA6zL_#-c{dlkCpGurPZjqm|gLBW!RemuPbgtd32^Tg$Kb
zQp|98s{NMEs5-J9o=^NUWD|lt&<f^-N?vuF#F?8P-cWebytV}VrCb=z^~xf7#lmIv
zzXUau&!2V#l~+jfxj@C{T@yC$-tU_>ed43=%*S@SZ8bdnJ>kUex5*&2c^AVV;Jp-%
z<Rq4t4WqTRn86E?QytT;N45C1tN0TCN`eY-62qR`2-#(YZvPVddhmnCTd7<5xJDvl
z2uhcK02~<`+mrSC;Z!Z09L4mRws$E<a&v2$%^xz@E%6I4b&!ZfvnTmWL};iGU+68b
zi1^FmEq0IDDt)xf(n*@<jalK4A7T`bSo3=LmVJo^dB{DT_6}pjs_D{Rbu$rclJST|
zo*IPAz%SXw#$Bk3*>MAP>R(KA^S&Z79)f(5qg>=T8B1xA{q_mdJdCq`=aR&Rb63OO
zbD~)=J4ZTe|4jWF&)>HAqdnx1w{A@HALs3KvcmL@>1cCn_l`$l&2aGs{<>YcHt|6Q
z`GJ~vXX_8al%V^gGbHO<?{J5BtH=GmH~eg;vXe53Vi%I)^rQjP0Z6+_+S^kdqf)Wu
zkEF-;VZLfo8JKSYdycVrp?pRj%mjHWta>PQ-e!vH!@fLO@w59atSYb}s7;Tin+2;=
z_$CZBG#itO)BR>w#Hf*t=BB@0UPfx@lgdNfd~aN1cOTpLVWerTuz$iU&%v5b9pfeK
zX^DZ#r+4&~@wU7yRdaUH&CL9yh|QSO%UOAjRs821*I^O+P)u@x{0_180n1RSiw8PW
zoMHdpr1Iiyg0eJ;mo(U7%X>|GRGBJJ=VX!f(RkI_PFIbcI0XFDibx-z@X=_tZunP(
zl-3e&1R$UsBW^9e8qM4Esq4twQmV2#yUyeJvs6n8=DE@P<pGUfQh742%I`!K$n>$S
zuM-Ki4Ju~$=R7o*h4KC3!;|+&q~S@~Ly`1iZ9(kdzi4ktld{lZb%TC_?rY^6>c!bI
z-wS)XgNcz0lwcp~^9|(CEMaO0E#nL+&+oKP-EJ0iWKBOn+O*7&><&XUbyzOjTBER6
zjSOX4lOLqh(pF8e(1kU*uA{mNRgJ|T9oZ3>Fd6cX$`FR_tC5ZU{n!Jg;m;>q>i(ie
zmQw*q)Ray^YLk|h58+iVdC!mUE_^4SKV=($o_c#stPOJ8nfW%TfBNjt;A~*>ZGEtP
zDk0zBYOQ4N%T##Ka$m3)y!xeV0!3SRxW19eJI}=*DA+s6+`!%lp#!a@x}FWe<ZtG@
zXh!MEo-T*3!>N8Bx1E6>`~m>TOcHnW1_pEHGSy`2hX3$i)Ym-Im4%NF9@1`i-Jqf;
zL>M=5Iwo+)_^siP7Au93OHAC9YO3q=zf$_f?Xk&m(zBMoWnFt$zsNh*5B82{{%;gL
zjB&`rCuM%tbUa4iite}P--8m>Tc@XX*~q3U42<EvQovRPLa?cXVdqpqZ25kL!|$sp
z-u#(}lMjow|Gh!VWC^PH=w-3_Xym9(rJMWoN1Syu@bAhzf8s5Kd@Xmi8u>;*lF$@p
znJEI(!0V;-hYdbu9|?OWSa+pcADfpI&sB!|^lA3=UwORrbM-%`%N%=q?I%Kj^0p1`
z>SMsjhQ6Kb*)EYP^O`{Ohtqi#j=d|G7x*}QruLZ?keJd|oS4nQKHJ4+2A|S0d}BUK
z9B6R<9klY?H-C8UcM;uDa~lj%rQ=bvHTB~rD}R<n#zgyN<ne?^Mb__LQPahPq<Db%
zTR&3}{Nvpxa*mlQ4qoXMGnQ6C;u*?ZiNHy#4mUYMxpZ*B(13HVbGR@2X=KDir!v6M
zBD;RJ;m*=_C}4L>_T~_j3Uw)J9H`KV9FWT^h1qi~7$!5elI8%ZHTa!RE@(IBBp>Ql
zJlQnURtSCLX5SXi+<QG$I*)T`Wn^A`qFz{sk~@>PZ<`~!eK_FHs&(S0pt($HwJgfl
zlkIk+XnL`4bs0vOr&tQZjB8ATay!eEp5B2bM|MVlw$FaCqBl90jZO!=zqt1KB{f4o
z2G+m8<?E3!7R9c7T<=|5j$CG%*&+i(q@2Kedz_w-p(`Hc^`sHkXr;=>JY~E`)M(i6
z>U*UN&ND*Oip+be5E-clsXRTygr+Wv2%<_2UIX}gTOC{uGW4=#y?(YHmDMX+m!9am
z4CnGy2~036E;uQ;sX5=(ZDB8e4j^lv=xYQ}3*)M%L;9}5<0(t=G*}*}YD(eSu;iz@
zdzY`ZT}AGtj=A;@I<^Yy0D(G*h9)(iK9_cM|86JzLcT!noK%6(hw+p&JaXVJ3}ox@
ziJ^Ix9#-G1zhCiky0HoY(g1f@L8Im@fR^bb(Tz-+&ODje=%0%qOAd`3@p0GzW7LSO
zL#};!(<&9(BfWXu5%s21sZ8;Rrg2>{#j6qpq$y?iHE5jz(1tRn6)YrE%kWwKNUtGf
zIQ(aE7UuQdg<6p6yvV1X&ndx$U-XAV$<6n_9y?L1=(IA}xh@^iv{RT*VFPuFjyxsM
zy$7n#ce3}qS1W|QCMSz+fblv<Qzn{>7IYkn1A0fk3FjV2k+b`1B4_!e`J01AvrI;H
zBb`+NQ;So!Udcw}Lku!1efMYkuXcQVCvQXyzLnOCyulWR#yWfQ%#Y3<-n`B)jhQ)e
zg6t3jJs-)#Bmhg2_*{zs5E#nBUJSaRw3BpIcqQ@6lGMAz-I~S;?D`g8{xd2o&HK0b
z;en37ZY@L=r8`7L&#>KA&^66~o2XWd2E}GZiI8JUZuFQA7o5RwrTEHH6cC8`7P&)n
mmt4M$X_6RiYFnZ6Hv;GoM*j(<pm?Ju0St6Zv@128qW=fmJIrJN

diff --git a/src/pages/store/img/device.png b/src/pages/store/img/device.png
deleted file mode 100644
index 2ee7e5d1eafed21311fa997bc6bd5be1a02c19b4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5520
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
Sv^kyt0000<MNUMnLSTY=v_w1r

diff --git a/src/pages/store/img/renew.png b/src/pages/store/img/renew.png
deleted file mode 100644
index 4a92e3c0c02617257aa362aae114dec0d0edd176..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4915
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

diff --git a/src/pages/store/img/room.png b/src/pages/store/img/room.png
deleted file mode 100644
index 0ea0c080e86eb48331720ec31e72453100389649..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2751
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

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 @@
+<route lang="jsonc" type="page">{
+    "layout": "default",
+    "style": {
+		"navigationStyle": "custom"
+    }
+}</route>
+
+<template>
+    <view class="pb-40rpx">
+		<view>  
+			<navbar title="订单续订" custom-class='!bg-[#F6F7F8]'></navbar>
+		</view>
+
+        <view class="mt-38rpx">
+            <mescroll-body ref="mescrollItem0" @init="mescrollInit" @down="downCallback" @up="Renew.upCallback" :down="downOption" :up="upOption">
+                <view class="bg-white rounded-16rpx p-30rpx mx-32rpx relative">
+                    <view class="absolute top-0 right-0 bg-[#4C9F44] text-[#fff] w-160rpx h-64rpx leading-64rpx text-center xd" @click="showBookTimePopup = true">
+                        续单
+                    </view>
+                    <view class="flex items-center">
+                        <view class="mr-28rpx">
+                            <wd-img width="200rpx" height="200rpx" :src="`${OSS}images/home/home_image5.png`"></wd-img>
+                        </view>
+                        <view class="flex-1">
+                            <view @click="ComboCard.handleToOrderDetail">
+                                <view class="font-bold text-28rpx text-[#303133] leading-40rpx line-2 w-260rpx">这是茶室包间名称换行效果这是茶室包间名称换行效果</view>
+                                <view class="font-400 leading-36rpx text-26rpx text-[#606266] mt-10rpx">
+                                    <view>预约时间：03/18 08:00-12:00</view>
+                                    <view class="mt-18rpx">预约时长：2小时</view>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </mescroll-body>
+        </view>
+        
+        <view class="bg-[#4C9F44] w-630rpx h-90rpx text-[#fff] text-center leading-90rpx rounded-8rpx mx-auto mt-50rpx">确定</view>
+
+        <!-- 选择预定时间 -->
+        <!-- <booking-time v-model="showBookTimePopup" :day="sevenDay" @selectedTime="Reserve.handleChooseReserveTime"></booking-time> -->
+    </view>
+</template>
+
+
+<script lang="ts" setup>
+    import { OrderSource, OrderStatus, TeaRoomOrderStatusText, TeaRoomOrderStatusValue } from '@/utils/order'
+    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 { getTeaRoomOrderList } from '@/api/tea-room'
+	import { router } from '@/utils/tools'
+    import type { ITeaSpecialistFuture7DaysResult } from '@/api/types/tea'
+    import { getNext7Days, renewTeaRoomOrder } from '@/api/tea-room'
+
+    // mescroll
+	const { mescrollInit, downCallback, getMescroll } = useMescroll(onPageScroll, onReachBottom) // 调用mescroll的hook
+    const downOption = {
+		auto: true
+	}
+	const upOption = {
+		auto: true,
+		textNoMore: '~ 已经到底啦 ~', //无更多数据的提示
+	}
+    const orderStatus = ref<string>('')
+	const list = ref<Array<any>>([]) // 茶室列表
+    const keywords = ref<string>('') // 搜索关键词
+
+    const OSS = inject('OSS')
+
+    const checked = ref<boolean>(false)
+
+    const columns = ref<Array<{label: string, id: number}>>([
+        { label: '包厢A', id: 1 },
+        { label: '包厢B', id: 2 },
+        { label: '包厢C', id: 3 },
+    ])
+
+    // tab
+    const tab = ref<string>('list')
+    const tabList = ref<Array<{title: string, num: number, name: string}>>([
+        { title: '已上架', num: 10, name: 'list'},
+        { title: '已下架', num: 11, name: 'delist' },
+        // { title: '草稿箱', num: 0, name: 'draft' }
+    ])
+
+    // 选择预定时间
+    const showBookTimePopup = ref<boolean>(false)
+    const sevenDay = reactive<ITeaSpecialistFuture7DaysResult>({
+        minimum_time: 0,
+        time: []
+    })
+    const reserveTime = ref<Array<any>>([])
+
+    const form = ref({
+        name: '',
+        price: '',
+    })
+
+    onLoad(async (args) => {
+
+        // 预定时间
+        // const next7 = await getNext7Days()
+        // Object.assign(sevenDay, next7)
+    })
+
+    onUnload(() => {
+    })
+
+    const Renew = {
+        /**
+         * 分页加载
+         * @param mescroll 
+         */
+		upCallback: (mescroll) => {
+			// 需要留一下数据为空的时候显示的空数据图标内容
+            // const filter = {
+			// 	page: mescroll.num, 
+			// 	size: mescroll.size,
+			// 	order_status: orderStatus.value,
+			// 	search: keywords.value
+			// }
+
+            // getTeaRoomOrderList(filter).then((res) => {
+			// 	const curPageData = res.list || [] // 当前页数据
+			// 	if(mescroll.num == 1) list.value = [] // 第一页需手动制空列表
+			// 	list.value = list.value.concat(curPageData) //追加新数据
+			// 	mescroll.endSuccess(curPageData.length, Boolean(res.more))
+			// }).catch(() => {
+				mescroll.endErr() // 请求失败, 结束加载
+			// })
+		},
+        
+        /**
+         * 开锁
+         */
+		handleOpenLock: () => {
+			
+		},
+
+        
+	    /**
+         * 选中预定时间
+         */
+        handleChooseReserveTime: (params: any) => {
+            reserveTime.value = params
+            console.log("🚀 ~ reserveTime:", reserveTime)
+
+            // 一键续订的金额
+            // totalReserveMoney.value = Number(toTimes(params[3], order.value.room_price))
+        },
+
+    }
+</script>
+
+<style lang="scss">
+    page {
+	    background-color: $cz-page-background;
+    }
+
+    .xd {
+        border-radius: 0rpx 10rpx 0rpx 10rpx;
+    }
+</style>
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 @@
+<route lang="jsonc" type="page">{
+    "layout": "default",
+    "style": {
+		"navigationStyle": "custom"
+    }
+}</route>
+
+<template>
+    <view class="pb-40rpx">
+		<view>  
+			<navbar title="包间预定" custom-class='!bg-[#F6F7F8]'></navbar>
+		</view>
+
+        <view class="mt-38rpx bg-white rounded-16rpx py-22rpx px-30rpx mx-30rpx">
+            <view class="">
+                <view class="text-26rpx leading-32rpx text-[#606266] mb-20rpx">包厢选择</view>
+                <view class="">
+                    <wd-picker :columns="columns" value-key="label" value-name="id" v-model="form.name" use-default-slot>
+                        <wd-input type="text" v-model="form.name" placeholder="请选择包厢" readonly>
+                            <template #suffix>
+                                <wd-icon name="arrow-down" size="32rpx" color="#D8D8D8"></wd-icon>
+                            </template>
+                        </wd-input> 
+                    </wd-picker>
+                </view>
+            </view>
+
+            <view class="mt-22rpx">
+                <view class="text-26rpx leading-32rpx text-[#606266] mb-20rpx">包厢价格</view>
+                <view class="">
+                    <wd-input type="text" v-model="form.price" placeholder="请选择包厢" readonly>
+                        <template #suffix>
+                            <wd-icon name="arrow-down" size="32rpx" color="#D8D8D8"></wd-icon>
+                        </template>
+                    </wd-input> 
+                </view>
+            </view>
+
+            <view class="mt-22rpx">
+                <view class="text-26rpx leading-32rpx text-[#606266] mb-20rpx">预定时间</view>
+                <view class="" @click="showBookTimePopup = true">
+                    <wd-input type="text" v-model="form.name" placeholder="请选择预定时间" readonly no-border>
+                        <template #suffix>
+                            <wd-icon name="arrow-down" size="32rpx" color="#D8D8D8"></wd-icon>
+                        </template>
+                    </wd-input> 
+                </view>
+            </view>
+        </view>
+
+        <view class="bg-[#4C9F44] w-630rpx h-90rpx text-[#fff] text-center leading-90rpx rounded-8rpx mx-auto mt-50rpx">确定</view>
+
+        <!-- 选择预定时间 -->
+        <!-- <booking-time v-model="showBookTimePopup" :day="sevenDay" @selectedTime="Reserve.handleChooseReserveTime"></booking-time> -->
+    </view>
+</template>
+
+
+<script lang="ts" setup>
+    import { OrderSource, OrderStatus, TeaRoomOrderStatusText, TeaRoomOrderStatusValue } from '@/utils/order'
+    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 { getTeaRoomOrderList } from '@/api/tea-room'
+	import { router } from '@/utils/tools'
+    import type { ITeaSpecialistFuture7DaysResult } from '@/api/types/tea'
+    import { getNext7Days, renewTeaRoomOrder } from '@/api/tea-room'
+
+    const OSS = inject('OSS')
+
+    const checked = ref<boolean>(false)
+
+    const columns = ref<Array<{label: string, id: number}>>([
+        { label: '包厢A', id: 1 },
+        { label: '包厢B', id: 2 },
+        { label: '包厢C', id: 3 },
+    ])
+
+    // tab
+    const tab = ref<string>('list')
+    const tabList = ref<Array<{title: string, num: number, name: string}>>([
+        { title: '已上架', num: 10, name: 'list'},
+        { title: '已下架', num: 11, name: 'delist' },
+        // { title: '草稿箱', num: 0, name: 'draft' }
+    ])
+
+    // 选择预定时间
+    const showBookTimePopup = ref<boolean>(false)
+    const sevenDay = reactive<ITeaSpecialistFuture7DaysResult>({
+        minimum_time: 0,
+        time: []
+    })
+    const reserveTime = ref<Array<any>>([])
+
+    const form = ref({
+        name: '',
+        price: '',
+    })
+
+    onLoad(async (args) => {
+
+        // 预定时间
+        // const next7 = await getNext7Days()
+        // Object.assign(sevenDay, next7)
+    })
+
+    onUnload(() => {
+    })
+
+    const Reserve = {
+        /**
+         * 开锁
+         */
+		handleOpenLock: () => {
+			
+		},
+
+        
+	    /**
+         * 选中预定时间
+         */
+        handleChooseReserveTime: (params: any) => {
+            reserveTime.value = params
+            console.log("🚀 ~ reserveTime:", reserveTime)
+
+            // 一键续订的金额
+            // totalReserveMoney.value = Number(toTimes(params[3], order.value.room_price))
+        },
+
+    }
+</script>
+
+<style lang="scss">
+    page {
+	    background-color: $cz-page-background;
+    }
+</style>
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 @@
-<route lang="jsonc" type="page">
-{
-  "layout": "default",
-  "style": {
-    "navigationStyle": "custom"
-  }
-}
-</route>
+<route lang="jsonc" type="page">{
+	"layout": "default",
+	"style": {
+		"navigationStyle": "custom"
+	}
+}</route>
 
 <script lang="ts" setup>
 import { toast } from '@/utils/toast'
@@ -21,17 +19,17 @@ const action = 'https://www.mocky.io/v2/5cc8019d300000980a055e76' // 仅做测
 
 // 表单
 const form = reactive({
-  roomName: '',
-  tags: [] as string[],
-  video: null as any,
-  images: [] as string[],
-  hourlyPrice: '',
-  minBookingTime: '',
-  inventory: '',
-  packageIntro: '',
-  otherNotes: '',
-  userCount: '',
-  refundPolicy: '',
+	roomName: '',
+	tags: [] as string[],
+	video: null as any,
+	images: [] as string[],
+	hourlyPrice: '',
+	minBookingTime: '',
+	inventory: '',
+	packageIntro: '',
+	otherNotes: '',
+	userCount: '',
+	refundPolicy: '',
 })
 
 // 标签相关
@@ -42,736 +40,647 @@ const isTagManageMode = ref(false) // 是否处于管理模式
 const selectedTags = ref<string[]>([]) // 临时选中的标签，点击确认后才回填到表单
 // Mock 已有标签列表
 const availableTags = ref([
-  '全息投影',
-  '环境优雅',
-  '幽静雅致',
-  '禅意悠然',
-  '雅室禅意浓',
-  '古朴韵悠长',
+	'全息投影',
+	'环境优雅',
+	'幽静雅致',
+	'禅意悠然',
+	'雅室禅意浓',
+	'古朴韵悠长',
 ])
 
 const StoreManage = {
-  /**
-   * 切换tab
-   */
-  handleChangeTab: (e: any) => {
-    tab.value = e.name
-  },
+	/**
+	 * 切换tab
+	 */
+	handleChangeTab: (e: any) => {
+		tab.value = e.name
+	},
 
-  /**
-   * 添加标签 - 显示选择标签弹窗
-   */
-  handleAddTag: () => {
-    // 初始化临时选中的标签为当前表单中的标签
-    selectedTags.value = [...form.tags]
-    showTagSelectPopup.value = true
-  },
+	/**
+	 * 添加标签 - 显示选择标签弹窗
+	 */
+	handleAddTag: () => {
+		// 初始化临时选中的标签为当前表单中的标签
+		selectedTags.value = [...form.tags]
+		showTagSelectPopup.value = true
+	},
 
-  /**
-   * 关闭选择标签弹窗
-   */
-  handleCloseTagSelect: () => {
-    showTagSelectPopup.value = false
-    isTagManageMode.value = false // 关闭时重置管理模式
-    selectedTags.value = [] // 清空临时选中的标签
-  },
+	/**
+	 * 关闭选择标签弹窗
+	 */
+	handleCloseTagSelect: () => {
+		showTagSelectPopup.value = false
+		isTagManageMode.value = false // 关闭时重置管理模式
+		selectedTags.value = [] // 清空临时选中的标签
+	},
 
-  /**
-   * 选择标签（临时选择，不直接修改表单）
-   */
-  handleSelectTag: (tag: string) => {
-    if (isTagManageMode.value) {
-      // 管理模式时，点击标签不进行选择操作
-      return
-    }
-    if (selectedTags.value.includes(tag)) {
-      // 如果已选择，则取消选择
-      const index = selectedTags.value.indexOf(tag)
-      selectedTags.value.splice(index, 1)
-    }
-    else {
-      // 如果未选择，则添加
-      if (selectedTags.value.length >= 2) {
-        toast.info('最多只能选择2个标签')
-        return
-      }
-      selectedTags.value.push(tag)
-    }
-  },
+	/**
+	 * 选择标签（临时选择，不直接修改表单）
+	 */
+	handleSelectTag: (tag: string) => {
+		if (isTagManageMode.value) {
+			// 管理模式时，点击标签不进行选择操作
+			return
+		}
+		if (selectedTags.value.includes(tag)) {
+			// 如果已选择，则取消选择
+			const index = selectedTags.value.indexOf(tag)
+			selectedTags.value.splice(index, 1)
+		}
+		else {
+			// 如果未选择，则添加
+			if (selectedTags.value.length >= 2) {
+				toast.info('最多只能选择2个标签')
+				return
+			}
+			selectedTags.value.push(tag)
+		}
+	},
 
-  /**
-   * 从选择列表删除标签
-   */
-  handleRemoveTagFromList: (tag: string, event: any) => {
-    event.stopPropagation()
-    const index = availableTags.value.indexOf(tag)
-    if (index > -1) {
-      availableTags.value.splice(index, 1)
-    }
-    // 如果该标签已被选中，也从临时选中列表中移除
-    const selectedIndex = selectedTags.value.indexOf(tag)
-    if (selectedIndex > -1) {
-      selectedTags.value.splice(selectedIndex, 1)
-    }
-    // 如果该标签在表单中，也从表单中移除
-    const formIndex = form.tags.indexOf(tag)
-    if (formIndex > -1) {
-      form.tags.splice(formIndex, 1)
-    }
-  },
+	/**
+	 * 从选择列表删除标签
+	 */
+	handleRemoveTagFromList: (tag: string, event: any) => {
+		event.stopPropagation()
+		const index = availableTags.value.indexOf(tag)
+		if (index > -1) {
+			availableTags.value.splice(index, 1)
+		}
+		// 如果该标签已被选中，也从临时选中列表中移除
+		const selectedIndex = selectedTags.value.indexOf(tag)
+		if (selectedIndex > -1) {
+			selectedTags.value.splice(selectedIndex, 1)
+		}
+		// 如果该标签在表单中，也从表单中移除
+		const formIndex = form.tags.indexOf(tag)
+		if (formIndex > -1) {
+			form.tags.splice(formIndex, 1)
+		}
+	},
 
-  /**
-   * 确认选择标签
-   */
-  handleConfirmTags: () => {
-    form.tags = [...selectedTags.value]
-    showTagSelectPopup.value = false
-    isTagManageMode.value = false
-    selectedTags.value = []
-  },
+	/**
+	 * 确认选择标签
+	 */
+	handleConfirmTags: () => {
+		form.tags = [...selectedTags.value]
+		showTagSelectPopup.value = false
+		isTagManageMode.value = false
+		selectedTags.value = []
+	},
 
-  /**
-   * 进入管理模式
-   */
-  handleEnterManagement: () => {
-    isTagManageMode.value = true
-  },
+	/**
+	 * 进入管理模式
+	 */
+	handleEnterManagement: () => {
+		isTagManageMode.value = true
+	},
 
-  /**
-   * 退出管理模式
-   */
-  handleExitManagement: () => {
-    isTagManageMode.value = false
-  },
+	/**
+	 * 退出管理模式
+	 */
+	handleExitManagement: () => {
+		isTagManageMode.value = false
+	},
 
-  /**
-   * 显示新建标签弹窗
-   */
-  handleShowCreateTag: () => {
-    showTagSelectPopup.value = false
-    showCreateTagPopup.value = true
-  },
+	/**
+	 * 显示新建标签弹窗
+	 */
+	handleShowCreateTag: () => {
+		showTagSelectPopup.value = false
+		showCreateTagPopup.value = true
+	},
 
-  /**
-   * 关闭新建标签弹窗
-   */
-  handleCloseCreateTag: () => {
-    showCreateTagPopup.value = false
-    newTagName.value = ''
-  },
+	/**
+	 * 关闭新建标签弹窗
+	 */
+	handleCloseCreateTag: () => {
+		showCreateTagPopup.value = false
+		newTagName.value = ''
+	},
 
-  /**
-   * 完成新建标签
-   */
-  handleCompleteCreateTag: () => {
-    const tagName = newTagName.value.trim()
-    if (!tagName) {
-      toast.info('请输入标签名称')
-      return
-    }
-    if (tagName.length > 5) {
-      toast.info('标签不能超过5个字')
-      return
-    }
-    if (availableTags.value.includes(tagName)) {
-      toast.info('该标签已存在')
-      return
-    }
-    // 添加到可用标签列表
-    availableTags.value.push(tagName)
-    // 如果当前临时选中的标签少于2个，自动选中新创建的标签
-    if (selectedTags.value.length < 2) {
-      selectedTags.value.push(tagName)
-    }
-    // 关闭弹窗，重新打开选择标签弹窗
-    showCreateTagPopup.value = false
-    newTagName.value = ''
-    showTagSelectPopup.value = true
-    toast.info('标签创建成功')
-  },
+	/**
+	 * 完成新建标签
+	 */
+	handleCompleteCreateTag: () => {
+		const tagName = newTagName.value.trim()
+		if (!tagName) {
+			toast.info('请输入标签名称')
+			return
+		}
+		if (tagName.length > 5) {
+			toast.info('标签不能超过5个字')
+			return
+		}
+		if (availableTags.value.includes(tagName)) {
+			toast.info('该标签已存在')
+			return
+		}
+		// 添加到可用标签列表
+		availableTags.value.push(tagName)
+		// 如果当前临时选中的标签少于2个，自动选中新创建的标签
+		if (selectedTags.value.length < 2) {
+			selectedTags.value.push(tagName)
+		}
+		// 关闭弹窗，重新打开选择标签弹窗
+		showCreateTagPopup.value = false
+		newTagName.value = ''
+		showTagSelectPopup.value = true
+		toast.info('标签创建成功')
+	},
 
-  /**
-   * 删除标签
-   */
-  handleRemoveTag: (index: number) => {
-    form.tags.splice(index, 1)
-  },
+	/**
+	 * 删除标签
+	 */
+	handleRemoveTag: (index: number) => {
+		form.tags.splice(index, 1)
+	},
 
-  /**
-   * 上传视频
-   */
-  handleUploadVideo: (event: any) => {
-    if (event.fileList && event.fileList.length > 0) {
-      form.video = event.fileList[0]
-    }
-  },
+	/**
+	 * 上传视频
+	 */
+	handleUploadVideo: (event: any) => {
+		if (event.fileList && event.fileList.length > 0) {
+			form.video = event.fileList[0]
+		}
+	},
 
-  /**
-   * 删除视频
-   */
-  handleRemoveVideo: () => {
-    form.video = null
-  },
+	/**
+	 * 删除视频
+	 */
+	handleRemoveVideo: () => {
+		form.video = null
+	},
 
-  /**
-   * 上传图片
-   */
-  handleUploadImage: (event: any) => {
-    if (event.fileList && event.fileList.length > 0) {
-      const newImages = event.fileList.map((file: any) => file.url || file.tempFilePath)
-      form.images.push(...newImages)
-      // 限制最多9张
-      if (form.images.length > 9) {
-        form.images = form.images.slice(0, 9)
-        toast.info('最多只能上传9张图片')
-      }
-    }
-  },
+	/**
+	 * 上传图片
+	 */
+	handleUploadImage: (event: any) => {
+		if (event.fileList && event.fileList.length > 0) {
+			const newImages = event.fileList.map((file: any) => file.url || file.tempFilePath)
+			form.images.push(...newImages)
+			// 限制最多9张
+			if (form.images.length > 9) {
+				form.images = form.images.slice(0, 9)
+				toast.info('最多只能上传9张图片')
+			}
+		}
+	},
 
-  /**
-   * 删除图片
-   */
-  handleRemoveImage: (index: number) => {
-    form.images.splice(index, 1)
-  },
+	/**
+	 * 删除图片
+	 */
+	handleRemoveImage: (index: number) => {
+		form.images.splice(index, 1)
+	},
 
-  /**
-   * 保存
-   */
-  handleSave: () => {
-    // TODO: 实现保存功能
-    console.log('保存表单:', form)
-    toast.info('保存成功')
-  },
+	/**
+	 * 保存
+	 */
+	handleSave: () => {
+		// TODO: 实现保存功能
+		console.log('保存表单:', form)
+		toast.info('保存成功')
+	},
 
-  /**
-   * 点击更多选项
-   */
-  handleMore: () => {
-    // TODO: 实现更多选项功能
-    console.log('更多选项')
-  },
+	/**
+	 * 点击更多选项
+	 */
+	handleMore: () => {
+		// TODO: 实现更多选项功能
+		console.log('更多选项')
+	},
 
-  /**
-   * 点击目标图标
-   */
-  handleTarget: () => {
-    // TODO: 实现目标功能
-    console.log('目标功能')
-  },
+	/**
+	 * 点击目标图标
+	 */
+	handleTarget: () => {
+		// TODO: 实现目标功能
+		console.log('目标功能')
+	},
 }
 </script>
 
 <template>
-  <view class="pb-180rpx">
-    <view>
-      <navbar title="修改包间信息" custom-class="!bg-[#fff]" />
-    </view>
+	<view class="pb-180rpx">
+		<view>
+			<navbar title="修改包间信息" custom-class="!bg-[#fff]" />
+		</view>
 
-    <view class="store-tabs">
-      <wd-tabs v-model="tab" @change="StoreManage.handleChangeTab">
-        <wd-tab title="基础信息" />
-        <wd-tab title="规格与价格" />
-        <wd-tab title="套餐详情" />
-        <wd-tab title="购买须知" />
-      </wd-tabs>
-    </view>
+		<view class="store-tabs">
+			<wd-tabs v-model="tab" @change="StoreManage.handleChangeTab">
+				<wd-tab title="基础信息" />
+				<wd-tab title="规格与价格" />
+				<wd-tab title="套餐详情" />
+				<wd-tab title="购买须知" />
+			</wd-tabs>
+		</view>
 
-    <view class="h-64rpx bg-[#FFF6EB] px-30rpx text-26rpx text-[#111827] font-400 leading-64rpx">
-      带"<text class="text-[#ED2D2D]">*</text>"的为必填项
-    </view>
+		<view class="h-64rpx bg-[#FFF6EB] px-30rpx text-26rpx text-[#111827] font-400 leading-64rpx">
+			带"<text class="text-[#ED2D2D]">*</text>"的为必填项
+		</view>
 
-    <view class="mt-20rpx bg-white p-30rpx">
-      <!-- 基础信息 -->
-      <view v-if="tab === 0">
-        <view class="text-34rpx text-[#303133] font-bold leading-48rpx">
-          基本信息
-        </view>
+		<view class="mt-20rpx bg-white p-30rpx">
+			<!-- 基础信息 -->
+			<view v-if="tab === 0">
+				<view class="text-34rpx text-[#303133] font-bold leading-48rpx">
+					基本信息
+				</view>
 
-        <!-- 包间名称 -->
-        <view class="mt-28rpx">
-          <view class="mb-20rpx flex items-center">
-            <view class="mr-10rpx text-32rpx text-[#303133] font-bold leading-44rpx">
-              包间名称
-            </view>
-            <view class="flex items-center">
-              <wd-img width="16rpx" height="16rpx" :src="`${OSS}icon/icon_validate.png`" />
-            </view>
-          </view>
-          <wd-input
-            v-model="form.roomName"
-            no-border
-            placeholder="请输入包间名称"
-            :maxlength="10"
-            show-word-limit
-            custom-class="!bg-[#F6F7F8] !rounded-16rpx !px-28rpx !py-20rpx"
-          />
-        </view>
+				<!-- 包间名称 -->
+				<view class="mt-28rpx">
+					<view class="mb-20rpx flex items-center">
+						<view class="mr-10rpx text-32rpx text-[#303133] font-bold leading-44rpx">
+							包间名称
+						</view>
+						<view class="flex items-center">
+							<wd-img width="16rpx" height="16rpx" :src="`${OSS}icon/icon_validate.png`" />
+						</view>
+					</view>
+					<wd-input v-model="form.roomName" no-border placeholder="请输入包间名称" :maxlength="10" show-word-limit
+						custom-class="!bg-[#F6F7F8] !rounded-16rpx !px-28rpx !py-20rpx" />
+				</view>
 
-        <!-- 包间标签 -->
-        <view class="mt-28rpx">
-          <view class="mb-20rpx flex items-center justify-between">
-            <view class="flex items-center">
-              <view class="mr-10rpx text-32rpx text-[#303133] font-bold leading-44rpx">
-                包间标签
-              </view>
-              <view class="flex items-center">
-                <wd-img width="16rpx" height="16rpx" :src="`${OSS}icon/icon_validate.png`" />
-              </view>
-            </view>
-            <view class="text-24rpx text-[#9CA3AF] font-400 leading-34rpx">
-              可选择1~2个标签,每个标签不超过5个字
-            </view>
-          </view>
-          <view class="flex flex-wrap items-center gap-16rpx">
-            <view
-              v-for="(tag, index) in form.tags"
-              :key="index"
-              class="flex items-center rounded-20rpx bg-[#F6F7F8] px-20rpx py-8rpx"
-            >
-              <view class="mr-8rpx text-26rpx text-[#303133] leading-36rpx">
-                {{ tag }}
-              </view>
-              <wd-icon name="close" size="14px" color="#909399" @click="StoreManage.handleRemoveTag(index)" />
-            </view>
-            <view
-              v-if="form.tags.length < 2"
-              class="flex items-center border-2rpx border-[#E5E5E5] rounded-20rpx border-dashed px-20rpx py-8rpx"
-              @click="StoreManage.handleAddTag"
-            >
-              <wd-icon name="add" size="16px" color="#909399" class="mr-8rpx" />
-              <view class="text-26rpx text-[#909399] leading-36rpx">
-                添加标签
-              </view>
-            </view>
-          </view>
-        </view>
+				<!-- 包间标签 -->
+				<view class="mt-28rpx">
+					<view class="mb-20rpx flex items-center justify-between">
+						<view class="flex items-center">
+							<view class="mr-10rpx text-32rpx text-[#303133] font-bold leading-44rpx">
+								包间标签
+							</view>
+							<view class="flex items-center">
+								<wd-img width="16rpx" height="16rpx" :src="`${OSS}icon/icon_validate.png`" />
+							</view>
+						</view>
+						<view class="text-24rpx text-[#9CA3AF] font-400 leading-34rpx">
+							可选择1~2个标签,每个标签不超过5个字
+						</view>
+					</view>
+					<view class="flex flex-wrap items-center gap-16rpx">
+						<view v-for="(tag, index) in form.tags" :key="index"
+							class="flex items-center rounded-20rpx bg-[#F6F7F8] px-20rpx py-8rpx">
+							<view class="mr-8rpx text-26rpx text-[#303133] leading-36rpx">
+								{{ tag }}
+							</view>
+							<wd-icon name="close" size="14px" color="#909399"
+								@click="StoreManage.handleRemoveTag(index)" />
+						</view>
+						<view v-if="form.tags.length < 2"
+							class="flex items-center border-2rpx border-[#E5E5E5] rounded-20rpx border-dashed px-20rpx py-8rpx"
+							@click="StoreManage.handleAddTag">
+							<wd-icon name="add" size="16px" color="#909399" class="mr-8rpx" />
+							<view class="text-26rpx text-[#909399] leading-36rpx">
+								添加标签
+							</view>
+						</view>
+					</view>
+				</view>
 
-        <!-- 团购视频 -->
-        <view class="mt-28rpx">
-          <view class="mb-28rpx flex items-center">
-            <view class="mr-10rpx text-32rpx text-[#303133] font-bold leading-44rpx">
-              团购视频
-            </view>
-          </view>
-          <view v-if="form.video" class="relative h-184rpx w-184rpx overflow-hidden rounded-16rpx">
-            <wd-img width="100%" height="100%" :src="form.video.thumb" mode="aspectFill" />
-            <view class="absolute inset-0 flex items-center justify-center">
-              <wd-icon name="play" size="48rpx" color="#fff" />
-            </view>
-            <view
-              class="absolute right-8rpx top-8rpx h-32rpx w-32rpx flex items-center justify-center rounded-full bg-black bg-opacity-50"
-              @click="StoreManage.handleRemoveVideo"
-            >
-              <wd-icon name="close" size="14px" color="#fff" />
-            </view>
-          </view>
-          <wd-upload
-            v-else
-            :file-list="[]"
-            :limit="1"
-            image-mode="scaleToFill"
-            accept="video"
-            :action="action"
-            @change="StoreManage.handleUploadVideo"
-          >
-            <view class="h-184rpx w-184rpx flex flex-col items-center justify-center border-2rpx border-[#E5E5E5] rounded-16rpx border-dashed">
-              <wd-img width="64rpx" height="64rpx" :src="`${OSS}icon/icon_video.png`" mode="aspectFill" />
-              <view class="mt-12rpx text-26rpx text-[#303133] font-400 leading-36rpx">
-                添加视频
-              </view>
-            </view>
-          </wd-upload>
-        </view>
+				<!-- 团购视频 -->
+				<view class="mt-28rpx">
+					<view class="mb-28rpx flex items-center">
+						<view class="mr-10rpx text-32rpx text-[#303133] font-bold leading-44rpx">
+							团购视频
+						</view>
+					</view>
+					<view v-if="form.video" class="relative h-184rpx w-184rpx overflow-hidden rounded-16rpx">
+						<wd-img width="100%" height="100%" :src="form.video.thumb" mode="aspectFill" />
+						<view class="absolute inset-0 flex items-center justify-center">
+							<wd-icon name="play" size="48rpx" color="#fff" />
+						</view>
+						<view
+							class="absolute right-8rpx top-8rpx h-32rpx w-32rpx flex items-center justify-center rounded-full bg-black bg-opacity-50"
+							@click="StoreManage.handleRemoveVideo">
+							<wd-icon name="close" size="14px" color="#fff" />
+						</view>
+					</view>
+					<wd-upload v-else :file-list="[]" :limit="1" image-mode="scaleToFill" accept="video"
+						:action="action" @change="StoreManage.handleUploadVideo">
+						<view
+							class="h-184rpx w-184rpx flex flex-col items-center justify-center border-2rpx border-[#E5E5E5] rounded-16rpx border-dashed">
+							<wd-img width="64rpx" height="64rpx" :src="`${OSS}icon/icon_video.png`" mode="aspectFill" />
+							<view class="mt-12rpx text-26rpx text-[#303133] font-400 leading-36rpx">
+								添加视频
+							</view>
+						</view>
+					</wd-upload>
+				</view>
 
-        <!-- 团购图片 -->
-        <view class="mt-28rpx">
-          <view class="mb-28rpx flex items-center justify-between">
-            <view class="flex items-center">
-              <view class="mr-10rpx text-32rpx text-[#303133] font-bold leading-44rpx">
-                团购图片
-              </view>
-              <view class="flex items-center">
-                <wd-img width="16rpx" height="16rpx" :src="`${OSS}icon/icon_validate.png`" />
-              </view>
-            </view>
-            <view class="text-26rpx text-[#9CA3AF] font-400 leading-36rpx">
-              可添加3~9张图片
-            </view>
-          </view>
-          <view class="flex flex-wrap items-center gap-16rpx">
-            <view
-              v-for="(image, index) in form.images"
-              :key="index"
-              class="relative h-184rpx w-184rpx overflow-hidden rounded-16rpx"
-            >
-              <wd-img width="100%" height="100%" :src="image" mode="aspectFill" />
-              <view
-                class="absolute right-8rpx top-8rpx h-32rpx w-32rpx flex items-center justify-center rounded-full bg-black bg-opacity-50"
-                @click="StoreManage.handleRemoveImage(index)"
-              >
-                <wd-icon name="close" size="14px" color="#fff" />
-              </view>
-            </view>
-            <wd-upload
-              v-if="form.images.length < 9"
-              :file-list="[]"
-              :limit="9 - form.images.length"
-              image-mode="scaleToFill"
-              accept="image"
-              :action="action"
-              @change="StoreManage.handleUploadImage"
-            >
-              <view class="h-184rpx w-184rpx flex flex-col items-center justify-center border-2rpx border-[#E5E5E5] rounded-16rpx border-dashed">
-                <wd-img width="64rpx" height="64rpx" :src="`${OSS}icon/icon_upload.png`" mode="aspectFill" />
-                <view class="mt-12rpx text-26rpx text-[#303133] font-400 leading-36rpx">
-                  添加图片
-                </view>
-              </view>
-            </wd-upload>
-          </view>
-        </view>
-      </view>
+				<!-- 团购图片 -->
+				<view class="mt-28rpx">
+					<view class="mb-28rpx flex items-center justify-between">
+						<view class="flex items-center">
+							<view class="mr-10rpx text-32rpx text-[#303133] font-bold leading-44rpx">
+								团购图片
+							</view>
+							<view class="flex items-center">
+								<wd-img width="16rpx" height="16rpx" :src="`${OSS}icon/icon_validate.png`" />
+							</view>
+						</view>
+						<view class="text-26rpx text-[#9CA3AF] font-400 leading-36rpx">
+							可添加3~9张图片
+						</view>
+					</view>
+					<view class="flex flex-wrap items-center gap-16rpx">
+						<view v-for="(image, index) in form.images" :key="index"
+							class="relative h-184rpx w-184rpx overflow-hidden rounded-16rpx">
+							<wd-img width="100%" height="100%" :src="image" mode="aspectFill" />
+							<view
+								class="absolute right-8rpx top-8rpx h-32rpx w-32rpx flex items-center justify-center rounded-full bg-black bg-opacity-50"
+								@click="StoreManage.handleRemoveImage(index)">
+								<wd-icon name="close" size="14px" color="#fff" />
+							</view>
+						</view>
+						<wd-upload v-if="form.images.length < 9" :file-list="[]" :limit="9 - form.images.length"
+							image-mode="scaleToFill" accept="image" :action="action"
+							@change="StoreManage.handleUploadImage">
+							<view
+								class="h-184rpx w-184rpx flex flex-col items-center justify-center border-2rpx border-[#E5E5E5] rounded-16rpx border-dashed">
+								<wd-img width="64rpx" height="64rpx" :src="`${OSS}icon/icon_upload.png`"
+									mode="aspectFill" />
+								<view class="mt-12rpx text-26rpx text-[#303133] font-400 leading-36rpx">
+									添加图片
+								</view>
+							</view>
+						</wd-upload>
+					</view>
+				</view>
+			</view>
 
-      <!-- 规格与价格 -->
-      <view v-if="tab === 1">
-        <view class="mb-30rpx text-34rpx text-[#303133] font-bold leading-48rpx">
-          规格与价格
-        </view>
+			<!-- 规格与价格 -->
+			<view v-if="tab === 1">
+				<view class="mb-30rpx text-34rpx text-[#303133] font-bold leading-48rpx">
+					规格与价格
+				</view>
 
-        <!-- 小时优惠价 -->
-        <view class="mb-28rpx">
-          <view class="mb-20rpx flex items-center">
-            <view class="mr-10rpx text-30rpx text-[#303133] font-bold leading-44rpx">
-              小时优惠价
-            </view>
-            <view class="flex items-center">
-              <wd-img width="16rpx" height="16rpx" :src="`${OSS}icon/icon_validate.png`" />
-            </view>
-          </view>
-          <wd-input
-            v-model="form.hourlyPrice"
-            no-border
-            placeholder="请输入小时优惠价"
-            type="digit"
-            custom-class="!bg-[#F6F7F8] !rounded-16rpx !px-28rpx !py-20rpx"
-          >
-            <template #prefix>
-              <view class="mr-8rpx text-28rpx text-[#303133]">
-                ¥
-              </view>
-            </template>
-          </wd-input>
-        </view>
+				<!-- 小时优惠价 -->
+				<view class="mb-28rpx">
+					<view class="mb-20rpx flex items-center">
+						<view class="mr-10rpx text-30rpx text-[#303133] font-bold leading-44rpx">
+							小时优惠价
+						</view>
+						<view class="flex items-center">
+							<wd-img width="16rpx" height="16rpx" :src="`${OSS}icon/icon_validate.png`" />
+						</view>
+					</view>
+					<wd-input v-model="form.hourlyPrice" no-border placeholder="请输入小时优惠价" type="digit"
+						custom-class="!bg-[#F6F7F8] !rounded-16rpx !px-28rpx !py-20rpx">
+						<template #prefix>
+							<view class="mr-8rpx text-28rpx text-[#303133]">
+								¥
+							</view>
+						</template>
+					</wd-input>
+				</view>
 
-        <!-- 起订时间 -->
-        <view class="mb-28rpx">
-          <view class="mb-20rpx flex items-center justify-between">
-            <view class="flex items-center">
-              <view class="mr-10rpx text-30rpx text-[#303133] font-bold leading-44rpx">
-                起订时间
-              </view>
-              <view class="flex items-center">
-                <wd-img width="16rpx" height="16rpx" :src="`${OSS}icon/icon_validate.png`" />
-              </view>
-            </view>
-            <view class="text-24rpx text-[#9CA3AF] font-400 leading-34rpx">
-              范围1~5
-            </view>
-          </view>
-          <view class="flex items-center">
-            <wd-input
-              v-model="form.minBookingTime"
-              no-border
-              placeholder="请输入起订时间"
-              type="number"
-              :max="5"
-              :min="1"
-              custom-class="!bg-[#F6F7F8] !rounded-16rpx !px-28rpx !py-20rpx"
-            />
-            <view class="ml-16rpx text-28rpx text-[#303133]">
-              小时
-            </view>
-          </view>
-        </view>
+				<!-- 起订时间 -->
+				<view class="mb-28rpx">
+					<view class="mb-20rpx flex items-center justify-between">
+						<view class="flex items-center">
+							<view class="mr-10rpx text-30rpx text-[#303133] font-bold leading-44rpx">
+								起订时间
+							</view>
+							<view class="flex items-center">
+								<wd-img width="16rpx" height="16rpx" :src="`${OSS}icon/icon_validate.png`" />
+							</view>
+						</view>
+						<view class="text-24rpx text-[#9CA3AF] font-400 leading-34rpx">
+							范围1~5
+						</view>
+					</view>
+					<view class="flex items-center">
+						<wd-input v-model="form.minBookingTime" no-border placeholder="请输入起订时间" type="number" :max="5"
+							:min="1" custom-class="!bg-[#F6F7F8] !rounded-16rpx !px-28rpx !py-20rpx" />
+						<view class="ml-16rpx text-28rpx text-[#303133]">
+							小时
+						</view>
+					</view>
+				</view>
 
-        <!-- 库存 -->
-        <view class="mb-28rpx">
-          <view class="mb-20rpx flex items-center justify-between">
-            <view class="flex items-center">
-              <view class="mr-10rpx text-30rpx text-[#303133] font-bold leading-44rpx">
-                库存
-              </view>
-              <view class="flex items-center">
-                <wd-img width="16rpx" height="16rpx" :src="`${OSS}icon/icon_validate.png`" />
-              </view>
-            </view>
-            <view class="text-24rpx text-[#9CA3AF] font-400 leading-34rpx">
-              输入范围1-999
-            </view>
-          </view>
-          <wd-input
-            v-model="form.inventory"
-            no-border
-            placeholder="请输入库存"
-            type="number"
-            :max="999"
-            :min="1"
-            custom-class="!bg-[#F6F7F8] !rounded-16rpx !px-28rpx !py-20rpx"
-          />
-        </view>
-      </view>
+				<!-- 库存 -->
+				<view class="mb-28rpx">
+					<view class="mb-20rpx flex items-center justify-between">
+						<view class="flex items-center">
+							<view class="mr-10rpx text-30rpx text-[#303133] font-bold leading-44rpx">
+								库存
+							</view>
+							<view class="flex items-center">
+								<wd-img width="16rpx" height="16rpx" :src="`${OSS}icon/icon_validate.png`" />
+							</view>
+						</view>
+						<view class="text-24rpx text-[#9CA3AF] font-400 leading-34rpx">
+							输入范围1-999
+						</view>
+					</view>
+					<wd-input v-model="form.inventory" no-border placeholder="请输入库存" type="number" :max="999" :min="1"
+						custom-class="!bg-[#F6F7F8] !rounded-16rpx !px-28rpx !py-20rpx" />
+				</view>
+			</view>
 
-      <!-- 套餐详情 -->
-      <view v-if="tab === 2">
-        <view class="mb-30rpx text-34rpx text-[#303133] font-bold leading-48rpx">
-          套餐详情
-        </view>
+			<!-- 套餐详情 -->
+			<view v-if="tab === 2">
+				<view class="mb-30rpx text-34rpx text-[#303133] font-bold leading-48rpx">
+					套餐详情
+				</view>
 
-        <!-- 套餐介绍 -->
-        <view class="add-textarea mb-28rpx">
-          <view class="mb-20rpx flex items-center justify-between">
-            <view class="flex items-center">
-              <view class="mr-10rpx text-30rpx text-[#303133] font-bold leading-44rpx">
-                套餐介绍
-              </view>
-              <view class="flex items-center">
-                <wd-img width="16rpx" height="16rpx" :src="`${OSS}icon/icon_validate.png`" />
-              </view>
-            </view>
-            <view class="text-24rpx text-[#9CA3AF] font-400 leading-34rpx">
-              每条内容之间需要换行输入
-            </view>
-          </view>
-          <wd-textarea
-            v-model="form.packageIntro"
-            custom-class="!rounded-18rpx !border-2rpx !border-[#EFF0EF] !bg-[#F8F9FA] !mt-20rpx"
-            custom-textarea-class="!bg-[#F8F9FA]"
-            placeholder="请输入套餐介绍，每条内容换行输入"
-          />
-        </view>
+				<!-- 套餐介绍 -->
+				<view class="add-textarea mb-28rpx">
+					<view class="mb-20rpx flex items-center justify-between">
+						<view class="flex items-center">
+							<view class="mr-10rpx text-30rpx text-[#303133] font-bold leading-44rpx">
+								套餐介绍
+							</view>
+							<view class="flex items-center">
+								<wd-img width="16rpx" height="16rpx" :src="`${OSS}icon/icon_validate.png`" />
+							</view>
+						</view>
+						<view class="text-24rpx text-[#9CA3AF] font-400 leading-34rpx">
+							每条内容之间需要换行输入
+						</view>
+					</view>
+					<wd-textarea v-model="form.packageIntro"
+						custom-class="!rounded-18rpx !border-2rpx !border-[#EFF0EF] !bg-[#F8F9FA] !mt-20rpx"
+						custom-textarea-class="!bg-[#F8F9FA]" placeholder="请输入套餐介绍，每条内容换行输入" />
+				</view>
 
-        <!-- 其他说明 -->
-        <view class="add-textarea mt-30rpx">
-          <view class="mb-20rpx flex items-center">
-            <view class="mr-10rpx text-30rpx text-[#303133] font-bold leading-44rpx">
-              其他说明
-            </view>
-          </view>
-          <wd-textarea
-            v-model="form.otherNotes"
-            custom-class="!rounded-18rpx !border-2rpx !border-[#EFF0EF] !bg-[#F8F9FA] !mt-20rpx"
-            custom-textarea-class="!bg-[#F8F9FA]"
-            placeholder="请输入其他说明"
-          />
-        </view>
-      </view>
+				<!-- 其他说明 -->
+				<view class="add-textarea mt-30rpx">
+					<view class="mb-20rpx flex items-center">
+						<view class="mr-10rpx text-30rpx text-[#303133] font-bold leading-44rpx">
+							其他说明
+						</view>
+					</view>
+					<wd-textarea v-model="form.otherNotes"
+						custom-class="!rounded-18rpx !border-2rpx !border-[#EFF0EF] !bg-[#F8F9FA] !mt-20rpx"
+						custom-textarea-class="!bg-[#F8F9FA]" placeholder="请输入其他说明" />
+				</view>
+			</view>
 
-      <!-- 购买须知 -->
-      <view v-if="tab === 3">
-        <view class="mb-30rpx text-34rpx text-[#303133] font-bold leading-48rpx">
-          购买须知
-        </view>
+			<!-- 购买须知 -->
+			<view v-if="tab === 3">
+				<view class="mb-30rpx text-34rpx text-[#303133] font-bold leading-48rpx">
+					购买须知
+				</view>
 
-        <!-- 使用人数 -->
-        <view class="mb-28rpx">
-          <view class="mb-20rpx flex items-center">
-            <view class="mr-10rpx text-30rpx text-[#303133] font-bold leading-44rpx">
-              使用人数
-            </view>
-            <view class="flex items-center">
-              <wd-img width="16rpx" height="16rpx" :src="`${OSS}icon/icon_validate.png`" />
-            </view>
-          </view>
-          <wd-input
-            v-model="form.userCount"
-            no-border
-            placeholder="建议4~6人使用"
-            custom-class="!bg-[#F6F7F8] !rounded-16rpx !px-28rpx !py-20rpx"
-          />
-        </view>
+				<!-- 使用人数 -->
+				<view class="mb-28rpx">
+					<view class="mb-20rpx flex items-center">
+						<view class="mr-10rpx text-30rpx text-[#303133] font-bold leading-44rpx">
+							使用人数
+						</view>
+						<view class="flex items-center">
+							<wd-img width="16rpx" height="16rpx" :src="`${OSS}icon/icon_validate.png`" />
+						</view>
+					</view>
+					<wd-input v-model="form.userCount" no-border placeholder="建议4~6人使用"
+						custom-class="!bg-[#F6F7F8] !rounded-16rpx !px-28rpx !py-20rpx" />
+				</view>
 
-        <!-- 退改说明 -->
-        <view class="add-textarea mt-28rpx">
-          <view class="mb-20rpx flex items-center">
-            <view class="mr-10rpx text-32rpx text-[#303133] font-bold leading-44rpx">
-              退改说明
-            </view>
-            <view class="flex items-center">
-              <wd-img width="16rpx" height="16rpx" :src="`${OSS}icon/icon_validate.png`" />
-            </view>
-          </view>
-          <wd-textarea
-            v-model="form.refundPolicy"
-            custom-class="!rounded-18rpx !border-2rpx !border-[#EFF0EF] !bg-[#F8F9FA] !mt-20rpx"
-            custom-textarea-class="!bg-[#F8F9FA]"
-            placeholder="请输入退改说明"
-          />
-        </view>
-      </view>
-    </view>
+				<!-- 退改说明 -->
+				<view class="add-textarea mt-28rpx">
+					<view class="mb-20rpx flex items-center">
+						<view class="mr-10rpx text-32rpx text-[#303133] font-bold leading-44rpx">
+							退改说明
+						</view>
+						<view class="flex items-center">
+							<wd-img width="16rpx" height="16rpx" :src="`${OSS}icon/icon_validate.png`" />
+						</view>
+					</view>
+					<wd-textarea v-model="form.refundPolicy"
+						custom-class="!rounded-18rpx !border-2rpx !border-[#EFF0EF] !bg-[#F8F9FA] !mt-20rpx"
+						custom-textarea-class="!bg-[#F8F9FA]" placeholder="请输入退改说明" />
+				</view>
+			</view>
+		</view>
 
-    <!-- 底部保存按钮 -->
-    <view class="fixed bottom-0 left-0 right-0 h-152rpx bg-white">
-      <view class="mt-34rpx flex items-center justify-center">
-        <wd-button
-          custom-class="!text-32rpx !w-630rpx !h-90rpx !bg-[#4C9F44] !rounded-8rpx !text-[#fff]"
-          @click="StoreManage.handleSave"
-        >
-          保存
-        </wd-button>
-      </view>
-    </view>
+		<!-- 底部保存按钮 -->
+		<view class="fixed bottom-0 left-0 right-0 h-152rpx bg-white">
+			<view class="mt-34rpx flex items-center justify-center">
+				<wd-button custom-class="!text-32rpx !w-630rpx !h-90rpx !bg-[#4C9F44] !rounded-8rpx !text-[#fff]"
+					@click="StoreManage.handleSave">
+					保存
+				</wd-button>
+			</view>
+		</view>
 
-    <!-- 选择标签弹窗 -->
-    <wd-popup
-      v-model="showTagSelectPopup"
-      lock-scroll
-      custom-style="border-radius: 32rpx 32rpx 0rpx 0rpx;"
-      position="bottom"
-      @close="StoreManage.handleCloseTagSelect"
-    >
-      <view class="relative bg-white px-30rpx pb-56rpx pt-50rpx">
-        <!-- 关闭按钮 -->
-        <view class="absolute right-30rpx top-18rpx" @click="StoreManage.handleCloseTagSelect">
-          <wd-icon name="close" size="20px" color="#C0C4CC" />
-        </view>
+		<!-- 选择标签弹窗 -->
+		<wd-popup v-model="showTagSelectPopup" lock-scroll custom-style="border-radius: 32rpx 32rpx 0rpx 0rpx;"
+			position="bottom" @close="StoreManage.handleCloseTagSelect">
+			<view class="relative bg-white px-30rpx pb-56rpx pt-50rpx">
+				<!-- 关闭按钮 -->
+				<view class="absolute right-30rpx top-18rpx" @click="StoreManage.handleCloseTagSelect">
+					<wd-icon name="close" size="20px" color="#C0C4CC" />
+				</view>
 
-        <!-- 标题 -->
-        <view class="mb-40rpx text-center text-36rpx text-[#121212] leading-50rpx">
-          选择标签
-        </view>
+				<!-- 标题 -->
+				<view class="mb-40rpx text-center text-36rpx text-[#121212] leading-50rpx">
+					选择标签
+				</view>
 
-        <!-- 我的标签标题和管理/退出管理 -->
-        <view class="mb-20rpx flex items-center justify-between">
-          <view class="text-32rpx text-[#303133] font-bold leading-44rpx">
-            我的标签
-          </view>
-          <view
-            class="text-28rpx text-[#4C9F44] leading-40rpx"
-            @click="isTagManageMode ? StoreManage.handleExitManagement() : StoreManage.handleEnterManagement()"
-          >
-            {{ isTagManageMode ? '退出管理' : '管理' }}
-          </view>
-        </view>
+				<!-- 我的标签标题和管理/退出管理 -->
+				<view class="mb-20rpx flex items-center justify-between">
+					<view class="text-32rpx text-[#303133] font-bold leading-44rpx">
+						我的标签
+					</view>
+					<view class="text-28rpx text-[#4C9F44] leading-40rpx"
+						@click="isTagManageMode ? StoreManage.handleExitManagement() : StoreManage.handleEnterManagement()">
+						{{ isTagManageMode ? '退出管理' : '管理' }}
+					</view>
+				</view>
 
-        <!-- 说明文字 -->
-        <view class="mb-28rpx text-24rpx text-[#9CA3AF] leading-34rpx">
-          可选择1~2个标签, 每个标签不超过5个字
-        </view>
+				<!-- 说明文字 -->
+				<view class="mb-28rpx text-24rpx text-[#9CA3AF] leading-34rpx">
+					可选择1~2个标签, 每个标签不超过5个字
+				</view>
 
-        <!-- 标签列表 -->
-        <view class="flex flex-wrap gap-16rpx">
-          <view
-            v-for="tag in availableTags"
-            :key="tag"
-            class="flex items-center rounded-20rpx px-20rpx py-8rpx"
-            :class="selectedTags.includes(tag) ? 'bg-[#4C9F44]' : 'bg-[#F6F7F8]'"
-            @click="StoreManage.handleSelectTag(tag)"
-          >
-            <view
-              class="text-26rpx leading-36rpx"
-              :class="selectedTags.includes(tag) ? 'text-[#fff]' : 'text-[#303133]'"
-              :style="{ marginRight: isTagManageMode ? '8rpx' : '0' }"
-            >
-              {{ tag }}
-            </view>
-            <wd-icon
-              v-if="isTagManageMode"
-              name="close-circle-filled"
-              size="14px"
-              :color="selectedTags.includes(tag) ? '#fff' : '#909399'"
-              @click.stop="StoreManage.handleRemoveTagFromList(tag, $event)"
-            />
-          </view>
-          <!-- 新建标签按钮 -->
-          <view
-            v-if="!isTagManageMode"
-            class="flex items-center border-2rpx border-[#E5E5E5] rounded-20rpx border-dashed px-20rpx py-8rpx"
-            @click="StoreManage.handleShowCreateTag"
-          >
-            <wd-icon name="add" size="16px" color="#909399" class="mr-8rpx" />
-            <view class="text-26rpx text-[#909399] leading-36rpx">
-              新建标签
-            </view>
-          </view>
-        </view>
+				<!-- 标签列表 -->
+				<view class="flex flex-wrap gap-16rpx">
+					<view v-for="tag in availableTags" :key="tag"
+						class="flex items-center rounded-20rpx px-20rpx py-8rpx"
+						:class="selectedTags.includes(tag) ? 'bg-[#4C9F44]' : 'bg-[#F6F7F8]'"
+						@click="StoreManage.handleSelectTag(tag)">
+						<view class="text-26rpx leading-36rpx"
+							:class="selectedTags.includes(tag) ? 'text-[#fff]' : 'text-[#303133]'"
+							:style="{ marginRight: isTagManageMode ? '8rpx' : '0' }">
+							{{ tag }}
+						</view>
+						<wd-icon v-if="isTagManageMode" name="close-circle-filled" size="14px"
+							:color="selectedTags.includes(tag) ? '#fff' : '#909399'"
+							@click.stop="StoreManage.handleRemoveTagFromList(tag, $event)" />
+					</view>
+					<!-- 新建标签按钮 -->
+					<view v-if="!isTagManageMode"
+						class="flex items-center border-2rpx border-[#E5E5E5] rounded-20rpx border-dashed px-20rpx py-8rpx"
+						@click="StoreManage.handleShowCreateTag">
+						<wd-icon name="add" size="16px" color="#909399" class="mr-8rpx" />
+						<view class="text-26rpx text-[#909399] leading-36rpx">
+							新建标签
+						</view>
+					</view>
+				</view>
 
-        <!-- 确认按钮 -->
-        <view
-          class="mt-40rpx h-90rpx rounded-8rpx bg-[#4C9F44] text-center text-30rpx text-[#fff] leading-90rpx"
-          :class="{ 'opacity-0 pointer-events-none': isTagManageMode }"
-          @click="StoreManage.handleConfirmTags"
-        >
-          确认
-        </view>
-      </view>
-    </wd-popup>
+				<!-- 确认按钮 -->
+				<view
+					class="mt-40rpx h-90rpx rounded-8rpx bg-[#4C9F44] text-center text-30rpx text-[#fff] leading-90rpx"
+					:class="{ 'opacity-0 pointer-events-none': isTagManageMode }"
+					@click="StoreManage.handleConfirmTags">
+					确认
+				</view>
+			</view>
+		</wd-popup>
 
-    <!-- 新建标签弹窗 -->
-    <wd-popup
-      v-model="showCreateTagPopup"
-      lock-scroll
-      custom-style="border-radius: 32rpx 32rpx 0rpx 0rpx;"
-      position="bottom"
-      @close="StoreManage.handleCloseCreateTag"
-    >
-      <view class="relative bg-white px-30rpx pb-78rpx pt-50rpx">
-        <!-- 导航栏 -->
-        <view class="mb-40rpx flex items-center justify-between">
-          <view class="flex items-center" @click="StoreManage.handleCloseCreateTag">
-            <wd-icon name="arrow-left" size="20px" color="#303133" />
-          </view>
-          <view class="text-center text-36rpx text-[#121212] leading-50rpx">
-            新建标签
-          </view>
-          <view class="flex items-center" @click="StoreManage.handleCloseCreateTag">
-            <wd-icon name="close" size="20px" color="#C0C4CC" />
-          </view>
-        </view>
+		<!-- 新建标签弹窗 -->
+		<wd-popup v-model="showCreateTagPopup" lock-scroll custom-style="border-radius: 32rpx 32rpx 0rpx 0rpx;"
+			position="bottom" @close="StoreManage.handleCloseCreateTag">
+			<view class="relative bg-white px-30rpx pb-78rpx pt-50rpx">
+				<!-- 导航栏 -->
+				<view class="mb-40rpx flex items-center justify-between">
+					<view class="flex items-center" @click="StoreManage.handleCloseCreateTag">
+						<wd-icon name="arrow-left" size="20px" color="#303133" />
+					</view>
+					<view class="text-center text-36rpx text-[#121212] leading-50rpx">
+						新建标签
+					</view>
+					<view class="flex items-center" @click="StoreManage.handleCloseCreateTag">
+						<wd-icon name="close" size="20px" color="#C0C4CC" />
+					</view>
+				</view>
 
-        <!-- 输入框 -->
-        <view class="mb-40rpx">
-          <wd-input
-            v-model="newTagName"
-            no-border
-            placeholder="标签名称"
-            :maxlength="5"
-            custom-class="!bg-[#F6F7F8] !rounded-16rpx !px-28rpx !py-20rpx"
-          />
-        </view>
+				<!-- 输入框 -->
+				<view class="mb-40rpx">
+					<wd-input v-model="newTagName" no-border placeholder="标签名称" :maxlength="5"
+						custom-class="!bg-[#F6F7F8] !rounded-16rpx !px-28rpx !py-20rpx" />
+				</view>
 
-        <!-- 完成按钮 -->
-        <view
-          class="h-90rpx rounded-8rpx bg-[#4C9F44] text-center text-30rpx text-[#fff] leading-90rpx"
-          @click="StoreManage.handleCompleteCreateTag"
-        >
-          完成
-        </view>
-      </view>
-    </wd-popup>
-  </view>
+				<!-- 完成按钮 -->
+				<view class="h-90rpx rounded-8rpx bg-[#4C9F44] text-center text-30rpx text-[#fff] leading-90rpx"
+					@click="StoreManage.handleCompleteCreateTag">
+					完成
+				</view>
+			</view>
+		</wd-popup>
+	</view>
 </template>
 
 <style lang="scss">
 page {
-  background: #f6f7f8;
+	background: #f6f7f8;
 }
 
 .store-tabs {
-  :deep() {
-    .wd-tabs__line {
-      background-color: #4c9f44 !important;
-    }
-  }
+	:deep() {
+		.wd-tabs__line {
+			background-color: #4c9f44 !important;
+		}
+	}
 }
 
 .add-textarea {
-  :deep() {
-    .wd-textarea__value,
-    .wd-textarea__count {
-      background: transparent !important;
-    }
-  }
+	:deep() {
+
+		.wd-textarea__value,
+		.wd-textarea__count {
+			background: transparent !important;
+		}
+	}
 }
 </style>
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 @@
-<route lang="jsonc" type="page">
-{
-  "layout": "default",
-  "style": {
-    "navigationStyle": "custom"
-  }
-}
-</route>
+<route lang="jsonc" type="page">{
+    "layout": "default",
+    "style": {
+        "navigationStyle": "custom"
+    }
+}</route>
 
 <script lang="ts" setup>
 import { router } from '@/utils/tools'
@@ -15,177 +13,169 @@ const navbarHeight = inject('navbarHeight')
 
 // 房间状态枚举
 enum RoomStatus {
-  AVAILABLE = 'available', // 空闲中 - 绿色
-  CLEANING = 'cleaning', // 待打扫 - 蓝色/橙色
-  MAINTENANCE = 'maintenance', // 维护中 - 红色
-  IN_USE = 'in_use', // 使用中 - 蓝色
+    AVAILABLE = 'available', // 空闲中 - 绿色
+    CLEANING = 'cleaning', // 待打扫 - 蓝色/橙色
+    MAINTENANCE = 'maintenance', // 维护中 - 红色
+    IN_USE = 'in_use', // 使用中 - 蓝色
 }
 
 // 房间状态配置
 const statusConfig = {
-  [RoomStatus.AVAILABLE]: {
-    text: '空闲中',
-    color: '#4C9F44', // 绿色
-  },
-  [RoomStatus.CLEANING]: {
-    text: '待打扫',
-    color: '#F29747', // 蓝色
-  },
-  [RoomStatus.MAINTENANCE]: {
-    text: '维护中',
-    color: '#F65353', // 红色
-  },
-  [RoomStatus.IN_USE]: {
-    text: '使用中',
-    color: '#1890FF', // 蓝色
-  },
+    [RoomStatus.AVAILABLE]: {
+        text: '空闲中',
+        color: '#4C9F44', // 绿色
+    },
+    [RoomStatus.CLEANING]: {
+        text: '待打扫',
+        color: '#F29747', // 蓝色
+    },
+    [RoomStatus.MAINTENANCE]: {
+        text: '维护中',
+        color: '#F65353', // 红色
+    },
+    [RoomStatus.IN_USE]: {
+        text: '使用中',
+        color: '#1890FF', // 蓝色
+    },
 }
 
 // Mock 房间数据
 const roomList = ref([
-  {
-    id: 1,
-    name: '对月',
-    type: '榻榻米',
-    image: `${OSS}images/room1.jpg`, // Mock图片，实际需要替换
-    status: RoomStatus.AVAILABLE,
-  },
-  {
-    id: 2,
-    name: '听雨',
-    type: '榻榻米',
-    image: `${OSS}images/room2.jpg`,
-    status: RoomStatus.CLEANING,
-  },
-  {
-    id: 3,
-    name: '观星',
-    type: '榻榻米',
-    image: `${OSS}images/room3.jpg`,
-    status: RoomStatus.MAINTENANCE,
-  },
-  {
-    id: 4,
-    name: '品茶',
-    type: '榻榻米',
-    image: `${OSS}images/room4.jpg`,
-    status: RoomStatus.CLEANING,
-  },
-  {
-    id: 5,
-    name: '静心',
-    type: '榻榻米',
-    image: `${OSS}images/room5.jpg`,
-    status: RoomStatus.IN_USE,
-  },
+    {
+        id: 1,
+        name: '对月',
+        type: '榻榻米',
+        image: `${OSS}images/room1.jpg`, // Mock图片，实际需要替换
+        status: RoomStatus.AVAILABLE,
+    },
+    {
+        id: 2,
+        name: '听雨',
+        type: '榻榻米',
+        image: `${OSS}images/room2.jpg`,
+        status: RoomStatus.CLEANING,
+    },
+    {
+        id: 3,
+        name: '观星',
+        type: '榻榻米',
+        image: `${OSS}images/room3.jpg`,
+        status: RoomStatus.MAINTENANCE,
+    },
+    {
+        id: 4,
+        name: '品茶',
+        type: '榻榻米',
+        image: `${OSS}images/room4.jpg`,
+        status: RoomStatus.CLEANING,
+    },
+    {
+        id: 5,
+        name: '静心',
+        type: '榻榻米',
+        image: `${OSS}images/room5.jpg`,
+        status: RoomStatus.IN_USE,
+    },
 ])
 
 const RoomManage = {
-  /**
-   * 点击房间卡片
-   */
-  handleClickRoom: (room: any) => {
-    router.navigateTo(`/pages/store/room-detail?id=${room.id}`)
-  },
+    /**
+     * 点击房间卡片
+     */
+    handleClickRoom: (room: any) => {
+        router.navigateTo(`/bundle/tea-room/detail?id=${room.id}`)
+    },
 
-  /**
-   * 点击编辑房间图片
-   */
-  handleEditImage: (room: any, event: any) => {
-    // event.stopPropagation()
-    // TODO: 实现编辑房间图片功能
-    console.log('编辑房间图片:', room.id)
-    router.navigateTo(`/pages/store/room-detail?id=${room.id}`)
-  },
+    /**
+     * 点击编辑房间图片
+     */
+    handleEditImage: (room: any, event: any) => {
+        // event.stopPropagation()
+        // TODO: 实现编辑房间图片功能
+        console.log('编辑房间图片:', room.id)
+        router.navigateTo(`/pages/store/room-detail?id=${room.id}`)
+    },
 
-  /**
-   * 点击更多选项
-   */
-  handleMore: () => {
-    // TODO: 实现更多选项功能
-    console.log('更多选项')
-  },
+    /**
+     * 点击更多选项
+     */
+    handleMore: () => {
+        // TODO: 实现更多选项功能
+        console.log('更多选项')
+    },
 
-  /**
-   * 点击目标图标
-   */
-  handleTarget: () => {
-    // TODO: 实现目标功能
-    console.log('目标功能')
-  },
+    /**
+     * 点击目标图标
+     */
+    handleTarget: () => {
+        // TODO: 实现目标功能
+        console.log('目标功能')
+    },
 }
 
 /**
  * 获取状态配置
  */
 function getStatusConfig(status: RoomStatus) {
-  return statusConfig[status] || statusConfig[RoomStatus.AVAILABLE]
+    return statusConfig[status] || statusConfig[RoomStatus.AVAILABLE]
 }
 </script>
 
 <template>
-  <view>
-    <!-- 导航栏 -->
     <view>
-      <navbar title="包间管理" custom-class="!bg-white" />
-    </view>
-
-    <!-- 房间列表 -->
-    <view class="px-30rpx pb-40rpx pt-30rpx">
-      <view class="grid grid-cols-2 gap-24rpx">
-        <view
-          v-for="room in roomList"
-          :key="room.id"
-          class="flex flex-col overflow-hidden rounded-16rpx bg-white"
-          @click="RoomManage.handleClickRoom(room)"
-        >
-          <!-- 房间图片 -->
-          <view class="relative aspect-[4/3] w-full">
-            <wd-img width="100%" height="100%" :src="room.image" mode="aspectFill" />
-            <!-- 编辑图标覆盖层 -->
-            <view
-              class="absolute right-16rpx top-16rpx h-48rpx w-48rpx flex items-center justify-center rounded-24rpx bg-black bg-opacity-40"
-              @click.stop="RoomManage.handleEditImage(room, $event)"
-            >
-              <wd-icon name="edit" size="16px" color="#fff" />
-            </view>
-          </view>
-
-          <!-- 房间信息 -->
-          <view class="flex flex-col p-24rpx">
-            <!-- 房间名称 -->
-            <view class="mb-0rpx text-center text-28rpx text-[#303133] leading-40rpx">
-              {{ room.name }} ({{ room.type }})
-            </view>
-
-            <!-- 状态指示器 -->
-            <view class="flex items-baseline justify-center align-middle">
-              <!-- 状态点 -->
-              <view
-                class="mr-8rpx h-12rpx w-12rpx flex-shrink-0 rounded-full"
-                :style="{ backgroundColor: getStatusConfig(room.status).color }"
-              />
-              <!-- 状态文字 -->
-              <view
-                class="text-24rpx text-[#303133] leading-34rpx"
-                :style="{ color: getStatusConfig(room.status).color }"
-              >
-                {{ getStatusConfig(room.status).text }}
-              </view>
-              <!-- 右箭头 -->
-              <view class="ml-8rpx">
-                <wd-icon name="arrow-right" size="12px" :color="getStatusConfig(room.status).color" />
-              </view>
-            </view>
-          </view>
+        <!-- 导航栏 -->
+        <view>
+            <navbar title="包间管理" custom-class="!bg-white" />
+        </view>
+
+        <!-- 房间列表 -->
+        <view class="px-30rpx pb-40rpx pt-30rpx">
+            <view class="grid grid-cols-2 gap-24rpx">
+                <view v-for="room in roomList" :key="room.id"
+                    class="flex flex-col overflow-hidden rounded-16rpx bg-white"
+                    @click="RoomManage.handleClickRoom(room)">
+                    <!-- 房间图片 -->
+                    <view class="relative aspect-[4/3] w-full">
+                        <wd-img width="100%" height="100%" :src="room.image" mode="aspectFill" />
+                        <!-- 编辑图标覆盖层 -->
+                        <view
+                            class="absolute right-16rpx top-16rpx h-48rpx w-48rpx flex items-center justify-center rounded-24rpx bg-black bg-opacity-40"
+                            @click.stop="RoomManage.handleEditImage(room, $event)">
+                            <wd-icon name="edit" size="16px" color="#fff" />
+                        </view>
+                    </view>
+
+                    <!-- 房间信息 -->
+                    <view class="flex flex-col p-24rpx">
+                        <!-- 房间名称 -->
+                        <view class="mb-0rpx text-center text-28rpx text-[#303133] leading-40rpx">
+                            {{ room.name }} ({{ room.type }})
+                        </view>
+
+                        <!-- 状态指示器 -->
+                        <view class="flex items-baseline justify-center align-middle">
+                            <!-- 状态点 -->
+                            <view class="mr-8rpx h-12rpx w-12rpx flex-shrink-0 rounded-full"
+                                :style="{ backgroundColor: getStatusConfig(room.status).color }" />
+                            <!-- 状态文字 -->
+                            <view class="text-24rpx text-[#303133] leading-34rpx"
+                                :style="{ color: getStatusConfig(room.status).color }">
+                                {{ getStatusConfig(room.status).text }}
+                            </view>
+                            <!-- 右箭头 -->
+                            <view class="ml-8rpx">
+                                <wd-icon name="arrow-right" size="12px" :color="getStatusConfig(room.status).color" />
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
         </view>
-      </view>
     </view>
-  </view>
 </template>
 
 <style lang="scss">
 page {
-  background: #f6f7f8;
+    background: #f6f7f8;
 }
 </style>
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 @@
-<route lang="jsonc" type="page">
-{
-  "layout": "tabbar",
-  "style": {
-    "navigationStyle": "custom"
-  }
-}
-</route>
+<route lang="jsonc" type="page">{
+	"layout": "tabbar",
+	"style": {
+		"navigationStyle": "custom"
+	}
+}</route>
 
 <script lang="ts" setup>
 import { router } from '@/utils/tools'
-import bookroomImg from './img/bookroom.png'
-import deviceImg from './img/device.png'
-import renewImg from './img/renew.png'
-import roomImg from './img/room.png'
 
 const OSS = inject('OSS')
 const navbarHeight = inject('navbarHeight')
 
-// 本地图片资源
-const roomIcon = roomImg as string
-const deviceIcon = deviceImg as string
-const bookroomIcon = bookroomImg as string
-const renewIcon = renewImg as string
-
+console.log(`${OSS}/images/store/store/room.png`)
 // 功能卡片数据
 const storeMenus = ref([
-  {
-    id: 1,
-    title: '包间管理',
-    icon: roomIcon,
-    path: '/pages/store/room-manage',
-  },
-  {
-    id: 2,
-    title: '设备控制',
-    icon: deviceIcon,
-    path: '/pages/store/device',
-  },
-  {
-    id: 3,
-    title: '包间预定',
-    icon: bookroomIcon,
-    path: '/pages/store/bookroom',
-  },
-  {
-    id: 4,
-    title: '订单续订',
-    icon: renewIcon,
-    path: '/pages/store/renew',
-  },
+	{
+		id: 1,
+		title: '包间管理',
+		icon: `${OSS}images/store/store/room.png`,
+		path: '/pages/store/room-manage',
+	},
+	{
+		id: 2,
+		title: '设备控制',
+		icon: `${OSS}images/store/store/device.png`,
+		path: '/pages/store/device',
+	},
+	{
+		id: 3,
+		title: '包间预定',
+		icon: `${OSS}images/store/store/bookroom.png`,
+		path: '/pages/store/reserve',
+	},
+	{
+		id: 4,
+		title: '订单续订',
+		icon: `${OSS}images/store/store/renew.png`,
+		path: '/pages/store/renew',
+	},
 ])
 
 const Store = {
-  /**
-   * 点击功能卡片
-   */
-  handleClickMenu: (item: any) => {
-    router.navigateTo(item.path)
-  },
+	/**
+	 * 点击功能卡片
+	 */
+	handleClickMenu: (item: any) => {
+		router.navigateTo(item.path)
+	},
 
-  /**
-   * 点击更多选项
-   */
-  handleMore: () => {
-    // TODO: 实现更多选项功能
-    console.log('更多选项')
-  },
+	/**
+	 * 点击更多选项
+	 */
+	handleMore: () => {
+		// TODO: 实现更多选项功能
+		console.log('更多选项')
+	},
+
+	/**
+	 * 点击目标图标
+	 */
+	handleTarget: () => {
+		// TODO: 实现目标功能
+		console.log('目标功能')
+	},
 
-  /**
-   * 点击目标图标
-   */
-  handleTarget: () => {
-    // TODO: 实现目标功能
-    console.log('目标功能')
-  },
 }
 </script>
 
 <template>
-  <view>
-    <!-- 导航栏 -->
-    <view>
-      <navbar title="门店管理" custom-class="!bg-white" />
-    </view>
+	<view>
+		<!-- 导航栏 -->
+		<view>
+			<navbar title="门店管理" custom-class="!bg-white" />
+		</view>
 
-    <!-- 功能卡片网格 -->
-    <view class="px-30rpx pt-40rpx">
-      <view class="grid grid-cols-2 gap-30rpx">
-        <view
-          v-for="item in storeMenus"
-          :key="item.id"
-          class="flex flex-col items-center rounded-16rpx bg-white p-40rpx"
-          @click="Store.handleClickMenu(item)"
-        >
-          <!-- 图标区域 -->
-          <view class="mb-24rpx h-160rpx w-160rpx flex items-center justify-center rounded-16rpx bg-[#F0F9FF]">
-            <wd-img width="120rpx" height="120rpx" :src="item.icon" mode="aspectFit" />
-          </view>
-          <!-- 标题 -->
-          <view class="text-30rpx text-[#303133] leading-42rpx">
-            {{ item.title }}
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
+		<!-- 功能卡片网格 -->
+		<view class="px-30rpx pt-40rpx">
+			<view class="grid grid-cols-2 gap-30rpx">
+				<view v-for="item in storeMenus" :key="item.id"
+					class="flex flex-col items-center rounded-16rpx bg-white p-40rpx"
+					@click="Store.handleClickMenu(item)">
+					<!-- 图标区域 -->
+					<view
+						class="mb-24rpx h-160rpx w-160rpx flex items-center justify-center rounded-16rpx bg-[#F0F9FF]">
+						<wd-img width="120rpx" height="120rpx" :src="item.icon" mode="aspectFit" />
+					</view>
+					<!-- 标题 -->
+					<view class="text-30rpx text-[#303133] leading-42rpx">
+						{{ item.title }}
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
 </template>
 
 <style lang="scss">
-page {
-  background: #f6f7f8;
-}
+	page {
+		background-color: $cz-page-background;
+	}
 </style>
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, string> = {
     [OrderSource.TeaRoom]: '茶室',
     [OrderSource.TeaSpecialist]: '茶艺师',
     [OrderSource.SetMeal]: '套餐管理',
+    [OrderSource.Admin]: '管理员',
 }
 
 // 订单状态
@@ -317,3 +319,22 @@ export const TeaRoomPackageOrderStatusTextValue: Record<TeaRoomPackageOrderStatu
         title: '售后完成'
     },
 }
+
+
+// 管理员-订单管理状态
+export enum AdminOrderStatus {
+    ToUse = 0,        // 待使用
+    Consuming = 1,// 使用中
+    Finished = 2,  // 已完成
+    Cancelled = 3,  // 取消订单
+}
+
+// 管理员-订单状态文本
+export enum AdminOrderStatusText {
+    All = 'all',      // 全部
+    ToUse = 'toUse',        // 待使用
+    Consuming = 'consuming',// 使用中
+    Finished = 'finished',  // 已完成
+    Cancelled = 'cancelled',    // 已取消
+}
+