From 29bdcf8ff3787d6270ccbb7d642b40332c11f356 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Fri, 23 Sep 2022 12:38:44 +0800
Subject: [PATCH] update dateOptions.js

---
 src/utils/dateOptions.js | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/utils/dateOptions.js b/src/utils/dateOptions.js
index 5e95282..3c6a23d 100644
--- a/src/utils/dateOptions.js
+++ b/src/utils/dateOptions.js
@@ -5,17 +5,25 @@ const dateOptions = [
   {
     text: '昨天',
     value: () => {
-      const end = dayjs().format('YYYY-MM-DD')
       const start = dayjs().subtract(1, 'day').format('YYYY-MM-DD')
+      const end = start + ' 23:59:59'
+
+      return [start, end]
+    }
+  },
+  {
+    text: '今天',
+    value: () => {
+      const start = dayjs().format('YYYY-MM-DD')
+      const end = start + ' 23:59:59'
 
-      // console.log(dayjs().format('YYYY-MM-DD HH:mm:ss'));
       return [start, end]
     }
   },
   {
     text: '本周',
     value: () => {
-      const end = dayjs().endOf('week').add(1, 'day').format('YYYY-MM-DD')
+      const end = dayjs().endOf('week').add(1, 'day').format('YYYY-MM-DD') + ' 23:59:59'
       const start = dayjs().startOf('week').add(1, 'day').format('YYYY-MM-DD')
       return [start, end]
     }
@@ -24,7 +32,7 @@ const dateOptions = [
     text: '上周',
     value: () => {
       const start = dayjs().add(-1, 'week').startOf('week').add(1, 'day').format('YYYY-MM-DD')
-      const end = dayjs().add(-1, 'week').endOf('week').add(1, 'day').format('YYYY-MM-DD')
+      const end = dayjs().add(-1, 'week').endOf('week').add(1, 'day').format('YYYY-MM-DD') + ' 23:59:59'
       return [start, end]
     }
   },
@@ -49,7 +57,7 @@ const dateOptions = [
   {
     text: '最近一周',
     value: () => {
-      const end = new Date()
+      const end = dayjs().format('YYYY-MM-DD') + ' 23:59:59'
       const start = new Date()
       start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
       return [start, end]