fe / YOHOBUYWAP · Commits

Go to a project

Authored by xuqi
Commit c8ac53afb27e3ece4eb15dea19cf00cbb62f9d03 1 parent e6204cf0

order detail

Inline Side-by-side
Showing 7 changed files with 110 additions and 77 deletions
@@ -1010,7 +1010,9 @@ @@ -1010,7 +1010,9 @@
1010 freight: '' 1010 freight: ''
1011 coupon: '' 1011 coupon: ''
1012 yohoCoin: '' 1012 yohoCoin: ''
1013 - price: '' 1013 + price: '',
  1014 +
  1015 + assessUrl: '' //对于已经完成的订单 传评价url
1014 } 1016 }
1015 } 1017 }
1016 1018
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
5 */ 5 */
6 6
7 require('./order'); 7 require('./order');
  8 +require('./order-detail');
8 require('./fav'); 9 require('./fav');
9 require('./index'); 10 require('./index');
10 require('./coupons'); 11 require('./coupons');
  1 +/**
  2 + * 订单详情页
  3 + * @author: xuqi<qi.xu@yoho.cn>
  4 + * @date: 2015/11/16
  5 + */
  6 +
  7 +var $ = require('jquery'),
  8 + lazyLoad = require('yoho.lazyload'),
  9 + Hammer = require('yoho.hammer');
  10 +
  11 +var orderId = $('#order-detail').data('id');
  12 +
  13 +var delHammer;
  14 +
  15 +lazyLoad();
  16 +
  17 +//订单删除
  18 +delHammer = new Hammer(document.getElementsByClassName('btn-del')[0]);
  19 +delHammer.on('tap', function() {
  20 + if (confirm('确定删除订单吗？')) {
  21 + $.ajax({
  22 + type: 'GET',
  23 + url: '/home/delOrder',
  24 + data: {
  25 + id: orderId
  26 + }
  27 + });
  28 + }
  29 +});
@@ -96,14 +96,6 @@ @@ -96,14 +96,6 @@
96 @include border-radius(5px); 96 @include border-radius(5px);
97 font-size: 26rem / $pxConvertRem; 97 font-size: 26rem / $pxConvertRem;
98 text-align: center; 98 text-align: center;
99 - }  
100 -  
101 - .btn-del {  
102 border: 1px solid #000; 99 border: 1px solid #000;
103 } 100 }
104 -  
105 - .btn-service {  
106 - color: #f00;  
107 - border-color: #f00;  
108 - }  
109 } 101 }
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 - <section class="owner-info block">  
5 - <span class="iconfont">&#xe631;</span>  
6 - <div class="beside-icon">  
7 - <p class="name-phone">  
8 - {{name}}  
9 - <span>{{phoneNum}}</span>  
10 - </p>  
11 - <p class="address">  
12 - {{address}}  
13 - </p>  
14 - </div>  
15 - </section> 4 + <div id="order-detail" data-id="{{id}}">
  5 + <section class="owner-info block">
  6 + <span class="iconfont">&#xe631;</span>
  7 + <div class="beside-icon">
  8 + <p class="name-phone">
  9 + {{name}}
  10 + <span>{{phoneNum}}</span>
  11 + </p>
  12 + <p class="address">
  13 + {{address}}
  14 + </p>
  15 + </div>
  16 + </section>
