fe / yohobuywap-node · Commits

Go to a project

Authored by zhangxiaoru
Commit df0c01eeff99a1da02ff4fc02c0cd4ef5bcef01f 2 parents 10204c01 a4994659

merge

Inline Side-by-side
Showing 3 changed files with 50 additions and 33 deletions
@@ -251,6 +251,13 @@ const orderDetailData = (uid, orderCode) => { @@ -251,6 +251,13 @@ const orderDetailData = (uid, orderCode) => {
251 }); 251 });
252 } 252 }
253 253
  254 + // 定金预售
  255 + if (orderDetail.attribute * 1 === 9) {
  256 + orderDetail = _.assign(orderDetail, {
  257 + isDepositAdvance: true
  258 + });
  259 + }
  260 +
254 // 判断是否有关联订单 261 // 判断是否有关联订单
255 if (orderDetail.relateOrderCode === 'Y') { 262 if (orderDetail.relateOrderCode === 'Y') {
256 orderDetail = _.assign(orderDetail, { 263 orderDetail = _.assign(orderDetail, {
@@ -105,44 +105,50 @@ @@ -105,44 +105,50 @@
105 {{/invoice}} 105 {{/invoice}}
106 106
107 <div class="opt block"> 107 <div class="opt block">
108 - {{#unless unreceived}}  
109 - {{#unless unpaid}}  
110 - <span class="btn btn-del">删除订单</span>  
111 - {{#if isVirtual}}  
112 - <!--虚拟商品-->  
113 - {{else}}  
114 - {{#unless useLimitCode}}<span class="btn btn-rebuy">再次购买</span>{{/unless}}  
115 - {{/if}} 108 + {{#if isDepositAdvance}}
  109 + <div class="order-opt">
  110 + <span class="order-opt-info">请到App完成订单相关操作</span>
  111 + </div>
  112 + {{else}}
  113 + {{#unless unreceived}}
  114 + {{#unless unpaid}}
  115 + <span class="btn btn-del">删除订单</span>
  116 + {{#if isVirtual}}
  117 + <!--虚拟商品-->
  118 + {{else}}
  119 + {{#unless useLimitCode}}<span class="btn btn-rebuy">再次购买</span>{{/unless}}
  120 + {{/if}}
  121 + {{/unless}}
116 {{/unless}} 122 {{/unless}}
117 - {{/unless}}  
118 123
119 - {{#if unpaid}}  
120 - <ul class="count-down hide">  
121 - <li>  
122 - <span class="iconfont count-down-icon">&#xe64a;</span>  
123 - </li>  
124 - <li>  
125 - <span class="hours">{{leftTime}}</span>  
126 - </li>  
127 - </ul>  
128 - <span class="btn btn-cancel">取消订单</span>  
129 - {{#if payUrl}}  
130 - <a href="{{payUrl}}">  
131 - <span class="btn btn-pay">立即付款</span>  
132 - </a> 124 + {{#if unpaid}}
  125 + <ul class="count-down hide">
  126 + <li>
  127 + <span class="iconfont count-down-icon">&#xe64a;</span>
  128 + </li>
  129 + <li>
  130 + <span class="hours">{{leftTime}}</span>
  131 + </li>
  132 + </ul>
  133 + <span class="btn btn-cancel">取消订单</span>
  134 + {{#if payUrl}}
  135 + <a href="{{payUrl}}">
  136 + <span class="btn btn-pay">立即付款</span>
  137 + </a>
  138 + {{/if}}
133 {{/if}} 139 {{/if}}
134 - {{/if}}  
135 140
136 - {{#if logisticsUrl}}  
137 - <a href="{{logisticsUrl}}">  
138 - <span class="btn btn-check-logistics">查看物流</span>  
139 - </a>  
140 - {{/if}} 141 + {{#if logisticsUrl}}
  142 + <a href="{{logisticsUrl}}">
  143 + <span class="btn btn-check-logistics">查看物流</span>
  144 + </a>
  145 + {{/if}}
141 146
142 - {{#if qrcode}}  
143 - <a href="{{qrcode}}">  
144 - <span class="btn btn-check-logistics">查看二维码</span>  
145 - </a> 147 + {{#if qrcode}}
  148 + <a href="{{qrcode}}">
  149 + <span class="btn btn-check-logistics">查看二维码</span>
  150 + </a>
  151 + {{/if}}
146 {{/if}} 152 {{/if}}
147 </div> 153 </div>
148 </div> 154 </div>
@@ -173,6 +173,10 @@ @@ -173,6 +173,10 @@
173 border-top: 1px solid #e0e0e0; 173 border-top: 1px solid #e0e0e0;
174 } 174 }
175 175
  176 + .order-opt-info {
  177 + color: #b6b6b6;
  178 + }
  179 +
176 .btn { 180 .btn {
177 display: inline-block; 181 display: inline-block;
178 box-sizing: border-box; 182 box-sizing: border-box;