Showing
5 changed files
with
54 additions
and
8 deletions
@@ -899,7 +899,7 @@ | @@ -899,7 +899,7 @@ | ||
899 | ### 我的订单 | 899 | ### 我的订单 |
900 | { | 900 | { |
901 | order: { | 901 | order: { |
902 | - allOrders: [ | 902 | + orders: [ |
903 | ... | 903 | ... |
904 | ] | 904 | ] |
905 | } | 905 | } |
@@ -925,5 +925,10 @@ | @@ -925,5 +925,10 @@ | ||
925 | ... | 925 | ... |
926 | ], | 926 | ], |
927 | count: 1, | 927 | count: 1, |
928 | - sumCost: '199.00' | 928 | + sumCost: '199.00', |
929 | + //status | ||
930 | + completed: true, //已完成 | ||
931 | + unpaid: true, //or 未支付 | ||
932 | + unshipped: true, //or 未发货 | ||
933 | + unreceived: '', //or 未收货,查看物流URL | ||
929 | } | 934 | } |
@@ -30,6 +30,33 @@ | @@ -30,6 +30,33 @@ | ||
30 | .sum-cost { | 30 | .sum-cost { |
31 | color: #e01; | 31 | color: #e01; |
32 | } | 32 | } |
33 | + | ||
34 | + .order-opt { | ||
35 | + padding: 30rem / $pxConvertRem 0; | ||
36 | + padding-right: 30rem / $pxConvertRem; | ||
37 | + border-top: 1px solid #e0e0e0; | ||
38 | + text-align: right; | ||
39 | + | ||
40 | + > .btn { | ||
41 | + display: inline-block; | ||
42 | + box-sizing: border-box; | ||
43 | + height: 60rem / $pxConvertRem; | ||
44 | + line-height: 60rem / $pxConvertRem; | ||
45 | + width: 140rem / $pxConvertRem; | ||
46 | + font-size: 24rem / $pxConvertRem; | ||
47 | + text-align: center; | ||
48 | + } | ||
49 | + | ||
50 | + .cancel { | ||
51 | + border: 1px solid #000; | ||
52 | + } | ||
53 | + | ||
54 | + .pay { | ||
55 | + background: #d0021b; | ||
56 | + color: #fff; | ||
57 | + margin-left: 20rem / $pxConvertRem; | ||
58 | + } | ||
59 | + } | ||
33 | } | 60 | } |
34 | } | 61 | } |
35 | 62 |
@@ -18,11 +18,11 @@ | @@ -18,11 +18,11 @@ | ||
18 | 18 | ||
19 | <div id="order-container" class="order-container"> | 19 | <div id="order-container" class="order-container"> |
20 | <div class="all orders"> | 20 | <div class="all orders"> |
21 | - {{# allOrders}} | 21 | + {{#each orders}} |
22 | {{> me/order/order}} | 22 | {{> me/order/order}} |
23 | - {{/ allOrders}} | 23 | + {{/each}} |
24 | </div> | 24 | </div> |
25 | - <div class="obligation orders hide"></div> | 25 | + <div class="unpaid orders hide"></div> |
26 | <div class="unshipped orders hide"></div> | 26 | <div class="unshipped orders hide"></div> |
27 | <div class="unreceived orders hide"></div> | 27 | <div class="unreceived orders hide"></div> |
28 | </div> | 28 | </div> |
1 | -<div class="order"> | 1 | +<div class="order" data-id="{{orderNum}}"> |
2 | <header class="header"> | 2 | <header class="header"> |
3 | 订单编号:{{orderNum}} | 3 | 订单编号:{{orderNum}} |
4 | <span class="trading-status">{{tradingStatus}}</span> | 4 | <span class="trading-status">{{tradingStatus}}</span> |
@@ -11,4 +11,17 @@ | @@ -11,4 +11,17 @@ | ||
11 | <footer class="footer"> | 11 | <footer class="footer"> |
12 | 共{{count}}件商品 实付<span class="sum-cost">¥{{sumCost}}</span> | 12 | 共{{count}}件商品 实付<span class="sum-cost">¥{{sumCost}}</span> |
13 | </footer> | 13 | </footer> |
14 | + | ||
15 | + {{#if unpaid}} | ||
16 | + <div class="order-opt"> | ||
17 | + <span class="btn cancel">取消订单</span> | ||
18 | + <span class="btn pay">立即付款</span> | ||
19 | + </div> | ||
20 | + {{/if}} | ||
21 | + | ||
22 | + {{#with unreceived}} | ||
23 | + <div class="order-opt"> | ||
24 | + <a class="check-logistics" href="{{.}}">查看物流</a> | ||
25 | + </div> | ||
26 | + {{/with}} | ||
14 | </div> | 27 | </div> |
@@ -45,7 +45,7 @@ class HomeController extends AbstractAction | @@ -45,7 +45,7 @@ class HomeController extends AbstractAction | ||
45 | // $orders = \Index\UserModel::getUserOrderData(967016, $type); | 45 | // $orders = \Index\UserModel::getUserOrderData(967016, $type); |
46 | 46 | ||
47 | $order = array( | 47 | $order = array( |
48 | - 'allOrders' => array( | 48 | + 'orders' => array( |
49 | array( | 49 | array( |
50 | 'orderNum' => '408539077', | 50 | 'orderNum' => '408539077', |
51 | 'tradingStatus' => '交易成功', | 51 | 'tradingStatus' => '交易成功', |
@@ -71,7 +71,8 @@ class HomeController extends AbstractAction | @@ -71,7 +71,8 @@ class HomeController extends AbstractAction | ||
71 | ) | 71 | ) |
72 | ), | 72 | ), |
73 | 'count' => 2, | 73 | 'count' => 2, |
74 | - 'sumCost' => '699.00' | 74 | + 'sumCost' => '699.00', |
75 | + 'unpaid' => true, | ||
75 | ) | 76 | ) |
76 | ) | 77 | ) |
77 | ); | 78 | ); |
-
Please register or login to post a comment