diff --git a/env/.env.development b/env/.env.development index aa650c1..0495972 100644 --- a/env/.env.development +++ b/env/.env.development @@ -9,6 +9,7 @@ VITE_SHOW_SOURCEMAP = true # 请求地址 VITE_SERVER_BASEURL = 'https://test1.stnav.com' + # 图片上传路径 VITE_UPLOAD_BASEURL = 'https://test1.stnav.com/upload' diff --git a/src/api/user.ts b/src/api/user.ts index e4db51d..10d7351 100644 --- a/src/api/user.ts +++ b/src/api/user.ts @@ -197,4 +197,11 @@ export function getConfigItem() { */ export function updateWorkState(state: number) { return http.Post('/teamapi/user/updateState', {state}) -} \ No newline at end of file +} + +/** + * 拨打虚拟手机号码 + */ +export function callVirtualNumber(order_sn: string) { + return http.Post('/api/order/mobileBind', {order_sn}) +} diff --git a/src/bundle/parten/pages/sub/profile.vue b/src/bundle/parten/pages/sub/profile.vue deleted file mode 100644 index 58203de..0000000 --- a/src/bundle/parten/pages/sub/profile.vue +++ /dev/null @@ -1,182 +0,0 @@ - - { - "layout": "default", - "style": { - "navigationStyle": "custom" - } - } - - - - - - - diff --git a/src/bundle/parten/pages/sub/sub.vue b/src/bundle/parten/pages/sub/sub.vue deleted file mode 100644 index e286835..0000000 --- a/src/bundle/parten/pages/sub/sub.vue +++ /dev/null @@ -1,158 +0,0 @@ - - { - "layout": "default", - "style": { - "navigationBarBackgroundColor": "#FFF", - "navigationBarTitleText": "下级用户" - } - } - - - - - - - - \ No newline at end of file diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue index f4dd6ec..d009c75 100644 --- a/src/pages/login/login.vue +++ b/src/pages/login/login.vue @@ -47,7 +47,8 @@ - 我已阅读并同意 《服务协议》 和《隐私政策》，未注册手机号登录后将自动你为您创建账号 + 我已阅读并同意 + 《服务协议》《隐私政策》《茶址茶艺师入驻协议》，未注册手机号登录后将自动你为您创建账号 @@ -114,7 +115,7 @@ } if (!agree.value) { - toast.info('请同意服务协议和隐私政策') + toast.info('请同意服务协议、隐私政策、茶址茶艺师入驻协议') return } @@ -144,6 +145,31 @@ handleToPrivacy: () => { router.navigateTo('/pages/webview/webview?type=privacy') }, + + // 跳转到茶址茶艺师入驻协议页面 + handleToAgreement: () => { + const fileUrl = import.meta.env.VITE_SERVER_BASEURL + '/茶址茶艺师入驻协议.docx' + uni.downloadFile({ + url: fileUrl, + success: (downloadRes) => { + if (downloadRes.statusCode === 200) { + uni.openDocument({ + filePath: downloadRes.tempFilePath, + showMenu: true, + fail: (err) => { + console.error('打开文档失败:', err) + toast.info('打开文档失败，请稍后重试') + } + }) + } else { + toast.info('下载协议失败') + } + }, + fail: (err) => { + toast.info('下载协议失败，请稍后重试') + } + }) + } } diff --git a/src/pages/my/my.vue b/src/pages/my/my.vue index e6aa07e..641189e 100644 --- a/src/pages/my/my.vue +++ b/src/pages/my/my.vue @@ -24,7 +24,7 @@ --> - + @@ -109,7 +109,7 @@ - + 服务方式: @@ -169,7 +169,7 @@ - + 更多服务 diff --git a/src/pages/order/detail.vue b/src/pages/order/detail.vue index 63c828a..08f8085 100644 --- a/src/pages/order/detail.vue +++ b/src/pages/order/detail.vue @@ -268,9 +268,15 @@ {{ order.hours }}小时 - - 用户联系方式: - {{ order.user_mobile }} + + 用户联系方式: + + + + + @@ -466,6 +472,7 @@ import { router, copy } from '@/utils/tools' import { TeaSpecialistOrderStatus, TeaSpecialistManageStatusTextValue } from '@/utils/teaSpecialistOrder' import { getTeaSpecialistOrderDetails, getTeaSpecialistCostDetails } from '@/api/tes-specialist' + import { callVirtualNumber } from '@/api/user' import { handleReleaseOrderHooks, handleDepartOrderHooks, @@ -475,6 +482,7 @@ handleDeleteOrderHooks, handleRefuseOrderHooks } from '@/hooks/useOrder' +import { resolve } from 'path' const OSS = inject('OSS') const toast = useToast() @@ -826,10 +834,14 @@ }, // 拨打手机号 - handleCall: (phone: string) => { - uni.makePhoneCall({ - phoneNumber: phone, - }) + handleCall: async (order: any) => { + const res = await callVirtualNumber(order) + console.log("🚀 ~ res:", res) + if (res) { + uni.makePhoneCall({ + phoneNumber: res.mobile, + }) + } } }