From 1f578d60957933f5bea9d92e19dcd4b56393b300 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?TOP=E7=B3=AF=E7=B1=B3?= <1130395124@qq.com> Date: Tue, 28 Mar 2023 22:40:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=A2=E5=8D=95=E8=AF=84?= =?UTF-8?q?=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/order/action.vue | 10 ++++- src/core/apis.js | 15 +++++++ src/core/models/order.js | 15 +++++++ src/pages.json | 4 +- src/pages/{worker => order}/appraise.vue | 55 ++++++++++++++++++------ 5 files changed, 83 insertions(+), 16 deletions(-) rename src/pages/{worker => order}/appraise.vue (71%) diff --git a/src/components/order/action.vue b/src/components/order/action.vue index 4c2b58f..48c038f 100644 --- a/src/components/order/action.vue +++ b/src/components/order/action.vue @@ -43,11 +43,16 @@ 确认完成 - + 评价师傅 + + + 已评价 + + 取消申请 @@ -178,7 +183,8 @@ export default { * 评价 */ appraiseOrder() { - this.$utils.toPage("/pages/worker/appraise?id=" + this.order.id + "&orderId=" + this.order.orderId); + let params = "?list=" + this.order.listType + "&id=" + this.order.id + "&orderId=" + this.order.orderId; + this.$utils.toPage("/pages/order/appraise" + params); }, /** * 退款 diff --git a/src/core/apis.js b/src/core/apis.js index e98d60f..cccf9a5 100644 --- a/src/core/apis.js +++ b/src/core/apis.js @@ -266,6 +266,21 @@ export default { url: "" } }, + appraise: { + t1: { + url: "/wxapp/order/evaluationorder", + showLoading: true, + auth: true, + }, + t2: { + url: "/wxapp/orderb/evaluationorder", + showLoading: true, + auth: true, + }, + t3: { + url: "" + } + }, chooseWorker: { url: "/wxapp/orderb/chooseshifu", showLoading: true, diff --git a/src/core/models/order.js b/src/core/models/order.js index 24414af..455af17 100644 --- a/src/core/models/order.js +++ b/src/core/models/order.js @@ -195,6 +195,7 @@ export default { orderType: data.types, state: data.status, retainageMoney: data.moneyb, + needAppraise: data.message > 0, worker: {}, workerList: [], }; @@ -253,6 +254,7 @@ export default { unloadAddress: data.addressb, state: data.status, price: data.money, + needAppraise: false, worker: {}, }; // 师傅 @@ -328,5 +330,18 @@ export default { return reject(response.msg); }).catch(e => { }); }); + }, + /** + * 评价订单 + */ + appraiseOrder(options) { + return new Promise((resolve, reject) => { + prototype.$request(options.request).then(response => { + if (response.code == 1) { + return resolve(response); + } + return reject(response.msg); + }).catch(e => { }); + }); } } diff --git a/src/pages.json b/src/pages.json index 47d9c95..e4725f5 100644 --- a/src/pages.json +++ b/src/pages.json @@ -68,9 +68,9 @@ } }, { - "path": "pages/worker/appraise", + "path": "pages/order/appraise", "style": { - "navigationBarTitleText": "评价师傅" + "navigationBarTitleText": "评价订单" } }, { diff --git a/src/pages/worker/appraise.vue b/src/pages/order/appraise.vue similarity index 71% rename from src/pages/worker/appraise.vue rename to src/pages/order/appraise.vue index 6ce205a..76c05b5 100644 --- a/src/pages/worker/appraise.vue +++ b/src/pages/order/appraise.vue @@ -33,7 +33,7 @@ - + @@ -44,7 +44,7 @@ - 提交 + 提交 @@ -58,7 +58,9 @@ export default { return { utils: this.$utils, tags: ["技术专业", "礼貌热情", "认真负责", "快速完工", "按时上门"], - orderId: "xxgfdkgn1223", + listType: "", + id: 0, + orderId: "", grade: 0, content: "", chooseTags: [], @@ -71,7 +73,16 @@ export default { AppLayout, UniRate, }, - onLoad() {}, + onLoad(e) { + if (!e.id || !e.orderId || !e.list) { + return this.$utils.toast("参数错误").then(() => { + this.$utils.toPage("", "", "back"); + }); + } + this.id = e.id; + this.orderId = e.orderId; + this.listType = e.list; + }, onShow() {}, onReady() {}, onReachBottom() {}, @@ -85,16 +96,36 @@ export default { } }, chooseImage() { - uni.chooseImage({ - sizeType: ["compressed"], - sourceType: ["album"], - success(res) { - console.log(JSON.stringify(res.tempFilePaths)); - }, + this.$utils.chooseImage(1).then((tempFiles) => { + tempFiles.forEach((item) => { + this.$models.system.upload(item.path).then((response) => { + this.images.push(response.img); + }); + }); }); }, - save() { - console.log("提交表单"); + submit() { + this.$models.order + .appraiseOrder({ + request: { + api: "order.appraise." + this.listType, + data: { + id: this.id, + desc: this.content, + msg: this.chooseTags.join(), + img: this.images, + score: this.grade, + }, + }, + }) + .then((message) => { + this.$utils.toast(message).then(() => { + this.$utils.toPage("", "", "back"); + }); + }) + .catch((e) => { + this.$utils.toast(e); + }); }, }, };