Merge branch 'feature/change-order' into release/5.6

htoooth
Commit c780c02fd1508cf02d8e8b6aa8d6970959cb8fcb 2 parents e670f2af c5242f44
Showing 1 changed file with 2 additions and 2 deletions
apps/home/models/orders-service.js
--- a/apps/home/models/orders-service.js
View file @c780c02
+++ b/apps/home/models/orders-service.js
View file @c780c02
@@ -735,12 +735,12 @@ const _getOrderDetail = co(function * (uid, orderId) {
             if (_.get(orderDetail, 'is_offlineshops') === 'Y') {
                 if (_.get(orderDetail, 'is_delivery_offline') === 'Y') {
                     detail.orderInfo.offlineBySelf = true;
-                     detail.offlineBySelf = true;
+                     detail.offlineBySelf = true; // 进度条的处理
                 } else {
                     detail.orderInfo.offlineByExpress = true;
                 }
 
-                 detail.offlineStore = _.get(orderDetail, 'offline_store', '');
+                 detail.orderInfo.offlineStore = _.get(orderDetail, 'offline_store', '');
             } else {
                 detail.orderInfo.normal = true;
             }