From 0992ef1208b04aa2399a89b00290fb5231a511a2 Mon Sep 17 00:00:00 2001
From: xuan <w1359774872@gmail.com>
Date: Wed, 7 Dec 2022 15:15:08 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(=E6=97=B6=E9=97=B4=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=99=A8):=20=E4=BF=AE=E5=A4=8D=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89=E7=BB=93=E6=9E=9C=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/format.js                          |  2 +-
 src/components/SelectTimePicker/index.tsx     | 22 +++++++++----------
 src/components/timePicker/index.tsx           | 19 +++++++++-------
 .../takeColor/components/ColorCard/index.tsx  |  2 +-
 .../delivery/components/Filter/index.tsx      | 20 ++++++++---------
 src/pages/delivery/index.tsx                  |  3 ++-
 src/pages/newCollection/index.tsx             | 16 +++++++-------
 src/pages/refundPage/index.tsx                |  4 ++--
 src/pages/saleStatistic/index.tsx             | 20 ++++++++---------
 .../takeDelivery/components/Filter/index.tsx  | 20 ++++++++---------
 10 files changed, 66 insertions(+), 62 deletions(-)

diff --git a/src/common/format.js b/src/common/format.js
index 58cdd0e..23c3141 100644
--- a/src/common/format.js
+++ b/src/common/format.js
@@ -115,7 +115,7 @@ export const formatWeightDiv = (val, digit = weightDigit) => {
   return strip(Number(val / digit)) || 0
 }
 
-export const formatDateTime = (val, fmt = 'YYYY/MM/DD HH:mm:ss') => {
+export const formatDateTime = (val, fmt = 'YYYY-MM-DD HH:mm:ss') => {
   if (val) {
     const time = new Date(val)
     const Y = time.getFullYear()
diff --git a/src/components/SelectTimePicker/index.tsx b/src/components/SelectTimePicker/index.tsx
index 4a13644..46a84b9 100644
--- a/src/components/SelectTimePicker/index.tsx
+++ b/src/components/SelectTimePicker/index.tsx
@@ -27,46 +27,46 @@ const FilterTimeOptions = {
     name: '今天',
     date_min: `${dayjs(new Date())
       .add(0, 'day')
-      .format('YYYY/MM/DD')} 00:00:00`,
+      .format('YYYY-MM-DD')} 00:00:00`,
     date_max: `${dayjs(new Date())
       .add(1, 'day')
-      .format('YYYY/MM/DD')} 00:00:00`,
+      .format('YYYY-MM-DD')} 00:00:00`,
   },
   2: {
     name: '昨日',
     date_min: `${dayjs(new Date())
       .add(-1, 'day')
-      .format('YYYY/MM/DD')} 00:00:00`,
+      .format('YYYY-MM-DD')} 00:00:00`,
     date_max: `${dayjs(new Date())
       .add(0, 'day')
-      .format('YYYY/MM/DD')} 00:00:00`,
+      .format('YYYY-MM-DD')} 00:00:00`,
   },
   3: {
     name: '近7日',
     date_min: `${dayjs(new Date())
       .add(-7, 'day')
-      .format('YYYY/MM/DD')} 00:00:00`,
+      .format('YYYY-MM-DD')} 00:00:00`,
     date_max: `${dayjs(new Date())
       .add(0, 'day')
-      .format('YYYY/MM/DD')} 00:00:00`,
+      .format('YYYY-MM-DD')} 00:00:00`,
   },
   4: {
     name: '近30日',
     date_min: `${dayjs(new Date())
       .add(-30, 'day')
-      .format('YYYY/MM/DD')} 00:00:00`,
+      .format('YYYY-MM-DD')} 00:00:00`,
     date_max: `${dayjs(new Date())
       .add(0, 'day')
-      .format('YYYY/MM/DD')} 00:00:00`,
+      .format('YYYY-MM-DD')} 00:00:00`,
   },
   5: {
     name: '近90日',
     date_min: `${dayjs(new Date())
       .add(-90, 'day')
-      .format('YYYY/MM/DD')} 00:00:00`,
+      .format('YYYY-MM-DD')} 00:00:00`,
     date_max: `${dayjs(new Date())
       .add(0, 'day')
-      .format('YYYY/MM/DD')} 00:00:00`,
+      .format('YYYY-MM-DD')} 00:00:00`,
   },
   custom: {
     name: '自定义时间',
@@ -114,7 +114,7 @@ const SelectTimePicker = (props: SelectSaleTypeProps, ref) => {
       end: event?.value?.end,
     })
     setShowTime(false)
