Authored by 郝肖肖

定金预售去除按钮,并添加提示语

@@ -308,7 +308,8 @@ const getOrders = (params) => { @@ -308,7 +308,8 @@ const getOrders = (params) => {
308 goods: _formatOrderGoods(value.order_goods, count, false, isTickets), 308 goods: _formatOrderGoods(value.order_goods, count, false, isTickets),
309 detailUrl: helpers.urlFormat('/home/orderdetail', {order_code: value.order_code}), 309 detailUrl: helpers.urlFormat('/home/orderdetail', {order_code: value.order_code}),
310 count: value.buy_total, 310 count: value.buy_total,
311 - isVirtual: isTickets 311 + isVirtual: isTickets,
  312 + isDepositAdvance: value.attribute * 1 === 9// 定金预售
312 }); 313 });
313 314
314 /* 如果运费大于0,会显示运费 */ 315 /* 如果运费大于0,会显示运费 */
@@ -14,61 +14,67 @@ @@ -14,61 +14,67 @@
14 </footer> 14 </footer>
15 15
16 {{!-- 对应订单状态的操作逻辑 --}} 16 {{!-- 对应订单状态的操作逻辑 --}}
  17 + {{#if isDepositAdvance}}
  18 + <div class="order-opt">
  19 + <span class="order-opt-info">请到App完成订单相关操作</span>
  20 + </div>
  21 + {{^}}
  22 + {{!-- 完成和取消订单显示删除按钮 --}}
  23 + {{#unless isAdvance}}
  24 + {{#unless unpaid}}
  25 + <div class="order-opt">
  26 + {{#unless unreceived}}
  27 + <span class="btn del">删除订单</span>
  28 + {{#if isVirtual}}
  29 + <!--虚拟商品-->
  30 + {{else}}
  31 + {{#unless useLimitCode}}<span class="btn rebuy">再次购买</span>{{/unless}}
  32 + {{/if}}
  33 + {{/unless}}
17 34
18 - {{!-- 完成和取消订单显示删除按钮 --}}  
19 - {{#unless isAdvance}}  
20 - {{#unless unpaid}}  
21 - <div class="order-opt">  
22 - {{#unless unreceived}}  
23 - <span class="btn del">删除订单</span>  
24 - {{#if isVirtual}}  
25 - <!--虚拟商品-->  
26 - {{else}}  
27 - {{#unless useLimitCode}}<span class="btn rebuy">再次购买</span>{{/unless}} 35 + {{#if qrcode}}
  36 + <a class="locHref" href="{{qrcode}}">
  37 + <span class="btn check-logistics">查看二维码</span>
  38 + </a>
28 {{/if}} 39 {{/if}}
29 - {{/unless}}  
30 -  
31 - {{#if qrcode}}  
32 - <a class="locHref" href="{{qrcode}}">  
33 - <span class="btn check-logistics">查看二维码</span>  
34 - </a>  
35 - {{/if}}  
36 - </div> 40 + </div>
  41 + {{/unless}}
37 {{/unless}} 42 {{/unless}}
38 - {{/unless}}  
39 - {{#unless isAdvance}}  
40 - {{#if unpaid}}  
41 - <div class="order-opt">  
42 - <ul class="count-down hide">  
43 - <li>  
44 - <span class="iconfont count-down-icon">&#xe64a;</span>  
45 - </li>  
46 - <li>  
47 - <span class="hours">{{leftTime}}</span>  
48 - </li>  
49 - </ul>  
50 - <span class="btn cancel">取消订单</span>  
51 - {{#if payUrl}}  
52 - <a class="locHref" href="{{payUrl}}">  
53 - <span class="btn pay">立即付款</span>  
54 - </a>  
55 - {{/if}}  
56 - </div>  
57 - {{/if}}  
58 - {{^}}  
59 - <div class="order-opt">  
60 - *定金预售订单只能在APP端操作  
61 - </div>  
62 - {{/unless}}  
63 43
64 - {{!-- 包含未发货和已发货状态,未发货不传logisticsUrl --}}  
65 - {{#if unreceived}}  
66 - {{#if logisticsUrl}} 44 + {{#unless isAdvance}}
  45 + {{#if unpaid}}
  46 + <div class="order-opt">
  47 + <ul class="count-down hide">
  48 + <li>
  49 + <span class="iconfont count-down-icon">&#xe64a;</span>
  50 + </li>
  51 + <li>
  52 + <span class="hours">{{leftTime}}</span>
  53 + </li>
  54 + </ul>
  55 + <span class="btn cancel">取消订单</span>
  56 + {{#if payUrl}}
  57 + <a class="locHref" href="{{payUrl}}">
  58 + <span class="btn pay">立即付款</span>
  59 + </a>
  60 + {{/if}}
  61 + </div>
  62 + {{/if}}
  63 + {{^}}
67 <div class="order-opt"> 64 <div class="order-opt">
68 - <a class="locHref" href="{{logisticsUrl}}">  
69 - <span class="btn check-logistics">查看物流</span>  
70 - </a> 65 + *定金预售订单只能在APP端操作
71 </div> 66 </div>
  67 + {{/unless}}
  68 +
  69 + {{!-- 包含未发货和已发货状态,未发货不传logisticsUrl --}}
  70 + {{#if unreceived}}
  71 + {{#if logisticsUrl}}
  72 + <div class="order-opt">
  73 + <a class="locHref" href="{{logisticsUrl}}">
  74 + <span class="btn check-logistics">查看物流</span>
  75 + </a>
  76 + </div>
  77 + {{/if}}
72 {{/if}} 78 {{/if}}
73 79
74 {{/if}} 80 {{/if}}
@@ -165,6 +165,9 @@ @@ -165,6 +165,9 @@
165 .rebuy { 165 .rebuy {
166 margin-left: 20px; 166 margin-left: 20px;
167 } 167 }
  168 + .order-opt-info{
  169 + color: #b6b6b6;
  170 + }
168 } 171 }
169 } 172 }
170 173