Authored by 毕凯

Merge branch 'release/6.5.3' of git.yoho.cn:fe/yohobuywap-node into release/6.5.3

@@ -201,14 +201,9 @@ module.exports = class extends global.yoho.BaseModel { @@ -201,14 +201,9 @@ module.exports = class extends global.yoho.BaseModel {
201 }); 201 });
202 } 202 }
203 203
204 - if (orderDetail.links) {  
205 - _.forEach(orderDetail.links, (val) => {  
206 - if (val === 'getExpress') {  
207 - orderDetail = _.assign(orderDetail, {  
208 - expressUrl: helpers.urlFormat('/home/logistic', {order_code: orderCode})  
209 - });  
210 - return;  
211 - } 204 + if (_.get(orderDetail, 'orderDetailInfo.ext.needHref') === 'Y') {
  205 + orderDetail = _.assign(orderDetail, {
  206 + expressUrl: helpers.urlFormat('/home/logistic', {order_code: orderCode})
212 }); 207 });
213 } 208 }
214 209
@@ -161,6 +161,7 @@ @@ -161,6 +161,7 @@
161 } 161 }
162 162
163 .empty { 163 .empty {
  164 + color: #444;
164 height: 300px; 165 height: 300px;
165 line-height: 300px; 166 line-height: 300px;
166 text-align: center; 167 text-align: center;