From a923ca9d9cf1ff38375bb3f5cb2115cb7729247b Mon Sep 17 00:00:00 2001 From: wangxiaowei <1121133807@qq.com> Date: Fri, 30 Jan 2026 01:14:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/bundle/account/switch.vue | 3 +- src/bundle/parten/pages/bank-card/add.vue | 6 +- src/bundle/profile/change-mobile.vue | 8 +- src/bundle/profile/change-password.vue | 8 +- src/bundle/settle-in/parten.vue | 8 +- src/bundle/settle-in/tea-room.vue | 8 +- src/bundle/settle-in/tea-specialist.vue | 8 +- src/bundle/store/edit-store.vue | 28 +----- src/bundle/tea-room/detail.vue | 12 ++- src/pages/index/index.vue | 13 ++- src/pages/login/mobile.vue | 8 +- src/pages/login/password.vue | 8 +- src/pages/store/room-detail.vue | 7 +- src/pages/store/store.vue | 107 +++++++++++----------- src/store/store.ts | 2 + 15 files changed, 100 insertions(+), 134 deletions(-) diff --git a/src/bundle/account/switch.vue b/src/bundle/account/switch.vue index 015b283..f7036de 100644 --- a/src/bundle/account/switch.vue +++ b/src/bundle/account/switch.vue @@ -60,7 +60,8 @@ useStore.setDefaultStore({ id: item.id, name: item.name, - index + index, + operationType: item.operation_type }) // 跳转首页 diff --git a/src/bundle/parten/pages/bank-card/add.vue b/src/bundle/parten/pages/bank-card/add.vue index ad40822..b64a8d3 100644 --- a/src/bundle/parten/pages/bank-card/add.vue +++ b/src/bundle/parten/pages/bank-card/add.vue @@ -195,9 +195,9 @@ await getVerificationCode({ scene: SMS_ENUM.BANK, mobile: String(form.mobile) }) startCountDown.value = true - nextTick(() => { - countDown.value?.start() - }) + setTimeout(() => { + countDown.value.start() + }, 100) }, /** diff --git a/src/bundle/profile/change-mobile.vue b/src/bundle/profile/change-mobile.vue index a8d2af8..0534676 100644 --- a/src/bundle/profile/change-mobile.vue +++ b/src/bundle/profile/change-mobile.vue @@ -152,11 +152,9 @@ await getVerificationCode({ scene: SMS_ENUM.BGSJHM, mobile: String(model.mobile)}) startCountDown.value = true - nextTick(() => { - countDown.value?.start() - - // 发送验证码请求 - }) + setTimeout(() => { + countDown.value.start() + }, 100) }, // 验证码倒计时结束 diff --git a/src/bundle/profile/change-password.vue b/src/bundle/profile/change-password.vue index 0fb8783..2a5d33c 100644 --- a/src/bundle/profile/change-password.vue +++ b/src/bundle/profile/change-password.vue @@ -125,11 +125,9 @@ await getVerificationCode({ scene: SMS_ENUM.ZHDLMM, mobile: String(model.mobile)}) startCountDown.value = true - nextTick(() => { - countDown.value?.start() - - // 发送验证码请求 - }) + setTimeout(() => { + countDown.value.start() + }, 100) }, // 验证码倒计时结束 diff --git a/src/bundle/settle-in/parten.vue b/src/bundle/settle-in/parten.vue index 8be59bb..7ae2722 100644 --- a/src/bundle/settle-in/parten.vue +++ b/src/bundle/settle-in/parten.vue @@ -184,11 +184,9 @@ // 发送验证码 handleCountDown: () => { startCountDown.value = true - nextTick(() => { - countDown.value?.start() - - // 发送验证码请求 - }) + setTimeout(() => { + countDown.value.start() + }, 100) }, // 验证码倒计时结束 diff --git a/src/bundle/settle-in/tea-room.vue b/src/bundle/settle-in/tea-room.vue index cbe6a3d..5d28b8d 100644 --- a/src/bundle/settle-in/tea-room.vue +++ b/src/bundle/settle-in/tea-room.vue @@ -232,11 +232,9 @@ // 发送验证码 handleCountDown: () => { startCountDown.value = true - nextTick(() => { - countDown.value?.start() - - // 发送验证码请求 - }) + setTimeout(() => { + countDown.value.start() + }, 100) }, // 验证码倒计时结束 diff --git a/src/bundle/settle-in/tea-specialist.vue b/src/bundle/settle-in/tea-specialist.vue index 60a90fc..3307df7 100644 --- a/src/bundle/settle-in/tea-specialist.vue +++ b/src/bundle/settle-in/tea-specialist.vue @@ -338,11 +338,9 @@ // 发送验证码 handleCountDown: () => { startCountDown.value = true - nextTick(() => { - countDown.value?.start() - - // 发送验证码请求 - }) + setTimeout(() => { + countDown.value.start() + }, 100) }, // 验证码倒计时结束 diff --git a/src/bundle/store/edit-store.vue b/src/bundle/store/edit-store.vue index 9139ce8..a9f2c1e 100644 --- a/src/bundle/store/edit-store.vue +++ b/src/bundle/store/edit-store.vue @@ -190,8 +190,6 @@ }) const EditStore = { - fileList: [], - /** * 获取店铺详情 */ @@ -221,7 +219,6 @@ } fileList.value = (d.image_arr || []).map((item: string) => ({ url: item, name: item})) - EditStore.fileList = fileList.value address.value = [ String(d.province_id), @@ -243,29 +240,6 @@ form.value.district_id = Number(item.selectedItems[2].value) }, - /** - * 图片选择/删除 - */ - // handleUploadFile: ({ fileList: files }) => { - // let url = '' - // let name = '' - // let response = null - - // const res = files.map(item => { - // if (item.response) { - // response = JSON.parse(item.response) - // url = response.data.url - // name = response.data.name - // } - // return { - // name: name || item.name, - // url: url || item.url - // } - // }) - - // EditStore.fileList = res - // }, - /** * 保存门店信息 */ @@ -295,7 +269,7 @@ return } - if (EditStore.fileList.length === 0) { + if (fileList.value.length === 0) { toast.info('请上传门店图片') return } diff --git a/src/bundle/tea-room/detail.vue b/src/bundle/tea-room/detail.vue index 33e0211..7e14c2d 100644 --- a/src/bundle/tea-room/detail.vue +++ b/src/bundle/tea-room/detail.vue @@ -40,15 +40,15 @@ - + - 其他说明 + 使用说明 - + 起订时间 {{ teaRoom?.room?.hours }}小时起订 @@ -89,9 +89,11 @@ */ handleInitReserveRoom: async () => { const res = await getStoreOrderDetails(roomId.value) - console.log("🚀 ~ res:", res) teaRoom.value = res.details - console.log("🚀 ~ teaRoom.value:", teaRoom.value) + if (teaRoom.value.room.other_describe) { + let content = teaRoom.value.room.other_describe.replace(/\n/g,"
") + teaRoom.value.room.other_describe = content.replace(/\r\n/g,"
") + } swiperList.value = teaRoom.value.room.room_arr } } diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index d6a4947..7e8dca8 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -155,10 +155,11 @@ // 门店列表 const storeList = ref>([]) - const defaultStore = ref<{ id: number; name: string; index: number }>({ + const defaultStore = ref<{ id: number; name: string; index: number, operationType: number }>({ id: 0, name: '', - index: 0 + index: 0, + operationType: 1 }) const store = ref({}) const statistics = ref({ @@ -175,7 +176,10 @@ }) onLoad(async() => { - + // uni.setTabBarItem({ + // index: 2, + // visible: false + // }) }) const Index = { @@ -201,7 +205,8 @@ useStore.setDefaultStore({ id: storeList.value[0].id, name: storeList.value[0].name, - index: 0 + index: 0, + operationType: storeList.value[0].operation_type, }) } } diff --git a/src/pages/login/mobile.vue b/src/pages/login/mobile.vue index 0ee8062..84c1671 100644 --- a/src/pages/login/mobile.vue +++ b/src/pages/login/mobile.vue @@ -149,11 +149,9 @@ } startCountDown.value = true - nextTick(() => { - countDown.value?.start() - - // 发送验证码请求 - }) + setTimeout(() => { + countDown.value.start() + }, 100) }, // 验证码倒计时结束 diff --git a/src/pages/login/password.vue b/src/pages/login/password.vue index 382dc27..478df18 100644 --- a/src/pages/login/password.vue +++ b/src/pages/login/password.vue @@ -143,11 +143,9 @@ await getVerificationCode({ scene: SMS_ENUM.BANK, mobile: String(model.mobile) }) startCountDown.value = true - nextTick(() => { - countDown.value?.start() - - // 发送验证码请求 - }) + setTimeout(() => { + countDown.value.start() + }, 100) }, // 验证码倒计时结束 diff --git a/src/pages/store/room-detail.vue b/src/pages/store/room-detail.vue index 1b2d4de..3204406 100644 --- a/src/pages/store/room-detail.vue +++ b/src/pages/store/room-detail.vue @@ -275,16 +275,16 @@ custom-textarea-class="!bg-[#F8F9FA]" placeholder="请输入套餐介绍，每条内容换行输入" /> --> - + - 其他说明 + 使用说明 + custom-textarea-class="!bg-[#F8F9FA]" placeholder="请输入使用说明" /> @@ -731,7 +731,6 @@ * 保存 */ handleSave: async () => { - // TODO: 实现保存功能 if (!form.title) { toast.info('请输入包间名称') return diff --git a/src/pages/store/store.vue b/src/pages/store/store.vue index 31c5c80..8f8bd56 100644 --- a/src/pages/store/store.vue +++ b/src/pages/store/store.vue @@ -7,77 +7,74 @@ }