-    customFilterButtonText.current = `${formatDateTime(event?.value?.start, 'YYYY年MM月DD日')} 至 ${formatDateTime(event?.value?.end, 'YYYY年MM月DD日')}`
+    customFilterButtonText.current = `${dayjs(event?.value?.start).format('YYYY年MM月DD日')} 至 ${dayjs(event?.value?.end).format('YYYY年MM月DD日')}`
     change?.([event?.value?.start, event?.value?.end])
   }
 
diff --git a/src/components/timePicker/index.tsx b/src/components/timePicker/index.tsx
index 610a2e3..2497dbd 100644
--- a/src/components/timePicker/index.tsx
+++ b/src/components/timePicker/index.tsx
@@ -21,31 +21,34 @@ const TimePicker = (props: Props) => {
     // 如果选的是同一天的日期, end 自动加一天
     if (!end) {
       // 判断如果没选下一天的时候
-      e.value.end = `${dayjs(new Date(start)).add(1, 'day').format('YYYY/MM/DD')} 00:00:00`
+      e.value.end = `${dayjs(new Date(start)).add(1, 'day').format('YYYY-MM-DD')} 00:00:00`
     }
+    else
     if (start === end) {
-      e.value.end = `${dayjs(new Date(start)).add(1, 'day').format('YYYY/MM/DD')} 00:00:00`
+      e.value.end = `${dayjs(new Date(start)).add(1, 'day').format('YYYY-MM-DD')} 00:00:00`
     }
+    else {
+      e.value.start = `${dayjs(start).format('YYYY-MM-DD')} 00:00:00`
+      e.value.end = `${dayjs(end).format('YYYY-MM-DD')} 00:00:00`
+    }
+    console.log('e===>', e)
     setTime(e)
   }
-
+  // 由于小程序的bug，部分ios和安卓显示时间的时候会有问题，原因是格式化时有`-`这个横杠
   return (
     <>
       <View className={styles['time-box']}>
         <AtCalendar
           isMultiSelect
-          format="YYYY/MM/DD 00:00:00"
+          format="YYYY-MM-DD 00:00:00"
           currentDate={{
             start,
             end,
           }}
-          onSelectDate={e => handTime?.(e)}
+          onSelectDate={e => handTime(e)}
         />
       </View>
       <NormalButton type="primary" onClick={() => onSelectDate?.(time)} size="normal" round customClassName={styles['sure-box']}>确认</NormalButton>
-      {/* <View className='sure-box' onClick={() => onSelectDate?.(time)}>
-        确认
-      </View> */}
     </>
   )
 }
