Authored by yyq

order detail status

@@ -580,7 +580,7 @@ module.exports = class extends global.yoho.BaseModel { @@ -580,7 +580,7 @@ module.exports = class extends global.yoho.BaseModel {
580 return progress; 580 return progress;
581 } 581 }
582 582
583 - _getNormalPro(isCancel, status, createTime) { 583 + _getNormalPro(isCancel, status, createTime, statusStr) {
584 let progress = { 584 let progress = {
585 middleStatus: [ 585 middleStatus: [
586 { 586 {
@@ -612,6 +612,11 @@ module.exports = class extends global.yoho.BaseModel { @@ -612,6 +612,11 @@ module.exports = class extends global.yoho.BaseModel {
612 } else if (status === 6) { 612 } else if (status === 6) {
613 progress.percent = '100%'; 613 progress.percent = '100%';
614 progress.middleStatus[3].cur = true; 614 progress.middleStatus[3].cur = true;
  615 +
  616 + // 显示接口返回订单状态文案
  617 + if (statusStr) {
  618 + progress.middleStatus[3].name = `4. ${statusStr}`;
  619 + }
615 } 620 }
616 } 621 }
617 622
@@ -775,7 +780,8 @@ module.exports = class extends global.yoho.BaseModel { @@ -775,7 +780,8 @@ module.exports = class extends global.yoho.BaseModel {
775 ); 780 );
776 } 781 }
777 782
778 - return that._getNormalPro(orderDetail.is_cancel, +orderDetail.status, orderDetail.create_time); 783 + return that._getNormalPro(orderDetail.is_cancel, +orderDetail.status,
  784 + orderDetail.create_time, statusInfo.statusStr);
779 } 785 }
780 }()); 786 }());
781 787