From 5a3d09c58f7760a3893a20c519e83b7b1cf33367 Mon Sep 17 00:00:00 2001 From: wangsongsole Date: Wed, 20 Dec 2023 20:51:19 +0800 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor:=20=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/enum.js | 6 +++++- src/pages/order/list/list.js | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/assets/enum.js b/src/assets/enum.js index aba970e2..3287266a 100644 --- a/src/assets/enum.js +++ b/src/assets/enum.js @@ -43,7 +43,11 @@ const menu = { }, orderStatusBg(params) { - switch (params) { + /* 立减金 */ + if (params.status === 1 && params.type === 2) { + return "#43A65D" + } + switch (params.status) { case 0: return "#3575C7" case 1: diff --git a/src/pages/order/list/list.js b/src/pages/order/list/list.js index 343c3905..dcc61401 100644 --- a/src/pages/order/list/list.js +++ b/src/pages/order/list/list.js @@ -667,11 +667,11 @@ export default class orderList extends React.Component { {rowData.status_text} - {rowData.type === 2 && rowData.status === 2 + {rowData.type === 2 && [1, 2].includes(rowData.status) ? `(${rowData.received_num}/${rowData.num})` : ""} @@ -798,7 +798,7 @@ export default class orderList extends React.Component { ) : null} {rowData.type === 2 && - rowData.status === 2 && + [1, 2].includes(rowData.status) && rowData.received_num !== rowData.num ? (