diff --git a/src/pages/colorRelated/takeColor/components/ColorCard/index.tsx b/src/pages/colorRelated/takeColor/components/ColorCard/index.tsx
index b76c020..2b98845 100644
--- a/src/pages/colorRelated/takeColor/components/ColorCard/index.tsx
+++ b/src/pages/colorRelated/takeColor/components/ColorCard/index.tsx
@@ -107,7 +107,7 @@ const ColorCard: FC<PropsType> = (params) => {
         <Text>
           {formatHashTag(item.product_color_code, item.product_color_name)}({moveBorder})
         </Text>
-        <View className={styles['c-i-date']}>{item.absorb_lab_time && dayjs(item.absorb_lab_time).format('YYYY/MM/DD HH:mm:ss')}</View>
+        <View className={styles['c-i-date']}>{item.absorb_lab_time && dayjs(item.absorb_lab_time).format('YYYY-MM-DD HH:mm:ss')}</View>
       </View>
       <View className={styles['c-lab']}>
         <View className={classnames(styles['c-lab-button'], { again: item.sampling })} onClick={handleTakeColor}>
diff --git a/src/pages/delivery/components/Filter/index.tsx b/src/pages/delivery/components/Filter/index.tsx
index d68c786..f3bfb8a 100644
--- a/src/pages/delivery/components/Filter/index.tsx
+++ b/src/pages/delivery/components/Filter/index.tsx
@@ -54,28 +54,28 @@ export const filterTimeOptions = {
   },
   1: {
     name: '今天',
-    date_min: `${dayjs(new Date()).add(0, 'day').format('YYYY/MM/DD')} 00:00:00`,
-    date_max: `${dayjs(new Date()).add(1, 'day').format('YYYY/MM/DD')} 00:00:00`,
+    date_min: `${dayjs(new Date()).add(0, 'day').format('YYYY-MM-DD')} 00:00:00`,
+    date_max: `${dayjs(new Date()).add(1, 'day').format('YYYY-MM-DD')} 00:00:00`,
   },
   2: {
     name: '昨日',
-    date_min: `${dayjs(new Date()).add(-1, 'day').format('YYYY/MM/DD')} 00:00:00`,
-    date_max: `${dayjs(new Date()).add(0, 'day').format('YYYY/MM/DD')} 00:00:00`,
+    date_min: `${dayjs(new Date()).add(-1, 'day').format('YYYY-MM-DD')} 00:00:00`,
+    date_max: `${dayjs(new Date()).add(0, 'day').format('YYYY-MM-DD')} 00:00:00`,
   },
   3: {
     name: '近7日',
-    date_min: `${dayjs(new Date()).add(-7, 'day').format('YYYY/MM/DD')} 00:00:00`,
-    date_max: `${dayjs(new Date()).add(0, 'day').format('YYYY/MM/DD')} 00:00:00`,
+    date_min: `${dayjs(new Date()).add(-7, 'day').format('YYYY-MM-DD')} 00:00:00`,
+    date_max: `${dayjs(new Date()).add(0, 'day').format('YYYY-MM-DD')} 00:00:00`,
   },
   4: {
     name: '近30日',
-    date_min: `${dayjs(new Date()).add(-30, 'day').format('YYYY/MM/DD')} 00:00:00`,
-    date_max: `${dayjs(new Date()).add(0, 'day').format('YYYY/MM/DD')} 00:00:00`,
+    date_min: `${dayjs(new Date()).add(-30, 'day').format('YYYY-MM-DD')} 00:00:00`,
+    date_max: `${dayjs(new Date()).add(0, 'day').format('YYYY-MM-DD')} 00:00:00`,
   },
   5: {
     name: '近90日',
-    date_min: `${dayjs(new Date()).add(-90, 'day').format('YYYY/MM/DD')} 00:00:00`,
-    date_max: `${dayjs(new Date()).add(0, 'day').format('YYYY/MM/DD')} 00:00:00`,
+    date_min: `${dayjs(new Date()).add(-90, 'day').format('YYYY-MM-DD')} 00:00:00`,
+    date_max: `${dayjs(new Date()).add(0, 'day').format('YYYY-MM-DD')} 00:00:00`,
   },
 } as const
 
diff --git a/src/pages/delivery/index.tsx b/src/pages/delivery/index.tsx
index 85bc481..dd2770d 100644
--- a/src/pages/delivery/index.tsx
+++ b/src/pages/delivery/index.tsx
@@ -72,7 +72,8 @@ const Delivery: FC = () => {
     setSearch(val => ({ ...val, size: 10 }))
   }
   const getData = async() => {
-    const res = await FetchDeliveryOrderList(getFilterData(search))
+    console.log('search===>', search)
+    const res = await FetchDeliveryOrderList({ ...getFilterData(search) })
 
     setDeliveryOrderList(e => ({ ...e, list: res.data?.list, total: res.data?.total }))
     setRefresherTriggeredStatus(() => false)
diff --git a/src/pages/newCollection/index.tsx b/src/pages/newCollection/index.tsx
index 479993c..b3b89e8 100644
--- a/src/pages/newCollection/index.tsx
+++ b/src/pages/newCollection/index.tsx
@@ -29,8 +29,8 @@ const NewCollection = () => {
     page: 1,
     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')).add(1, 'day').format('YYYY/MM/DD')} 00:00:00`,
+    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')).add(1, 'day').format('YYYY-MM-DD')} 00:00:00`,
   })
   const pageNum = useRef({ size: searchField.size, page: searchField.page })
 
