Authored by htoooth

fix

@@ -562,7 +562,7 @@ const _getOfflineBySelf = (isCancel, status, createTime) => { @@ -562,7 +562,7 @@ const _getOfflineBySelf = (isCancel, status, createTime) => {
562 if (status === 0) { 562 if (status === 0) {
563 process.percent = '50%'; 563 process.percent = '50%';
564 process.middleStatus[0].cur = true; 564 process.middleStatus[0].cur = true;
565 - } else if (status > 0 && status < 4) { 565 + } else if (status === 6) {
566 process.percent = '100%'; 566 process.percent = '100%';
567 process.middleStatus[1].cur = true; 567 process.middleStatus[1].cur = true;
568 } 568 }
@@ -731,10 +731,11 @@ const _getOrderDetail = co(function * (uid, orderId) { @@ -731,10 +731,11 @@ const _getOrderDetail = co(function * (uid, orderId) {
731 phone: _.fill(orderDetail.mobile.split(''), '*', 3, 4).join('') + 731 phone: _.fill(orderDetail.mobile.split(''), '*', 3, 4).join('') +
732 (orderDetail.phone ? ',' + _.fill(orderDetail.phone.split(''), '*', 3, 5).join('') : '') 732 (orderDetail.phone ? ',' + _.fill(orderDetail.phone.split(''), '*', 3, 5).join('') : '')
733 }; 733 };
734 - console.log(orderDetail); 734 +
735 if (_.get(orderDetail, 'is_offlineshops') === 'Y') { 735 if (_.get(orderDetail, 'is_offlineshops') === 'Y') {
736 if (_.get(orderDetail, 'is_delivery_offline') === 'Y') { 736 if (_.get(orderDetail, 'is_delivery_offline') === 'Y') {
737 detail.orderInfo.offlineBySelf = true; 737 detail.orderInfo.offlineBySelf = true;
  738 + detail.offlineBySelf = true;
738 } else { 739 } else {
739 detail.orderInfo.offlineByExpress = true; 740 detail.orderInfo.offlineByExpress = true;
740 } 741 }
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <div class="me-main"> 6 <div class="me-main">
7 <div class="order-detail block" data-id="{{orderNum}}"> 7 <div class="order-detail block" data-id="{{orderNum}}">
8 <h2 class="title"></h2> 8 <h2 class="title"></h2>
9 - <div class="detail-info{{#if virtualGoods}} virtual-detail{{/if}}"> 9 + <div class="detail-info{{#if virtualGoods}} virtual-detail{{/if}} {{#if offlineBySelf}}offline-self{{/if}}">
10 <div class="status"> 10 <div class="status">
11 <p> 11 <p>
12 订单编号: 12 订单编号:
@@ -91,20 +91,20 @@ @@ -91,20 +91,20 @@
91 {{/if}} 91 {{/if}}
92 92
93 {{# orderInfo}} 93 {{# orderInfo}}
  94 + {{log this}}
94 <div class="order-info"> 95 <div class="order-info">
95 <p class="sub-title"> 96 <p class="sub-title">
96 <span class="icon"></span> 97 <span class="icon"></span>
97 订单信息 98 订单信息
98 </p> 99 </p>
99 <div class="content"> 100 <div class="content">
100 -  
101 - {{#if orderInfo.normal}} 101 + {{#if normal}}
102 <p>收货人:{{receiver}}</p> 102 <p>收货人:{{receiver}}</p>
103 <p>收货地址:{{address}}</p> 103 <p>收货地址:{{address}}</p>
104 <p>联系电话:{{phone}}</p> 104 <p>联系电话:{{phone}}</p>
105 {{/if}} 105 {{/if}}
106 106
107 - {{#if orderInof.offlineByExpress}} 107 + {{#if offlineByExpress}}
108 <p>收货人:{{receiver}}</p> 108 <p>收货人:{{receiver}}</p>
109 <p>收货地址:{{address}}</p> 109 <p>收货地址:{{address}}</p>
110 <p>联系电话:{{phone}}</p> 110 <p>联系电话:{{phone}}</p>
@@ -112,7 +112,7 @@ @@ -112,7 +112,7 @@
112 112
113 {{/if}} 113 {{/if}}
114 114
115 - {{#if orderInof.offlineBySelf}} 115 + {{#if offlineBySelf}}
116 <p>下单门店:{{offlineStore}}</p> 116 <p>下单门店:{{offlineStore}}</p>
117 <p>配送方式:门店取货</p> 117 <p>配送方式:门店取货</p>
118 {{/if}} 118 {{/if}}
@@ -138,6 +138,21 @@ @@ -138,6 +138,21 @@
138 } 138 }
139 } 139 }
140 140
  141 + .offline-self {
  142 + .pg-1 {
  143 + left: 515px;
  144 + }
  145 +
  146 + .outter-progress {
  147 + background: resolve(home/virtual-order-progress.png) no-repeat 0 0;
  148 + }
  149 +
  150 + .inner-progress {
  151 + background: resolve(home/virtual-order-progress.png) no-repeat 0 -12px;
  152 + }
  153 + }
  154 +
  155 +
141 .outter-progress { 156 .outter-progress {
142 width: 552px; 157 width: 552px;
143 height: 12px; 158 height: 12px;