Authored by htoooth

fix

... ... @@ -562,7 +562,7 @@ const _getOfflineBySelf = (isCancel, status, createTime) => {
if (status === 0) {
process.percent = '50%';
process.middleStatus[0].cur = true;
} else if (status > 0 && status < 4) {
} else if (status === 6) {
process.percent = '100%';
process.middleStatus[1].cur = true;
}
... ... @@ -731,10 +731,11 @@ const _getOrderDetail = co(function * (uid, orderId) {
phone: _.fill(orderDetail.mobile.split(''), '*', 3, 4).join('') +
(orderDetail.phone ? ',' + _.fill(orderDetail.phone.split(''), '*', 3, 5).join('') : '')
};
console.log(orderDetail);
if (_.get(orderDetail, 'is_offlineshops') === 'Y') {
if (_.get(orderDetail, 'is_delivery_offline') === 'Y') {
detail.orderInfo.offlineBySelf = true;
detail.offlineBySelf = true;
} else {
detail.orderInfo.offlineByExpress = true;
}
... ...
... ... @@ -6,7 +6,7 @@
<div class="me-main">
<div class="order-detail block" data-id="{{orderNum}}">
<h2 class="title"></h2>
<div class="detail-info{{#if virtualGoods}} virtual-detail{{/if}}">
<div class="detail-info{{#if virtualGoods}} virtual-detail{{/if}} {{#if offlineBySelf}}offline-self{{/if}}">
<div class="status">
<p>
订单编号:
... ... @@ -91,20 +91,20 @@
{{/if}}
{{# orderInfo}}
{{log this}}
<div class="order-info">
<p class="sub-title">
<span class="icon"></span>
订单信息
</p>
<div class="content">
{{#if orderInfo.normal}}
{{#if normal}}
<p>收货人:{{receiver}}</p>
<p>收货地址:{{address}}</p>
<p>联系电话:{{phone}}</p>
{{/if}}
{{#if orderInof.offlineByExpress}}
{{#if offlineByExpress}}
<p>收货人:{{receiver}}</p>
<p>收货地址:{{address}}</p>
<p>联系电话:{{phone}}</p>
... ... @@ -112,7 +112,7 @@
{{/if}}
{{#if orderInof.offlineBySelf}}
{{#if offlineBySelf}}
<p>下单门店:{{offlineStore}}</p>
<p>配送方式:门店取货</p>
{{/if}}
... ...
... ... @@ -138,6 +138,21 @@
}
}
.offline-self {
.pg-1 {
left: 515px;
}
.outter-progress {
background: resolve(home/virtual-order-progress.png) no-repeat 0 0;
}
.inner-progress {
background: resolve(home/virtual-order-progress.png) no-repeat 0 -12px;
}
}
.outter-progress {
width: 552px;
height: 12px;
... ...