@@ -109,8 +109,8 @@ const NewCollection = () => {
       {
         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')).add(1, 'day').format('YYYY/MM/DD')} 00:00:00`,
+        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')).add(1, 'day').format('YYYY-MM-DD')} 00:00:00`,
         checked: true,
       },
       {
@@ -148,8 +148,8 @@ const NewCollection = () => {
         start: '',
         end: '',
       }
-      obj.start = `${dayjs(new Date(`${myDate?.toLocaleDateString()} ` + '00:00:00')).format('YYYY/MM/DD')} 00:00:00`
-      obj.end = `${dayjs(new Date(obj?.start)).add(1, 'day').format('YYYY/MM/DD')} 00:00:00`
+      obj.start = `${dayjs(new Date(`${myDate?.toLocaleDateString()} ` + '00:00:00')).format('YYYY-MM-DD')} 00:00:00`
+      obj.end = `${dayjs(new Date(obj?.start)).add(1, 'day').format('YYYY-MM-DD')} 00:00:00`
       eq.value = obj
     }
     setSearchField(val => ({ ...val, start_time: eq?.value?.start, end_time: eq?.value?.end }))
@@ -214,8 +214,8 @@ const NewCollection = () => {
     pageNum.current.size = 10
     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')).add(1, 'day').format('YYYY/MM/DD')} 00:00:00`,
+      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')).add(1, 'day').format('YYYY-MM-DD')} 00:00:00`,
       size: 10,
     })
     setStart(myDate.toLocaleDateString())
diff --git a/src/pages/refundPage/index.tsx b/src/pages/refundPage/index.tsx
index 14c2c1e..b195022 100644
--- a/src/pages/refundPage/index.tsx
+++ b/src/pages/refundPage/index.tsx
@@ -223,8 +223,8 @@ const RefundPage = () => {
         start: '',
         end: '',
       }
-      obj.start = `${dayjs(new Date(`${myDate?.toLocaleDateString()} ` + '00:00:00')).format('YYYY/MM/DD')} 00:00:00`
-      obj.end = `${dayjs(new Date(obj?.start)).add(1, 'day').format('YYYY/MM/DD')} 00:00:00`
+      obj.start = `${dayjs(new Date(`${myDate?.toLocaleDateString()} ` + '00:00:00')).format('YYYY-MM-DD')} 00:00:00`
+      obj.end = `${dayjs(new Date(obj?.start)).add(1, 'day').format('YYYY-MM-DD')} 00:00:00`
       eq.value = obj
     }
     setSearchField(val => ({ ...val, sale_start_time: eq?.value?.start, sale_end_time: eq?.value?.end, size: 10 }))
diff --git a/src/pages/saleStatistic/index.tsx b/src/pages/saleStatistic/index.tsx
index 1f09224..513e72d 100644
--- a/src/pages/saleStatistic/index.tsx
+++ b/src/pages/saleStatistic/index.tsx
@@ -34,46 +34,46 @@ const FilterTimeOptions = {
     name: '今天',
     date_min: `${dayjs(new Date())
       .add(0, 'day')
-      .format('YYYY/MM/DD')} 00:00:00`,
+      .format('YYYY-MM-DD')} 00:00:00`,
     date_max: `${dayjs(new Date())
       .add(1, 'day')
-      .format('YYYY/MM/DD')} 00:00:00`,
+      .format('YYYY-MM-DD')} 00:00:00`,
   },
   1: {
     name: '昨日',
     date_min: `${dayjs(new Date())
       .add(-1, 'day')
-      .format('YYYY/MM/DD')} 00:00:00`,
+      .format('YYYY-MM-DD')} 00:00:00`,
     date_max: `${dayjs(new Date())
       .add(0, 'day')
-      .format('YYYY/MM/DD')} 00:00:00`,
+      .format('YYYY-MM-DD')} 00:00:00`,
   },
   2: {
     name: '近7日',
     date_min: `${dayjs(new Date())
       .add(-7, 'day')
-      .format('YYYY/MM/DD')} 00:00:00`,
+      .format('YYYY-MM-DD')} 00:00:00`,
     date_max: `${dayjs(new Date())
       .add(0, 'day')
-      .format('YYYY/MM/DD')} 00:00:00`,
+      .format('YYYY-MM-DD')} 00:00:00`,
   },
   3: {
     name: '近30日',
     date_min: `${dayjs(new Date())
       .add(-30, 'day')
-      .format('YYYY/MM/DD')} 00:00:00`,
+      .format('YYYY-MM-DD')} 00:00:00`,
     date_max: `${dayjs(new Date())
       .add(0, 'day')
-      .format('YYYY/MM/DD')} 00:00:00`,
+      .format('YYYY-MM-DD')} 00:00:00`,
   },
   4: {
     name: '近90日',
     date_min: `${dayjs(new Date())
       .add(-90, 'day')
-      .format('YYYY/MM/DD')} 00:00:00`,
+      .format('YYYY-MM-DD')} 00:00:00`,
     date_max: `${dayjs(new Date())
       .add(0, 'day')
-      .format('YYYY/MM/DD')} 00:00:00`,
+      .format('YYYY-MM-DD')} 00:00:00`,
   },
 }
 
