...
|
...
|
@@ -580,7 +580,7 @@ module.exports = class extends global.yoho.BaseModel { |
|
|
return progress;
|
|
|
}
|
|
|
|
|
|
_getNormalPro(isCancel, status, createTime) {
|
|
|
_getNormalPro(isCancel, status, createTime, statusStr) {
|
|
|
let progress = {
|
|
|
middleStatus: [
|
|
|
{
|
...
|
...
|
@@ -612,6 +612,11 @@ module.exports = class extends global.yoho.BaseModel { |
|
|
} else if (status === 6) {
|
|
|
progress.percent = '100%';
|
|
|
progress.middleStatus[3].cur = true;
|
|
|
|
|
|
// 显示接口返回订单状态文案
|
|
|
if (statusStr) {
|
|
|
progress.middleStatus[3].name = `4. ${statusStr}`;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
...
|
...
|
@@ -775,7 +780,8 @@ module.exports = class extends global.yoho.BaseModel { |
|
|
);
|
|
|
}
|
|
|
|
|
|
return that._getNormalPro(orderDetail.is_cancel, +orderDetail.status, orderDetail.create_time);
|
|
|
return that._getNormalPro(orderDetail.is_cancel, +orderDetail.status,
|
|
|
orderDetail.create_time, statusInfo.statusStr);
|
|
|
}
|
|
|
}());
|
|
|
|
...
|
...
|
|