From f0a4f0264725c0d37e593e49d342d2242e438465 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?TOP=E7=B3=AF=E7=B1=B3?= <1130395124@qq.com> Date: Wed, 29 Mar 2023 20:42:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=94=A8=E6=88=B7=E7=AB=AF?= =?UTF-8?q?=E8=AF=84=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/apis.js | 8 ++- src/core/models/appraise.js | 46 ++++++++++++++ src/core/models/worker.js | 25 +++++++- src/pages/order/detail.vue | 4 +- src/pages/worker/detail.vue | 121 ++++++++++++++++++++++++++++++------ 5 files changed, 179 insertions(+), 25 deletions(-) diff --git a/src/core/apis.js b/src/core/apis.js index b6b9556..2636f41 100644 --- a/src/core/apis.js +++ b/src/core/apis.js @@ -291,13 +291,17 @@ export default { count: { service: { url: "/wxapp/index/seeworkerevaluation", - showLoading: true, + }, + worker: { + url: "/wxapp/orderb/seeworkerevaluation", } }, list: { service: { url: "/wxapp/index/goodsevaluation", - showLoading: true, + }, + worker: { + url: "/wxapp/orderb/allevaluation", } } }, diff --git a/src/core/models/appraise.js b/src/core/models/appraise.js index 62b6c1a..b77875d 100644 --- a/src/core/models/appraise.js +++ b/src/core/models/appraise.js @@ -17,6 +17,21 @@ export default { return reject(response.msg); }).catch(e => { }); }); + }, + worker(id) { + return new Promise((resolve, reject) => { + prototype.$request({ + api: "appraise.count.worker", + data: { + id: id, + } + }).then(response => { + if (response.code == 1) { + return resolve(response.data); + } + return reject(response.msg); + }).catch(e => { }); + }); } }, list: { @@ -50,6 +65,37 @@ export default { return reject(response.msg); }).catch(e => { }); }); + }, + /** + * 师傅评价 + */ + worker(data) { + return new Promise((resolve, reject) => { + prototype.$request({ + api: "appraise.list.worker", + data: data + }).then(response => { + if (response.code == 1) { + let list = []; + response.data.forEach((data) => { + list.push({ + id: data.id, + avatar: data.u_avatar, + nickname: data.u_name, + createTime: data.time, + tags: data.msg.split(","), + area: "-", + worker: data.wid, + grade: data.score, + images: data.img, + content: data.desc, + }); + }); + return resolve(list); + } + return reject(response.msg); + }).catch(e => { }); + }); } }, } diff --git a/src/core/models/worker.js b/src/core/models/worker.js index dbd6d0a..2c80ff3 100644 --- a/src/core/models/worker.js +++ b/src/core/models/worker.js @@ -7,9 +7,12 @@ export default { case 0: return ['待审核', '#ff0000']; case 1: return ['普通师傅', '#bfbfbf']; case 2: return ['入驻师傅', '#d9a019']; - default: return ['未知']; + default: return ['未知', '#000000']; } }, + /** + * 师傅详情 + */ workerDetail(uid) { return new Promise((resolve, reject) => { prototype.$request({ @@ -18,7 +21,25 @@ export default { uid: uid, } }).then(response => { - console.log(response); + if (response.code == 1) { + let worker = { + times: response.data.count, + favorableRate: response.data.good, + grade: response.data.score, + worker: {}, + } + if (prototype.$utils.isType(response.data.worker, "object")) { + worker.worker = { + id: response.data.worker.id, + uid: response.data.worker.uid, + name: response.data.worker.name, + type: response.data.worker.status, + avatar: response.data.worker.avatar, + } + } + return resolve(worker); + } + return reject(response.msg); }).catch(e => { }); }); } diff --git a/src/pages/order/detail.vue b/src/pages/order/detail.vue index 2895e19..809a296 100644 --- a/src/pages/order/detail.vue +++ b/src/pages/order/detail.vue @@ -27,7 +27,7 @@ 报价金额 ¥ {{ utils.formatNumber(item.price, 2) }} - + @@ -230,7 +230,7 @@ export default { */ showWorker() { if (this.$utils.isType(this.order.worker, "object") && this.$utils.isType(this.order.worker.id, "number")) { - this.$utils.toPage("/pages/worker/detail?id=" + this.order.worker.id); + this.workerDetail(this.order.worker.uid); } else { this.switchTab(0); } diff --git a/src/pages/worker/detail.vue b/src/pages/worker/detail.vue index 9a1e699..3e8f082 100644 --- a/src/pages/worker/detail.vue +++ b/src/pages/worker/detail.vue @@ -3,67 +3,150 @@ - + - {{ name }} + {{ info.worker.name }} - - {{ models.worker.getWorkerTypeText(type) }} + + {{ typeText }} - 服务:{{ times }} + 服务:{{ info.times }} - 好评率:{{ favorable_rate }} + 好评率:{{ info.favorableRate }} % - 评分:{{ grade }} + 评分:{{ info.grade }} + + +