diff --git a/src/pages/takeDelivery/components/Filter/index.tsx b/src/pages/takeDelivery/components/Filter/index.tsx
index a7e60bf..4c4b21f 100644
--- a/src/pages/takeDelivery/components/Filter/index.tsx
+++ b/src/pages/takeDelivery/components/Filter/index.tsx
@@ -35,28 +35,28 @@ export const filterTimeOptions = {
   },
   1: {
     name: '今天',
-    date_min: `${dayjs(new Date()).add(0, 'day').format('YYYY/MM/DD')} 00:00:00`,
-    date_max: `${dayjs(new Date()).add(1, 'day').format('YYYY/MM/DD')} 00:00:00`,
+    date_min: `${dayjs(new Date()).add(0, 'day').format('YYYY-MM-DD')} 00:00:00`,
+    date_max: `${dayjs(new Date()).add(1, 'day').format('YYYY-MM-DD')} 00:00:00`,
   },
   2: {
     name: '昨日',
-    date_min: `${dayjs(new Date()).add(-1, 'day').format('YYYY/MM/DD')} 00:00:00`,
-    date_max: `${dayjs(new Date()).add(0, 'day').format('YYYY/MM/DD')} 00:00:00`,
+    date_min: `${dayjs(new Date()).add(-1, 'day').format('YYYY-MM-DD')} 00:00:00`,
+    date_max: `${dayjs(new Date()).add(0, 'day').format('YYYY-MM-DD')} 00:00:00`,
   },
   3: {
     name: '近7日',
-    date_min: `${dayjs(new Date()).add(-7, 'day').format('YYYY/MM/DD')} 00:00:00`,
-    date_max: `${dayjs(new Date()).add(0, 'day').format('YYYY/MM/DD')} 00:00:00`,
+    date_min: `${dayjs(new Date()).add(-7, 'day').format('YYYY-MM-DD')} 00:00:00`,
+    date_max: `${dayjs(new Date()).add(0, 'day').format('YYYY-MM-DD')} 00:00:00`,
   },
   4: {
     name: '近30日',
-    date_min: `${dayjs(new Date()).add(-30, 'day').format('YYYY/MM/DD')} 00:00:00`,
-    date_max: `${dayjs(new Date()).add(0, 'day').format('YYYY/MM/DD')} 00:00:00`,
+    date_min: `${dayjs(new Date()).add(-30, 'day').format('YYYY-MM-DD')} 00:00:00`,
+    date_max: `${dayjs(new Date()).add(0, 'day').format('YYYY-MM-DD')} 00:00:00`,
   },
   5: {
     name: '近90日',
-    date_min: `${dayjs(new Date()).add(-90, 'day').format('YYYY/MM/DD')} 00:00:00`,
-    date_max: `${dayjs(new Date()).add(0, 'day').format('YYYY/MM/DD')} 00:00:00`,
+    date_min: `${dayjs(new Date()).add(-90, 'day').format('YYYY-MM-DD')} 00:00:00`,
+    date_max: `${dayjs(new Date()).add(0, 'day').format('YYYY-MM-DD')} 00:00:00`,
   },
 } as const