Authored by lzhy

修改

@@ -23,6 +23,7 @@ @@ -23,6 +23,7 @@
23 <td>{{ goods.productPrice && goods.productPrice.retailPrice ? goods.productPrice.retailPrice : '' }}</td> 23 <td>{{ goods.productPrice && goods.productPrice.retailPrice ? goods.productPrice.retailPrice : '' }}</td>
24 <td>{{ goods.salePrice }}</td> 24 <td>{{ goods.salePrice }}</td>
25 <td>{{ goods.lastPrice }}</td> 25 <td>{{ goods.lastPrice }}</td>
  26 + <td>{{ goods.discountPrice }}</td>
26 <td> 27 <td>
27 {{ 28 {{
28 goodsPromos[goods.id] && goodsPromos[goods.id].couponsDiscountAmount 29 goodsPromos[goods.id] && goodsPromos[goods.id].couponsDiscountAmount
@@ -50,13 +51,13 @@ @@ -50,13 +51,13 @@
50 </tbody> 51 </tbody>
51 <tfoot> 52 <tfoot>
52 <tr> 53 <tr>
53 - <td colspan="13" style="text-align: left"> 54 + <td colspan="14" style="text-align: left">
54 <span>实付金额:¥{{ orderInfo.lastOrderAmount }}</span> 55 <span>实付金额:¥{{ orderInfo.lastOrderAmount }}</span>
55 <span>快递费:¥{{ orderInfo.shippingCost }}</span> 56 <span>快递费:¥{{ orderInfo.shippingCost }}</span>
56 </td> 57 </td>
57 </tr> 58 </tr>
58 <tr> 59 <tr>
59 - <td td colspan="13"> 60 + <td td colspan="14">
60 <div class="ivu-card"> 61 <div class="ivu-card">
61 <div class="ivu-card-head" style="text-align: left"> 62 <div class="ivu-card-head" style="text-align: left">
62 <p slot="title">使用优惠券</p> 63 <p slot="title">使用优惠券</p>
@@ -66,7 +67,7 @@ @@ -66,7 +67,7 @@
66 </td> 67 </td>
67 </tr> 68 </tr>
68 <tr> 69 <tr>
69 - <td colspan="13"> 70 + <td colspan="14">
70 <div class="ivu-card"> 71 <div class="ivu-card">
71 <div class="ivu-card-head" style="text-align: left"> 72 <div class="ivu-card-head" style="text-align: left">
72 <p slot="title">参与促销</p> 73 <p slot="title">参与促销</p>
@@ -108,6 +109,7 @@ export default { @@ -108,6 +109,7 @@ export default {
108 { title: '吊牌价', width: '6%' }, 109 { title: '吊牌价', width: '6%' },
109 { title: '销售价', width: '6%' }, 110 { title: '销售价', width: '6%' },
110 { title: '成交价', width: '6%' }, 111 { title: '成交价', width: '6%' },
  112 + { title: 'VIP折扣', width: '6%' },
111 { title: '优惠券', width: '6%' }, 113 { title: '优惠券', width: '6%' },
112 { title: 'YOHO币', width: '6%' }, 114 { title: 'YOHO币', width: '6%' },
113 { title: '红包', width: '6%' }, 115 { title: '红包', width: '6%' },
@@ -97,7 +97,7 @@ const domainApis = { @@ -97,7 +97,7 @@ const domainApis = {
97 orderDetail: '/erp-gateway-web/shop/orders/queryOrdersDetail', //订单详情 97 orderDetail: '/erp-gateway-web/shop/orders/queryOrdersDetail', //订单详情
98 queryOrderGoods: '/erp-gateway-web/shop/orders/queryOrdersGoodsAndPrice', //获取订单商品 98 queryOrderGoods: '/erp-gateway-web/shop/orders/queryOrdersGoodsAndPrice', //获取订单商品
99 queryOrderGoodsPromos: '/erp-gateway-web/cs/order/goodspromos/query', //获取订单商品的促销 99 queryOrderGoodsPromos: '/erp-gateway-web/cs/order/goodspromos/query', //获取订单商品的促销
100 - queryOrderCoupons: '/erp-gateway-web/cs/order/coupons', //获取订单优惠券 100 + queryOrderCoupons: '/erp-gateway-web/shop/orders/queryShopOrderCoupons', //获取订单优惠券
101 queryOrderPromos: '/erp-gateway-web/cs/order/promotions', //获取订单促销 101 queryOrderPromos: '/erp-gateway-web/cs/order/promotions', //获取订单促销
102 confirmExpress: '/erp-gateway-web/shop/orders/ordersUpdateExpress', //订单确认物流 102 confirmExpress: '/erp-gateway-web/shop/orders/ordersUpdateExpress', //订单确认物流
103 exportOrdersByStatus: '/erp-gateway-web/shop/export/exportOrdersByStatus', //导出订单列表 103 exportOrdersByStatus: '/erp-gateway-web/shop/export/exportOrdersByStatus', //导出订单列表