16 17
17 - <section class="order-status block">  
18 - <div class="status sub">  
19 - <span class="iconfont">&#xe632;</span>  
20 - <p class="beside-icon sub-content">  
21 - <span class="sub-title">{{orderStatus}}</span>  
22 - <span>订单编号：{{orderNum}}</span>  
23 - <span>下单时间：{{orderTime}}</span>  
24 - </p>  
25 - </div>  
26 - {{#unless orderCancel}}  
27 - <a class="logistics sub" href="{{logisticsUrl}}">  
28 - <span class="iconfont">&#xe630;</span> 18 + <section class="order-status block">
  19 + <div class="status sub">
  20 + <span class="iconfont">&#xe632;</span>
29 <p class="beside-icon sub-content"> 21 <p class="beside-icon sub-content">
30 - <span class="sub-title">物流信息</span>  
31 - <span>物流公司：{{logisticsCompany}}</span>  
32 - <span>快递单号：{{logisticsNum}}</span> 22 + <span class="sub-title">{{orderStatus}}</span>
  23 + <span>订单编号：{{orderNum}}</span>
  24 + <span>下单时间：{{orderTime}}</span>
33 </p> 25 </p>
34 - <span class="iconfont">&#xe614;</span>  
35 - </a>  
36 - {{/unless}}  
37 - </section> 26 + </div>
  27 + {{#unless orderCancel}}
  28 + <a class="logistics sub" href="{{logisticsUrl}}">
  29 + <span class="iconfont">&#xe630;</span>
  30 + <p class="beside-icon sub-content">
  31 + <span class="sub-title">物流信息</span>
  32 + <span>物流公司：{{logisticsCompany}}</span>
  33 + <span>快递单号：{{logisticsNum}}</span>
  34 + </p>
  35 + <span class="iconfont">&#xe614;</span>
  36 + </a>
  37 + {{/unless}}
  38 + </section>
38 39
39 - <section class="goods block">  
40 - {{# goods}}  
41 - {{> me/order/good}}  
42 - {{/ goods}}  
43 - </section> 40 + <section class="goods block">
  41 + {{# goods}}
  42 + {{> me/order/good}}
  43 + {{/ goods}}
  44 + </section>
44 45
45 - <ul class="cost block">  
46 - <li>  
47 - 商品总金额  
48 - <span>¥{{sumPrice}}</span>  
49 - </li>  
50 - <li>  
51 - 活动金额  
52 - <span>-¥{{salePrice}}</span>  
53 - </li>  
54 - <li>  
55 - 运费  
56 - <span>+¥{{freight}}</span>  
57 - </li>  
58 - <li>  
59 - 优惠券  
60 - <span>-¥{{coupon}}</span>  
61 - </li>  
62 - <li>  
63 - YOHO币  
64 - <span>-¥{{yohoCoin}}</span>  
65 - </li>  
66 - <li>  
67 - 实付金额  
68 - <span>¥{{price}}</span>  
69 - </li>  
70 - </ul> 46 + <ul class="cost block">
  47 + <li>
  48 + 商品总金额
  49 + <span>¥{{sumPrice}}</span>
  50 + </li>
  51 + <li>
  52 + 活动金额
  53 + <span>-¥{{salePrice}}</span>
  54 + </li>
  55 + <li>
  56 + 运费
  57 + <span>+¥{{freight}}</span>
  58 + </li>
  59 + <li>
  60 + 优惠券
  61 + <span>-¥{{coupon}}</span>
  62 + </li>
  63 + <li>
  64 + YOHO币
  65 + <span>-¥{{yohoCoin}}</span>
  66 + </li>
  67 + <li>
  68 + 实付金额
  69 + <span>¥{{price}}</span>
  70 + </li>
  71 + </ul>
71 72
72 - <div class="opt block">  
73 - <span class="btn btn-del">删除订单</span> 73 + <div class="opt block">
  74 + <span class="btn btn-del">删除订单</span>
74 75
75 - {{#if orderCompleted}}  
76 - <span class="btn btn-service">申请售后</span>  
77 - {{/if}} 76 + {{#if orderCompleted}}
  77 + <a href="{{assessUrl}}">
  78 + <span class="btn btn-assess">评价商品</span>
  79 + </a>
  80 + {{/if}}
  81 + </div>
78 </div> 82 </div>
79 {{/ orderDetail}} 83 {{/ orderDetail}}
80 </div> 84 </div>
@@ -212,6 +212,11 @@ @@ -212,6 +212,11 @@
212 seajs.use('js/me/order'); 212 seajs.use('js/me/order');
213 </script> 213 </script>
214 {{/if}} 214 {{/if}}
  215 +{{#if orderDetailPage}}
  216 +<script>
  217 + seajs.use('js/me/order-detail');
  218 +</script>
  219 +{{/if}}
215 220
216 {{!-- 个人中心: 商品收藏&品牌收藏 --}} 221 {{!-- 个人中心: 商品收藏&品牌收藏 --}}
217 {{#if favPage}} 222 {{#if favPage}}
@@ -430,6 +430,6 @@ class HomeController extends AbstractAction @@ -430,6 +430,6 @@ class HomeController extends AbstractAction
430 'yohoCoin' => 5, 430 'yohoCoin' => 5,
431 'price' => 719 431 'price' => 719
432 ); 432 );
433 - $this->_view->display('order-detail', array('orderDetail' => $data)); 433 + $this->_view->display('order-detail', array('orderDetail' => $data, 'orderDetailPage' => true));
434 } 434 }
435 } 435 }