Showing
3 changed files
with
9 additions
and
2 deletions
@@ -60,6 +60,10 @@ const _getOrderStatus = (order, showLogistics) => { | @@ -60,6 +60,10 @@ const _getOrderStatus = (order, showLogistics) => { | ||
60 | // 先判断订单付款方式,根据不同的付款方式计算订单状态。(注:货到付款没有待付款状态) | 60 | // 先判断订单付款方式,根据不同的付款方式计算订单状态。(注:货到付款没有待付款状态) |
61 | // 支付方式为非货到付款时,计算订单状态。 | 61 | // 支付方式为非货到付款时,计算订单状态。 |
62 | if (parseInt(order.paymentType, 10) !== 2) { | 62 | if (parseInt(order.paymentType, 10) !== 2) { |
63 | + Object.assign(result, { | ||
64 | + isPayonline: true | ||
65 | + }); | ||
66 | + | ||
63 | switch (order.status) { | 67 | switch (order.status) { |
64 | case 0: | 68 | case 0: |
65 | 69 | ||
@@ -303,6 +307,8 @@ const orderDetailData = (uid, orderCode) => { | @@ -303,6 +307,8 @@ const orderDetailData = (uid, orderCode) => { | ||
303 | cancelReason: resons | 307 | cancelReason: resons |
304 | }); | 308 | }); |
305 | 309 | ||
310 | + //console.log(orderDetail) | ||
311 | + | ||
306 | return orderDetail; | 312 | return orderDetail; |
307 | }); | 313 | }); |
308 | 314 |
@@ -36,6 +36,7 @@ | @@ -36,6 +36,7 @@ | ||
36 | <span class="sub-title">订单编号:{{orderCode}}</span> | 36 | <span class="sub-title">订单编号:{{orderCode}}</span> |
37 | <span >订单状态:{{statusStr}}</span> | 37 | <span >订单状态:{{statusStr}}</span> |
38 | <span>下单时间:<b class="createTime">{{createTime}}</b></span> | 38 | <span>下单时间:<b class="createTime">{{createTime}}</b></span> |
39 | + <span>支付方式:支付宝</span> | ||
39 | </p> | 40 | </p> |
40 | </div> | 41 | </div> |
41 | {{#if logisticsUrl}} | 42 | {{#if logisticsUrl}} |
@@ -70,7 +71,7 @@ | @@ -70,7 +71,7 @@ | ||
70 | </li> | 71 | </li> |
71 | {{/each}} | 72 | {{/each}} |
72 | <li> | 73 | <li> |
73 | - 实付金额 | 74 | + {{#if isPayonline}}实付金额{{else}}应付金额{{/if}} |
74 | <span>{{amount}}</span> | 75 | <span>{{amount}}</span> |
75 | </li> | 76 | </li> |
76 | </ul> | 77 | </ul> |
@@ -69,7 +69,7 @@ module.exports = { | @@ -69,7 +69,7 @@ module.exports = { | ||
69 | port: '4444' // influxdb port | 69 | port: '4444' // influxdb port |
70 | }, | 70 | }, |
71 | console: { | 71 | console: { |
72 | - level: 'error', | 72 | + level: 'debug', |
73 | colorize: 'all', | 73 | colorize: 'all', |
74 | prettyPrint: true | 74 | prettyPrint: true |
75 | } | 75 | } |
-
Please register or login to post a comment