HandOver-liuwu
/
frontend
mirror of https://codeup.aliyun.com/lsxd/marketing/frontend.git
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
  与后端对接订单列表优惠卷-待支付状态以及字段修复
This commit is contained in:
Apple 2022-09-19 11:01:26 +08:00
parent a6d24316b4 66ea51b220
commit f91182f41e
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/pages/order/list/list.js
View File

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