From ee209bdb7b4918fd03eaa74a7a6c80d0b2792db1 Mon Sep 17 00:00:00 2001 From: wangxiaowei <1121133807@qq.com> Date: Mon, 13 Apr 2026 14:17:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- env/.env.development | 2 + src/api/user.ts | 9 ++ src/bundle/package/claim-coupon.vue | 7 +- src/bundle/profile/profile.vue | 2 +- src/bundle_b/pages/tea-specialist/cert.vue | 56 +++++++++ src/bundle_b/pages/tea-specialist/detail.vue | 119 +++++++++++++++++-- src/bundle_b/pages/tea-specialist/list.vue | 8 +- src/pages.json | 9 ++ src/pages/index/index.vue | 18 +-- src/pages/my/my.vue | 13 +- 10 files changed, 212 insertions(+), 31 deletions(-) create mode 100644 src/bundle_b/pages/tea-specialist/cert.vue diff --git a/env/.env.development b/env/.env.development index 77cbeb4..4bcd194 100644 --- a/env/.env.development +++ b/env/.env.development @@ -9,6 +9,8 @@ VITE_SHOW_SOURCEMAP = true # 请求地址 VITE_SERVER_BASEURL = 'https://test1.stnav.com' +# VITE_SERVER_BASEURL = 'https://76458.com' + # 图片上传路径 VITE_UPLOAD_BASEURL = 'https://test1.stnav.com/upload' diff --git a/src/api/user.ts b/src/api/user.ts index 21f1e68..cc4ae4c 100644 --- a/src/api/user.ts +++ b/src/api/user.ts @@ -236,4 +236,13 @@ export function addJoinCooperation(data: IAddJoinCooperationParams) { */ export function getJoinCooperationStatus() { return http.Post('/api/submitForm/StoreRealStatus') +} + +/** + * 获取配置项 + */ +export function getConfig() { + return http.Post('/api/setting/get' , null , { + meta: { ignoreAuth: true } + }) } \ No newline at end of file diff --git a/src/bundle/package/claim-coupon.vue b/src/bundle/package/claim-coupon.vue index c6280e2..bfb3012 100644 --- a/src/bundle/package/claim-coupon.vue +++ b/src/bundle/package/claim-coupon.vue @@ -48,7 +48,7 @@ - 提交 + {{ hasToken ? '提交' : '去登录' }} @@ -69,6 +69,7 @@ const form = reactive({ }) const id = ref(0) +const hasToken = ref(false) onLoad((args) => { const scene = args?.scene @@ -80,9 +81,7 @@ onLoad((args) => { onShow(() => { const token = uni.getStorageSync('token') - if (!token) { - router.navigateTo('/pages/login/login') - } + hasToken.value = !!token }) const ClaimCoupon = { diff --git a/src/bundle/profile/profile.vue b/src/bundle/profile/profile.vue index 8133fab..b11faee 100644 --- a/src/bundle/profile/profile.vue +++ b/src/bundle/profile/profile.vue @@ -119,7 +119,7 @@ - 2.14.8 + 2.14.9 diff --git a/src/bundle_b/pages/tea-specialist/cert.vue b/src/bundle_b/pages/tea-specialist/cert.vue new file mode 100644 index 0000000..820d5cd --- /dev/null +++ b/src/bundle_b/pages/tea-specialist/cert.vue @@ -0,0 +1,56 @@ + +{ + "needLogin": true, + "layout": "default", + "style": { + "navigationStyle": "custom" + } +} + + + + + + + + diff --git a/src/bundle_b/pages/tea-specialist/detail.vue b/src/bundle_b/pages/tea-specialist/detail.vue index 40afc82..5d93a81 100644 --- a/src/bundle_b/pages/tea-specialist/detail.vue +++ b/src/bundle_b/pages/tea-specialist/detail.vue @@ -114,9 +114,14 @@ - + - {{ info.company_abv }} + + {{ info.company_status ? '查看资质' : '暂无认证信息' }} + + @@ -194,9 +199,18 @@ + + + + + + + + + - + 费用说明 @@ -256,12 +270,82 @@ + - + + + + 项目介绍 + + + + 自饮七步 + + + ① 选茶 + ② 择器 + ③ 备水 + + + ④ 入境 + ⑤ 冲泡 + ⑥ 品茗 + ⑦ 回味 + + + + + 茶品介绍 + + + 1. 产地介绍 + 2. 基础属性 + 3. 外形品相 + 4. 色香表现 + + + 5.工艺特点 + 6. 滋味口感 + + + + + - - - 茶艺师需提前一小时预约，两小时起订 + + + + 禁忌说明 + + + 绿色正规茶艺师综合服务平台， + 为确保平台营运的合法合规和避免不必要的纠纷禁止茶师私添加客户微信， + 禁止茶师私自收款(现金、微信、支付宝红包或转帐等)， + 禁止茶师私下接受宴请， + 以及从事除平台项目之外的其它内容和活动。 + + + + + + + 下单须知 + + + 茶艺师出发后，客户取消订单，车费不予返还，敬请谅解！ + + + + + + + 温馨提示 + + + + + 茶艺师需提前一小时预约，两小时起订 + @@ -334,6 +418,9 @@ const info = ref({ company_abv: '', // 公司简称 company_url: '', // 图片链接 company_status: 0, // 是否有公司信息 + license_img: '', // 营业执照图片 + health_certificate: '', // 健康证图片 + state: 0, // 茶艺师状态 0可约 1工作中 2不可约 }) const latitude = ref(0) // 纬度 const longitude = ref(0) // 经度 @@ -495,8 +582,13 @@ const Detail = { * 立即邀约 */ handleReserveTeaspecialist: () => { - // id.value - 茶艺师的ID - router.navigateTo(`/bundle_b/pages/tea-specialist/reserve?id=${id.value}`) + if (info.value.state == 0) { + // id.value - 茶艺师的ID + router.navigateTo(`/bundle_b/pages/tea-specialist/reserve?id=${id.value}`) + } else { + toast.info('当前茶艺师不可预约') + return + } }, /** @@ -520,9 +612,14 @@ const Detail = { */ handlePreviewInfo: () => { if (info.value.company_status) { - previewImage(info.value.company_url, [info.value.company_url]) + const obj = { + license_img: info.value.license_img, + health_certificate: info.value.health_certificate, + } + const infoStr = encodeURIComponent(JSON.stringify(obj)) + router.navigateTo(`/bundle_b/pages/tea-specialist/cert?info=${infoStr}`) } else { - toast.info('暂无商家信息') + toast.info('暂无认证信息') } } } diff --git a/src/bundle_b/pages/tea-specialist/list.vue b/src/bundle_b/pages/tea-specialist/list.vue index 9b6f3e0..0694388 100644 --- a/src/bundle_b/pages/tea-specialist/list.vue +++ b/src/bundle_b/pages/tea-specialist/list.vue @@ -114,10 +114,12 @@ - + - 商家认证 + + {{ item.company_abv }} + diff --git a/src/pages.json b/src/pages.json index 95c1f53..8d40b12 100644 --- a/src/pages.json +++ b/src/pages.json @@ -659,6 +659,15 @@ { "root": "bundle_b", "pages": [ + { + "path": "pages/tea-specialist/cert", + "type": "page", + "needLogin": true, + "layout": "default", + "style": { + "navigationStyle": "custom" + } + }, { "path": "pages/tea-specialist/coupon", "type": "page", diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index d21cce7..e09b704 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -49,7 +49,7 @@ - + - - - - + 热门场景 - + + + + + + - + 智能排序 @@ -107,7 +109,7 @@ -