Showing
4 changed files
with
25 additions
and
5 deletions
@@ -974,8 +974,9 @@ | @@ -974,8 +974,9 @@ | ||
974 | sumCost: '199.00', | 974 | sumCost: '199.00', |
975 | //status | 975 | //status |
976 | completed: true, //已完成 | 976 | completed: true, //已完成 |
977 | + canceled: true, //已取消 | ||
977 | unpaid: true, //or 未支付 | 978 | unpaid: true, //or 未支付 |
978 | - unshipped: true, //or 未发货 | 979 | + unshipped: '', //or 未发货,查看物流URL |
979 | unreceived: '', //or 未收货,查看物流URL | 980 | unreceived: '', //or 未收货,查看物流URL |
980 | } | 981 | } |
981 | 982 | ||
@@ -983,6 +984,8 @@ | @@ -983,6 +984,8 @@ | ||
983 | 984 | ||
984 | { | 985 | { |
985 | orderDetail: { | 986 | orderDetail: { |
987 | + orderNum: '', //订单号 | ||
988 | + | ||
986 | name: '', //收货人姓名 | 989 | name: '', //收货人姓名 |
987 | phoneNum: '', | 990 | phoneNum: '', |
988 | address: '', | 991 | address: '', |
@@ -45,15 +45,13 @@ | @@ -45,15 +45,13 @@ | ||
45 | width: 140rem / $pxConvertRem; | 45 | width: 140rem / $pxConvertRem; |
46 | font-size: 24rem / $pxConvertRem; | 46 | font-size: 24rem / $pxConvertRem; |
47 | text-align: center; | 47 | text-align: center; |
48 | - } | ||
49 | - | ||
50 | - .cancel { | ||
51 | border: 1px solid #000; | 48 | border: 1px solid #000; |
52 | } | 49 | } |
53 | 50 | ||
54 | .pay { | 51 | .pay { |
55 | background: #d0021b; | 52 | background: #d0021b; |
56 | color: #fff; | 53 | color: #fff; |
54 | + border: none; | ||
57 | margin-left: 20rem / $pxConvertRem; | 55 | margin-left: 20rem / $pxConvertRem; |
58 | } | 56 | } |
59 | } | 57 | } |
1 | {{> layout/header}} | 1 | {{> layout/header}} |
2 | <div class="order-detail-page yoho-page"> | 2 | <div class="order-detail-page yoho-page"> |
3 | {{# orderDetail}} | 3 | {{# orderDetail}} |
4 | - <div id="order-detail" data-id="{{id}}"> | 4 | + <div id="order-detail" data-id="{{orderNum}}"> |
5 | <section class="owner-info block"> | 5 | <section class="owner-info block"> |
6 | <span class="iconfont"></span> | 6 | <span class="iconfont"></span> |
7 | <div class="beside-icon"> | 7 | <div class="beside-icon"> |
@@ -12,6 +12,7 @@ | @@ -12,6 +12,7 @@ | ||
12 | 共{{count}}件商品 实付<span class="sum-cost">¥{{sumCost}}</span> | 12 | 共{{count}}件商品 实付<span class="sum-cost">¥{{sumCost}}</span> |
13 | </footer> | 13 | </footer> |
14 | 14 | ||
15 | + {{!-- 对应订单状态的操作逻辑 --}} | ||
15 | {{#if unpaid}} | 16 | {{#if unpaid}} |
16 | <div class="order-opt"> | 17 | <div class="order-opt"> |
17 | <span class="btn cancel">取消订单</span> | 18 | <span class="btn cancel">取消订单</span> |
@@ -24,4 +25,22 @@ | @@ -24,4 +25,22 @@ | ||
24 | <a class="check-logistics" href="{{.}}">查看物流</a> | 25 | <a class="check-logistics" href="{{.}}">查看物流</a> |
25 | </div> | 26 | </div> |
26 | {{/with}} | 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}} | ||
42 | + <div class="order-opt"> | ||
43 | + <span class="btn del">删除订单</span> | ||
44 | + </div> | ||
45 | + {{/if}} | ||
27 | </div> | 46 | </div> |
-
Please register or login to post a comment