From 2d215663a48fefc4afd1a75360f5b5e648d6be59 Mon Sep 17 00:00:00 2001 From: Haiyi <1021441632@qq.com> Date: Mon, 21 Nov 2022 10:09:05 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(ID1000754):=E3=80=90?= =?UTF-8?q?=E5=86=85=E9=83=A8=E5=95=86=E5=9F=8E=E3=80=91=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E4=BA=86=E6=94=B6=E6=AC=BE=E8=AE=B0=E5=BD=95=EF=BC=8C=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=88=97=E8=A1=A8=E4=B8=8A=E6=B2=A1=E6=9C=89=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E7=9A=84=E6=95=B0=E6=8D=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/RefundCodelist/index.tsx | 2 +- src/pages/newCollection/index.tsx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/RefundCodelist/index.tsx b/src/components/RefundCodelist/index.tsx index 8fbb184..8a5265e 100644 --- a/src/components/RefundCodelist/index.tsx +++ b/src/components/RefundCodelist/index.tsx @@ -47,7 +47,7 @@ export default memo((props: Props) => { product_color_code: it.code, product_color_name: it.name, num: it.roll.toString(), - weight: formatWeightDiv(it.actual_weight).toString(), + weight: formatWeightDiv(it.label_weight).toString(), deduction_weight: formatWeightDiv(it.deductions_weight).toString(), settle_weight: formatWeightDiv(it.settle_weight).toString(), deduction_amount: (it.deductions_amount / 100).toString(), diff --git a/src/pages/newCollection/index.tsx b/src/pages/newCollection/index.tsx index 258764e..9fc285f 100644 --- a/src/pages/newCollection/index.tsx +++ b/src/pages/newCollection/index.tsx @@ -30,7 +30,7 @@ export default () => { size: 10, search_name: '', start_time: `${dayjs(new Date(myDate?.toLocaleDateString() + ' ' + '00:00:00',)).subtract(14, 'day').format('YYYY-MM-DD')} 00:00:00`, - end_time: `${dayjs(new Date(myDate?.toLocaleDateString() + ' ' + '00:00:00',)).format('YYYY-MM-DD')} 00:00:00`, + end_time: `${dayjs(new Date(myDate?.toLocaleDateString() + ' ' + '00:00:00',)).add(1, 'day').format('YYYY-MM-DD')} 00:00:00`, }) const pageNum = useRef({ size: searchField.size, page: searchField.page }) @@ -120,7 +120,7 @@ export default () => { id: 1, name: '默认14天内', start_time: `${dayjs(new Date(myDate?.toLocaleDateString() + ' ' + '00:00:00',)).subtract(14, 'day').format('YYYY-MM-DD')} 00:00:00`, - end_time: `${dayjs(new Date(myDate?.toLocaleDateString() + ' ' + '00:00:00',)).format('YYYY-MM-DD')} 00:00:00`, + end_time: `${dayjs(new Date(myDate?.toLocaleDateString() + ' ' + '00:00:00',)).add(1, 'day').format('YYYY-MM-DD')} 00:00:00`, checked: true }, { @@ -165,7 +165,7 @@ export default () => { setSearchField({ ...searchField, start_time: `${dayjs(new Date(myDate?.toLocaleDateString() + ' ' + '00:00:00',)).subtract(14, 'day').format('YYYY-MM-DD')} 00:00:00`, - end_time: `${dayjs(new Date(myDate?.toLocaleDateString() + ' ' + '00:00:00',)).format('YYYY-MM-DD')} 00:00:00`, + end_time: `${dayjs(new Date(myDate?.toLocaleDateString() + ' ' + '00:00:00',)).add(1, 'day').format('YYYY-MM-DD')} 00:00:00`, size: 10 }) setStart(myDate.toLocaleDateString())