From e9ddd18610da71f7c8f3f5daf7435988081c985d Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Thu, 1 Jun 2023 16:08:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9C=AA=E5=88=86?=
=?UTF-8?q?=E9=85=8D=E5=AF=BC=E6=B8=B8=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/reservation/Newest.jsx | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/views/reservation/Newest.jsx b/src/views/reservation/Newest.jsx
index 7043fd7..0f61936 100644
--- a/src/views/reservation/Newest.jsx
+++ b/src/views/reservation/Newest.jsx
@@ -17,7 +17,10 @@ function Newest() {
dataIndex: 'referenceNumber',
key: 'Reference number',
render: (text, record) => {
- const requiredHighlight = dayjs(record.arrivalDate).add(2, 'day').isBefore(dayjs(), 'day') && isEmpty(record.guide);
+ const tomorrowjs = dayjs().add(1, 'day');
+ const threeDaysjs = dayjs().subtract(4, 'day');
+ const arrivalDatejs = dayjs(record.arrivalDate);
+ const requiredHighlight = (arrivalDatejs.isAfter(threeDaysjs) && arrivalDatejs.isBefore(tomorrowjs, 'day')) && isEmpty(record.guide);
const linkClassName = requiredHighlight ? 'reservation-highlight' : '';
return (
{text}
From d1a20c235710286f2c13f1ea823db897d619357e Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Thu, 1 Jun 2023 16:36:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AF=BC=E6=B8=B8?=
=?UTF-8?q?=E5=88=86=E9=85=8D=E6=8F=90=E9=86=92=E6=97=A5=E6=9C=9F=E8=8C=83?=
=?UTF-8?q?=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/reservation/Newest.jsx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/reservation/Newest.jsx b/src/views/reservation/Newest.jsx
index 0f61936..b68fbaa 100644
--- a/src/views/reservation/Newest.jsx
+++ b/src/views/reservation/Newest.jsx
@@ -17,10 +17,10 @@ function Newest() {
dataIndex: 'referenceNumber',
key: 'Reference number',
render: (text, record) => {
- const tomorrowjs = dayjs().add(1, 'day');
- const threeDaysjs = dayjs().subtract(4, 'day');
+ const after3Dayjs = dayjs().add(3, 'day');
+ const lastDayjs = dayjs().subtract(1, 'day');
const arrivalDatejs = dayjs(record.arrivalDate);
- const requiredHighlight = (arrivalDatejs.isAfter(threeDaysjs) && arrivalDatejs.isBefore(tomorrowjs, 'day')) && isEmpty(record.guide);
+ const requiredHighlight = (arrivalDatejs.isAfter(lastDayjs) && arrivalDatejs.isBefore(after3Dayjs, 'day')) && isEmpty(record.guide);
const linkClassName = requiredHighlight ? 'reservation-highlight' : '';
return (
{text}