|
|
@ -102,7 +102,7 @@ |
|
|
|
<view class="custom-detail-content"> |
|
|
|
<view class="custom-detail-row"> |
|
|
|
<text class="custom-detail-label" >订单编号</text> |
|
|
|
<text class="custom-detail-value">{{ order.ordeNo }}</text> |
|
|
|
<text class="custom-detail-value">{{ order.ordeNo || order.id }}</text> |
|
|
|
</view> |
|
|
|
<view class="custom-detail-row"> |
|
|
|
<text class="custom-detail-label">合格结算</text> |
|
|
@ -230,19 +230,18 @@ export default { |
|
|
|
this.currentStep = this.getCurrentStep(data.status, data.state) |
|
|
|
// 基础信息 |
|
|
|
this.baseInfo = [ |
|
|
|
{ label: '订单编号', value: data.ordeNo, copy: true }, |
|
|
|
{ label: '订单编号', value: data.ordeNo || data.id, copy: true }, |
|
|
|
...(data.wliuNo ? [{ label: '快递单号', value: data.wliuNo, copy: true }] : []), |
|
|
|
{ label: '用户名', value: data.name, arrow: true }, |
|
|
|
{ label: '取件地址', value: data.address + (data.addressDetail || '') }, |
|
|
|
{ label: '预约时间', value: data.goTime } |
|
|
|
{ label: '取件地址', value: (data.address || '') + (data.addressDetail || '') }, |
|
|
|
{ label: '预约时间', value: data.goTime || data.createTime } |
|
|
|
] |
|
|
|
// 质检信息(如有) |
|
|
|
this.qcInfo = [ |
|
|
|
{ label: '质检数量', value: data.qcNum ? data.qcNum + ' 件' : '' }, |
|
|
|
{ label: '质检合格', value: data.qcOkNum ? data.qcOkNum + ' 件' : '' }, |
|
|
|
{ label: '质量问题', value: data.qcBadNum ? data.qcBadNum + ' 件' : '' }, |
|
|
|
{ label: '不可回收', value: data.qcUnNum ? data.qcUnNum + ' 件' : '' }, |
|
|
|
{ label: '订单重量', value: data.weight ? data.weight + ' kg' : '' } |
|
|
|
{ label: '质检数量', value: data.num ? data.qualifiedNum + data.noQualifiedNum + data.unrecyclable + ' 件' : '' }, |
|
|
|
{ label: '质检合格', value: data.qualifiedNum ? data.qualifiedNum + ' 件' : '' }, |
|
|
|
{ label: '质量问题', value: data.noQualifiedNum ? data.noQualifiedNum + ' 件' : '' }, |
|
|
|
{ label: '不可回收', value: data.unrecyclable ? data.unrecyclable + ' 件' : '' } |
|
|
|
] |
|
|
|
} |
|
|
|
}) |
|
|
@ -329,7 +328,7 @@ export default { |
|
|
|
goToInspection() { |
|
|
|
if (!this.order.id) return; |
|
|
|
uni.navigateTo({ |
|
|
|
url: `/pages/subcomponent/inspection-report?orderId=${this.order.orderId}` |
|
|
|
url: `/pages/subcomponent/inspection-report?orderId=${this.order.id}` |
|
|
|
}) |
|
|
|
}, |
|
|
|
// 判断是否显示单价格(根据estimatedPrice格式判断) |
|
|
|