Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5

* 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend:
  与后端对接订单列表优惠卷-待支付状态以及字段修复

src/pages/order/list/list.js

@@ -148,18 +148,18 @@ const Column = [
     type: "slot"
   },
   {
-    title: "折扣",
-    name: "discount",
+    title: "减扣价（元）",
+    name: "discount_amount",
+    prop: "discount_amount",
     type: "normal",
-    prop: "discount",
     width: "80px"
   },
   {
-    title: "结算",
-    name: "total",
-    prop: "total",
-    width: "auto",
-    type: "80px"
+    title: "结算价（元）",
+    name: "pay_amount",
+    prop: "pay_amount",
+    type: "normal",
+    width: "80px"
   },
   {
     title: "key",
@@ -198,11 +198,7 @@ export default class orderlist extends React.Component {
             { id: 111, name: "立减金-待领取" },
             { id: 222, name: "立减金-已领取" },
             { id: 5, name: "立减金-已过期" },
-            { id: 6, name: "优惠券-待支付" },
-            { id: 7, name: "优惠券-已支付" },
-            { id: 8, name: "优惠券-已完成" },
-            { id: 9, name: "优惠券-已取消" },
-            { id: 10, name: "优惠券-充值失败" }
+            { id: 6, name: "优惠券-待支付" }
           ]
         }
       ],
@@ -583,6 +579,7 @@ export default class orderlist extends React.Component {
       })
       .catch((err) => {})
   }
+
   optiononChange(e) {
     let placeholder
     let searchOption = Number(e ? e.key : 0)