Authored by xuqi

order status

@@ -976,8 +976,11 @@ @@ -976,8 +976,11 @@
976 completed: true, //已完成 976 completed: true, //已完成
977 canceled: true, //已取消 977 canceled: true, //已取消
978 unpaid: true, //or 未支付 978 unpaid: true, //or 未支付
979 - unshipped: '', //or 未发货,查看物流URL  
980 - unreceived: '', //or 未收货,查看物流URL 979 + unreceived: '', //or 待收货(未发货/未收货),查看物流URL
  980 +
  981 + //待收货时传递物流参数
  982 + logisticsUrl: ''
  983 +
981 } 984 }
982 985
983 ### 订单详情页 986 ### 订单详情页
@@ -13,34 +13,26 @@ @@ -13,34 +13,26 @@
13 </footer> 13 </footer>
14 14
15 {{!-- 对应订单状态的操作逻辑 --}} 15 {{!-- 对应订单状态的操作逻辑 --}}
16 - {{#if unpaid}}  
17 - <div class="order-opt">  
18 - <span class="btn cancel">取消订单</span>  
19 - <span class="btn pay">立即付款</span>  
20 - </div>  
21 - {{/if}}  
22 16
23 - {{#with unreceived}} 17 + {{!-- 完成和取消订单显示删除按钮 --}}
  18 + {{#unless unpaid}}
  19 + {{#unless unreceived}}
24 <div class="order-opt"> 20 <div class="order-opt">
25 - <a class="check-logistics" href="{{.}}">查看物流</a>  
26 - </div>  
27 - {{/with}}  
28 -  
29 - {{#with unshipped}}  
30 - <div class="order-opt">  
31 - <a class="check-logistics" href="{{.}}">查看物流</a> 21 + <span class="btn del">删除订单</span>
32 </div> 22 </div>
33 - {{/with}} 23 + {{/unless}}
  24 + {{/unless}}
34 25
35 - {{#if canceled}} 26 + {{#if unpaid}}
36 <div class="order-opt"> 27 <div class="order-opt">
37 - <span class="btn del">删除订单</span> 28 + <span class="btn cancel">取消订单</span>
  29 + <span class="btn pay">立即付款</span>
38 </div> 30 </div>
39 {{/if}} 31 {{/if}}
40 32
41 - {{#if completed}} 33 + {{#if unreceived}}
42 <div class="order-opt"> 34 <div class="order-opt">
43 - <span class="btn del">删除订单</span> 35 + <a class="check-logistics" href="{{logisticsUrl}}">查看物流</a>
44 </div> 36 </div>
45 {{/if}} 37 {{/if}}
46 </div> 38 </div>