完善订单详情
This commit is contained in:
parent
3b4599db4d
commit
11a402a8f2
|
@ -57,7 +57,7 @@
|
||||||
"
|
"
|
||||||
>
|
>
|
||||||
<view class="worker-item-box">
|
<view class="worker-item-box">
|
||||||
<worker-item :data="{ ...order.worker, price: order.price }" />
|
<worker-item :data="order.worker" />
|
||||||
</view>
|
</view>
|
||||||
</block>
|
</block>
|
||||||
</view>
|
</view>
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
</view>
|
</view>
|
||||||
<view class="detail">
|
<view class="detail">
|
||||||
<text class="section-text">服务{{ data.times || 0 }}次</text>
|
<text class="section-text">服务{{ data.times || 0 }}次</text>
|
||||||
<text class="section-text">好评率{{ data.favorable_rate || 0 }}%</text>
|
<text class="section-text">好评率{{ data.favorableRate || 0 }}%</text>
|
||||||
<text class="section-text">评分{{ data.grade || 0 }}/5.0 </text>
|
<text class="section-text">评分{{ data.grade || 0 }}/5.0 </text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
@ -44,9 +44,9 @@ export default {
|
||||||
components: {},
|
components: {},
|
||||||
created() {},
|
created() {},
|
||||||
mounted() {
|
mounted() {
|
||||||
// let [typeText, typeTextColor] = this.$models.worker.worketTypeText(this.data.type);
|
let [typeText, typeTextColor] = this.$models.worker.worketTypeText(this.data.type);
|
||||||
// this.typeText = typeText;
|
this.typeText = typeText;
|
||||||
// this.typeTextColor = typeTextColor;
|
this.typeTextColor = typeTextColor;
|
||||||
},
|
},
|
||||||
destroyed() {},
|
destroyed() {},
|
||||||
methods: {},
|
methods: {},
|
||||||
|
|
|
@ -191,7 +191,9 @@ export default {
|
||||||
},
|
},
|
||||||
// 报/议价订单
|
// 报/议价订单
|
||||||
t2: {
|
t2: {
|
||||||
url: ""
|
url: "/wxapp/orderb/getmyorderbbyid",
|
||||||
|
showLoading: true,
|
||||||
|
auth: true,
|
||||||
},
|
},
|
||||||
// 货运订单
|
// 货运订单
|
||||||
t3: {
|
t3: {
|
||||||
|
|
|
@ -98,23 +98,64 @@ export default {
|
||||||
prototype.$request(options.request).then(response => {
|
prototype.$request(options.request).then(response => {
|
||||||
if (response.code == 1) {
|
if (response.code == 1) {
|
||||||
let list = [];
|
let list = [];
|
||||||
response.data.forEach((item) => {
|
if (options.listType == 't1' || options.listType == 't2') {
|
||||||
let worker = {};
|
response.data.forEach((item) => {
|
||||||
list.push({
|
let order = {
|
||||||
listType: options.listType,
|
listType: options.listType,
|
||||||
id: item.id,
|
id: item.id,
|
||||||
orderId: item.order,
|
orderId: item.order,
|
||||||
cate: "待返数据",
|
cate: "待返数据",
|
||||||
content: item.desc,
|
content: item.desc,
|
||||||
createTime: item.time,
|
createTime: item.time,
|
||||||
serviceTime: item.times,
|
serviceTime: item.times,
|
||||||
orderType: item.types,
|
orderType: item.types,
|
||||||
price: item.money,
|
price: item.money,
|
||||||
state: item.status,
|
state: item.status,
|
||||||
worker: item.shifu,
|
workerList: [],
|
||||||
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 resolve(list);
|
||||||
}
|
}
|
||||||
return reject(response.msg);
|
return reject(response.msg);
|
||||||
|
@ -128,20 +169,37 @@ export default {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
prototype.$request(options.request).then(response => {
|
prototype.$request(options.request).then(response => {
|
||||||
if (response.code == 1) {
|
if (response.code == 1) {
|
||||||
return resolve({
|
let order = {};
|
||||||
id: response.data.id,
|
if (options.listType == 't1' || options.listType == 't2') {
|
||||||
address: response.data.address,
|
order = {
|
||||||
orderId: response.data.order,
|
id: response.data.id,
|
||||||
cate: "待返数据",
|
address: response.data.address,
|
||||||
content: response.data.desc,
|
orderId: response.data.order,
|
||||||
createTime: response.data.time,
|
cate: "待返数据",
|
||||||
serviceTime: response.data.times,
|
content: response.data.desc,
|
||||||
orderType: response.data.types,
|
createTime: response.data.time,
|
||||||
state: response.data.status,
|
serviceTime: response.data.times,
|
||||||
images: [],
|
orderType: response.data.types,
|
||||||
worker: [],
|
state: response.data.status,
|
||||||
workerList: [],
|
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);
|
return reject(response.msg);
|
||||||
}).catch(e => { });
|
}).catch(e => { });
|
||||||
|
|
|
@ -78,11 +78,13 @@
|
||||||
<text class="iconfont icon-dingwei"></text>
|
<text class="iconfont icon-dingwei"></text>
|
||||||
<view>
|
<view>
|
||||||
<view class="contact limit-line clamp-1">
|
<view class="contact limit-line clamp-1">
|
||||||
<text class="name">测试(先生)</text>
|
<text class="name">
|
||||||
<text class="mobile">13108196080</text>
|
{{ order.address.name }}({{ order.address.sex == "男" ? "先生" : "女士" }})
|
||||||
|
</text>
|
||||||
|
<text class="mobile">{{ order.address.mobil }}</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="detail">
|
<view class="detail">
|
||||||
<text>四川省成都市涪城区剑门门路西段书亦烧 仙草(成都七中店) 测试</text>
|
<text>{{ order.address.address }}{{ order.address.doorplate }}</text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
@ -138,7 +140,9 @@ export default {
|
||||||
id: 0,
|
id: 0,
|
||||||
listType: "",
|
listType: "",
|
||||||
orderType: 0,
|
orderType: 0,
|
||||||
order: {},
|
order: {
|
||||||
|
address: {},
|
||||||
|
},
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
components: {
|
components: {
|
||||||
|
@ -232,11 +236,12 @@ export default {
|
||||||
this.$models.order
|
this.$models.order
|
||||||
.orderDetail({
|
.orderDetail({
|
||||||
request: {
|
request: {
|
||||||
api: "order.detail.t1",
|
api: "order.detail." + this.listType,
|
||||||
data: {
|
data: {
|
||||||
id: this.id,
|
id: this.id,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
listType: this.listType,
|
||||||
})
|
})
|
||||||
.then((detail) => {
|
.then((detail) => {
|
||||||
let [stateText, stateDesc, stateTextColor] = this.$models.order.stateText(
|
let [stateText, stateDesc, stateTextColor] = this.$models.order.stateText(
|
||||||
|
@ -247,10 +252,7 @@ export default {
|
||||||
this.stateText = stateText;
|
this.stateText = stateText;
|
||||||
this.stateDesc = stateDesc;
|
this.stateDesc = stateDesc;
|
||||||
this.stateTextColor = stateTextColor;
|
this.stateTextColor = stateTextColor;
|
||||||
this.order = {
|
this.order = detail;
|
||||||
...detail,
|
|
||||||
listType: this.listType,
|
|
||||||
};
|
|
||||||
})
|
})
|
||||||
.catch((e) => {
|
.catch((e) => {
|
||||||
this.$utils.toast(e).then(() => {
|
this.$utils.toast(e).then(() => {
|
||||||
|
|
Loading…
Reference in New Issue