From 11a402a8f26d98b8274cbe6df123d5cf84b265fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?TOP=E7=B3=AF=E7=B1=B3?= <1130395124@qq.com>
Date: Wed, 15 Mar 2023 21:30:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=AE=A2=E5=8D=95=E8=AF=A6?=
=?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/order/item.vue | 2 +-
src/components/worker/item.vue | 8 +--
src/core/apis.js | 4 +-
src/core/models/order.js | 118 ++++++++++++++++++++++++---------
src/pages/order/detail.vue | 20 +++---
5 files changed, 107 insertions(+), 45 deletions(-)
diff --git a/src/components/order/item.vue b/src/components/order/item.vue
index 16a266a..f1e67aa 100644
--- a/src/components/order/item.vue
+++ b/src/components/order/item.vue
@@ -57,7 +57,7 @@
"
>
-
+
diff --git a/src/components/worker/item.vue b/src/components/worker/item.vue
index 36d1be7..271375a 100644
--- a/src/components/worker/item.vue
+++ b/src/components/worker/item.vue
@@ -13,7 +13,7 @@
服务{{ data.times || 0 }}次
- 好评率{{ data.favorable_rate || 0 }}%
+ 好评率{{ data.favorableRate || 0 }}%
评分{{ data.grade || 0 }}/5.0
@@ -44,9 +44,9 @@ export default {
components: {},
created() {},
mounted() {
- // let [typeText, typeTextColor] = this.$models.worker.worketTypeText(this.data.type);
- // this.typeText = typeText;
- // this.typeTextColor = typeTextColor;
+ let [typeText, typeTextColor] = this.$models.worker.worketTypeText(this.data.type);
+ this.typeText = typeText;
+ this.typeTextColor = typeTextColor;
},
destroyed() {},
methods: {},
diff --git a/src/core/apis.js b/src/core/apis.js
index 9247d4f..857b134 100644
--- a/src/core/apis.js
+++ b/src/core/apis.js
@@ -191,7 +191,9 @@ export default {
},
// 报/议价订单
t2: {
- url: ""
+ url: "/wxapp/orderb/getmyorderbbyid",
+ showLoading: true,
+ auth: true,
},
// 货运订单
t3: {
diff --git a/src/core/models/order.js b/src/core/models/order.js
index 0deee60..41028cb 100644
--- a/src/core/models/order.js
+++ b/src/core/models/order.js
@@ -98,23 +98,64 @@ export default {
prototype.$request(options.request).then(response => {
if (response.code == 1) {
let list = [];
- response.data.forEach((item) => {
- let worker = {};
- list.push({
- listType: options.listType,
- id: item.id,
- orderId: item.order,
- cate: "待返数据",
- content: item.desc,
- createTime: item.time,
- serviceTime: item.times,
- orderType: item.types,
- price: item.money,
- state: item.status,
- worker: item.shifu,
- workerList: [],
+ if (options.listType == 't1' || options.listType == 't2') {
+ response.data.forEach((item) => {
+ let order = {
+ listType: options.listType,
+ id: item.id,
+ orderId: item.order,
+ cate: "待返数据",
+ content: item.desc,
+ createTime: item.time,
+ serviceTime: item.times,
+ orderType: item.types,
+ price: item.money,
+ state: item.status,
+ workerList: [],
+ };
+ if (item.shifu) {
+ order.worker = {
+ id: item.shifu.id,
+ name: item.shifu.name,
+ avatar: item.shifu.avatar,
+ type: item.shifu.status,
+ times: item.shifu_date.count,
+ favorableRate: item.shifu_date.good,
+ grade: item.shifu_date.score,
+ price: item.money,
+ }
+ }
+ if (options.listType == 't2' && item.shifus.length > 0) {
+ item.shifus.forEach(worker => {
+ order.workerList.push({
+ id: worker.id,
+ name: worker.name,
+ avatar: worker.avatar,
+ price: worker.money,
+ })
+ });
+ }
+ list.push(order);
});
- });
+ } else if (options.listType == 't3') {
+ response.data.forEach((item) => {
+ let order = {
+ listType: options.listType,
+ id: item.id,
+ orderId: item.order,
+ cate: "待返数据",
+ content: item.desc,
+ createTime: item.time,
+ serviceTime: item.times,
+ orderType: item.types,
+ price: item.money,
+ state: item.status,
+ worker: item.shifu,
+ workerList: [],
+ };
+ list.push(order);
+ });
+ }
return resolve(list);
}
return reject(response.msg);
@@ -128,20 +169,37 @@ export default {
return new Promise((resolve, reject) => {
prototype.$request(options.request).then(response => {
if (response.code == 1) {
- return resolve({
- id: response.data.id,
- address: response.data.address,
- orderId: response.data.order,
- cate: "待返数据",
- content: response.data.desc,
- createTime: response.data.time,
- serviceTime: response.data.times,
- orderType: response.data.types,
- state: response.data.status,
- images: [],
- worker: [],
- workerList: [],
- });
+ let order = {};
+ if (options.listType == 't1' || options.listType == 't2') {
+ order = {
+ id: response.data.id,
+ address: response.data.address,
+ orderId: response.data.order,
+ cate: "待返数据",
+ content: response.data.desc,
+ createTime: response.data.time,
+ serviceTime: response.data.times,
+ orderType: response.data.types,
+ state: response.data.status,
+ images: response.data.img,
+ workerList: [],
+ };
+ } else if (options.listType == 't3') {
+ order = {
+ id: response.data.id,
+ address: response.data.address,
+ orderId: response.data.order,
+ cate: "待返数据",
+ content: response.data.desc,
+ createTime: response.data.time,
+ serviceTime: response.data.times,
+ orderType: response.data.types,
+ state: response.data.status,
+ images: response.data.img,
+ workerList: [],
+ };
+ }
+ return resolve(order);
}
return reject(response.msg);
}).catch(e => { });
diff --git a/src/pages/order/detail.vue b/src/pages/order/detail.vue
index 876a2e2..cca1131 100644
--- a/src/pages/order/detail.vue
+++ b/src/pages/order/detail.vue
@@ -78,11 +78,13 @@
- 测试(先生)
- 13108196080
+
+ {{ order.address.name }}({{ order.address.sex == "男" ? "先生" : "女士" }})
+
+ {{ order.address.mobil }}
- 四川省成都市涪城区剑门门路西段书亦烧 仙草(成都七中店) 测试
+ {{ order.address.address }}{{ order.address.doorplate }}
@@ -138,7 +140,9 @@ export default {
id: 0,
listType: "",
orderType: 0,
- order: {},
+ order: {
+ address: {},
+ },
};
},
components: {
@@ -232,11 +236,12 @@ export default {
this.$models.order
.orderDetail({
request: {
- api: "order.detail.t1",
+ api: "order.detail." + this.listType,
data: {
id: this.id,
},
},
+ listType: this.listType,
})
.then((detail) => {
let [stateText, stateDesc, stateTextColor] = this.$models.order.stateText(
@@ -247,10 +252,7 @@ export default {
this.stateText = stateText;
this.stateDesc = stateDesc;
this.stateTextColor = stateTextColor;
- this.order = {
- ...detail,
- listType: this.listType,
- };
+ this.order = detail;
})
.catch((e) => {
this.$utils.toast(e).then(() => {