diff --git a/config.js b/config.js index 3bf87f2..6f0d247 100644 --- a/config.js +++ b/config.js @@ -1,8 +1,9 @@ // 应用全局配置 module.exports = { // baseUrl: 'https://www.nuoyunr.com', - baseUrl: 'http://192.168.1.17:48080', + // baseUrl: 'http://192.168.1.17:48080', // baseUrl: "http://192.168.1.4:48080", + baseUrl: "http://localhost:48080", imagesUrl: 'http://shequ.0315e.com/static/images/pages/', baseImageUrl: 'https://www.nuoyunr.com/minio/', wsUrl: 'wss://www.nuoyunr.com', diff --git a/pages-order/orderDetail/orderDetail.vue b/pages-order/orderDetail/orderDetail.vue index 78ab98b..3d3e99f 100644 --- a/pages-order/orderDetail/orderDetail.vue +++ b/pages-order/orderDetail/orderDetail.vue @@ -14,8 +14,14 @@ {{ ticketInfo.ticketsStatus == '02' ? '已完成' : ticketInfo.statusStr }} 当前工单维修项目{{ ticketInfo.flag == '02' ? '已全部完成' : ticketInfo.statusStr }} + + 服务顾问 + + {{ticketInfo.adviserName}} {{ticketInfo.linkPhone}} + + 车辆信息 @@ -263,6 +269,13 @@ this.getProjItem() }, methods: { + + callPhone(phone){ + uni.makePhoneCall({ + phoneNumber: phone + }); + }, + /** * 预览图片 */ diff --git a/pages/myReservation/addReservation.vue b/pages/myReservation/addReservation.vue index 1c49631..ddee16a 100644 --- a/pages/myReservation/addReservation.vue +++ b/pages/myReservation/addReservation.vue @@ -70,7 +70,7 @@ --> 预约项目 - + @@ -154,7 +154,7 @@ formData:{ userName: null, userMobile: null, - projectId: null, + repairType: null, carId: null, carNo: null, bookingTime: null, @@ -276,7 +276,6 @@ url: '/pages/myReservation/reservationSuccess?info=' + encodeURIComponent(JSON.stringify(this.info)) }) }).catch(() => {}) - }, async initCarList() { const res = await request({ @@ -318,23 +317,20 @@ // 取服务 async getServer(corpId) { const res = await request({ - url: "/userClient/base/company/get", - method: 'get', - params: { - id: corpId - } + url: "/userClient/dict/type?type=repair_type", + method: 'get' }) - this.serviceList = res.data.servicePackages + this.serviceList = res.data }, // 选择服务 selectServer(){ - const servers = this.serviceList.map(item => item.name) + const servers = this.serviceList.map(item => item.label) uni.showActionSheet({ itemList: servers, success: (res) => { this.service = this.serviceList[res.tapIndex] - this.formData.projectId = this.service.id - this.info.serviceName = this.service.name + this.formData.repairType = this.service.value + this.info.serviceName = this.service.label }, fail: (err) => { console.error('选择框显示失败:', err);