Showing
3 changed files
with
10 additions
and
10 deletions
@@ -105,7 +105,7 @@ const ORDER_OP_ALL = [ | @@ -105,7 +105,7 @@ const ORDER_OP_ALL = [ | ||
105 | hrefFun: it => helpers.urlFormat('/home/orders/detail', {orderCode: it}) | 105 | hrefFun: it => helpers.urlFormat('/home/orders/detail', {orderCode: it}) |
106 | }, | 106 | }, |
107 | { | 107 | { |
108 | - type: 'refund', | 108 | + type: 'refundApply', |
109 | name: '申请退款', | 109 | name: '申请退款', |
110 | refund: true, | 110 | refund: true, |
111 | hrefFun: () => 'javascript:void(0)' | 111 | hrefFun: () => 'javascript:void(0)' |
@@ -400,6 +400,7 @@ const getOrders = (uid, page, limit, type, isPage)=> { | @@ -400,6 +400,7 @@ const getOrders = (uid, page, limit, type, isPage)=> { | ||
400 | } | 400 | } |
401 | 401 | ||
402 | newOrder.operation = _getOperateInfo(order.order_code, op); | 402 | newOrder.operation = _getOperateInfo(order.order_code, op); |
403 | + console.log(newOrder.operation); | ||
403 | return newOrder; | 404 | return newOrder; |
404 | }; | 405 | }; |
405 | 406 |
@@ -22,9 +22,9 @@ module.exports = { | @@ -22,9 +22,9 @@ module.exports = { | ||
22 | //service: 'http://service-test3.yohops.com:9999/', | 22 | //service: 'http://service-test3.yohops.com:9999/', |
23 | 23 | ||
24 | // prod | 24 | // prod |
25 | - singleApi: 'http://single.yoho.cn/', | ||
26 | - api: 'http://api.yoho.cn/', | ||
27 | - service: 'http://service.yoho.cn/', | 25 | + //singleApi: 'http://single.yoho.cn/', |
26 | + //api: 'http://api.yoho.cn/', | ||
27 | + //service: 'http://service.yoho.cn/', | ||
28 | 28 | ||
29 | // gray | 29 | // gray |
30 | // singleApi: 'http://single.gray.yohops.com/', | 30 | // singleApi: 'http://single.gray.yohops.com/', |
@@ -32,8 +32,8 @@ module.exports = { | @@ -32,8 +32,8 @@ module.exports = { | ||
32 | // service: 'http://service.gray.yohops.com/', | 32 | // service: 'http://service.gray.yohops.com/', |
33 | 33 | ||
34 | // dev | 34 | // dev |
35 | - // api: 'http://dev-api.yohops.com:9999/', | ||
36 | - // service: 'http://dev-service.yohops.com:9999/', | 35 | + api: 'http://dev-api.yohops.com:9999/', |
36 | + service: 'http://dev-service.yohops.com:9999/', | ||
37 | 37 | ||
38 | imSocket: 'ws://socket.yohobuy.com:10240', | 38 | imSocket: 'ws://socket.yohobuy.com:10240', |
39 | imCs: 'http://im.yohobuy.com/api', | 39 | imCs: 'http://im.yohobuy.com/api', |
1 | <script id="cancel-dialog-tpl" type="text/html"> | 1 | <script id="cancel-dialog-tpl" type="text/html"> |
2 | - <header>取消订单</header> | 2 | + <header>申请退款</header> |
3 | <p class="tip">您取消订单的原因是:</p> | 3 | <p class="tip">您取消订单的原因是:</p> |
4 | <ul class="cancel-reason clearfix"> | 4 | <ul class="cancel-reason clearfix"> |
5 | {{# cancelReason}} | 5 | {{# cancelReason}} |
@@ -12,9 +12,8 @@ | @@ -12,9 +12,8 @@ | ||
12 | </ul> | 12 | </ul> |
13 | <p class="tip reminder">温馨提示:</p> | 13 | <p class="tip reminder">温馨提示:</p> |
14 | <ul class="info-prompt"> | 14 | <ul class="info-prompt"> |
15 | - <li><i>*</i>订单成功取消后无法恢复</li> | ||
16 | - <li><i>*</i>该订单已付金额将原路返回</li> | ||
17 | - <li><i>*</i>取消订单后,存在促销关系的子订单及优惠可能会一并取消</li> | 15 | + <li><i>*</i>申请退款后,本单享有的优惠可能会一并取消。</li> |
16 | + <li><i>*</i>该订单已付金额将原路返回,请您耐心等待。</li> | ||
18 | </ul> | 17 | </ul> |
19 | <p class="cancel-tip"></p> | 18 | <p class="cancel-tip"></p> |
20 | </script> | 19 | </script> |
-
Please register or login to post a comment