fe / YOHOBUYPC · Commits

Go to a project

Authored by xuqi
Commit 622ac4c29f18fd6d8e809132388a87467a420a02 1 parent 639b1160

order status

Inline Side-by-side
Showing 2 changed files with 18 additions and 23 deletions
@@ -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 ### 订单详情页
@@ -993,7 +996,7 @@ @@ -993,7 +996,7 @@
993 orderStatus: '订单成功', //订单取消...等订单状态 996 orderStatus: '订单成功', //订单取消...等订单状态
994 orderNum: '', 997 orderNum: '',
995 orderTime: '', 998 orderTime: '',
996 - 999 +
997 //订单状态 1000 //订单状态
998 canceled: true, //是否是取消的订单 1001 canceled: true, //是否是取消的订单
999 completed: true, //是否是已完成订单 1002 completed: true, //是否是已完成订单
@@ -13,6 +13,16 @@ @@ -13,6 +13,16 @@
13 </footer> 13 </footer>
14 14
15 {{!-- 对应订单状态的操作逻辑 --}} 15 {{!-- 对应订单状态的操作逻辑 --}}
  16 +
  17 + {{!-- 完成和取消订单显示删除按钮 --}}
  18 + {{#unless unpaid}}
  19 + {{#unless unreceived}}
  20 + <div class="order-opt">
  21 + <span class="btn del">删除订单</span>
  22 + </div>
  23 + {{/unless}}
  24 + {{/unless}}
  25 +
16 {{#if unpaid}} 26 {{#if unpaid}}
17 <div class="order-opt"> 27 <div class="order-opt">
18 <span class="btn cancel">取消订单</span> 28 <span class="btn cancel">取消订单</span>
@@ -20,27 +30,9 @@ @@ -20,27 +30,9 @@
20 </div> 30 </div>
21 {{/if}} 31 {{/if}}
22 32
23 - {{#with unreceived}}  
24 - <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>  
32 - </div>  
33 - {{/with}}  
34 -  
35 - {{#if canceled}}  
36 - <div class="order-opt">  
37 - <span class="btn del">删除订单</span>  
38 - </div>  
39 - {{/if}}  
40 -  
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>