diff --git a/src/common/format.js b/src/common/format.js index bd68e9a..58cdd0e 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() @@ -132,7 +132,7 @@ export const formatDateTime = (val, fmt = 'YYYY-MM-DD HH:mm:ss') => { .replace('HH', h.toString().padStart(2, '0')) .replace('mm', m.toString().padStart(2, '0')) .replace('ss', s.toString().padStart(2, '0')) - + console.log('fmt', fmt) return fmt } else { diff --git a/src/components/SelectTimePicker/index.tsx b/src/components/SelectTimePicker/index.tsx index b12adf2..4a13644 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: '自定义时间', diff --git a/src/components/calendar/body/index.tsx b/src/components/calendar/body/index.tsx index ee85659..c091f98 100644 --- a/src/components/calendar/body/index.tsx +++ b/src/components/calendar/body/index.tsx @@ -26,7 +26,7 @@ const defaultProps: Partial = { end: Date.now(), start: Date.now(), }, - format: 'YYYY-MM-DD', + format: 'YYYY/MM/DD', generateDate: Date.now(), } diff --git a/src/components/calendar/index.tsx b/src/components/calendar/index.tsx index 92ecccb..03a1f1e 100644 --- a/src/components/calendar/index.tsx +++ b/src/components/calendar/index.tsx @@ -23,7 +23,7 @@ const defaultProps: AtCalendarDefaultProps = { isVertical: false, selectedDates: [], isMultiSelect: false, - format: 'YYYY-MM-DD', + format: 'YYYY/MM/DD', currentDate: Date.now(), monthFormat: 'YYYY年MM月', } diff --git a/src/components/timePicker/index.tsx b/src/components/timePicker/index.tsx index 7d36b9f..610a2e3 100644 --- a/src/components/timePicker/index.tsx +++ b/src/components/timePicker/index.tsx @@ -21,10 +21,10 @@ 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` } 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` } setTime(e) } @@ -34,7 +34,7 @@ const TimePicker = (props: Props) => { = (params) => { {formatHashTag(item.product_color_code, item.product_color_name)}({moveBorder}) - {item.absorb_lab_time && dayjs(item.absorb_lab_time).format('YYYY-MM-DD HH:mm:ss')} + {item.absorb_lab_time && dayjs(item.absorb_lab_time).format('YYYY/MM/DD HH:mm:ss')} diff --git a/src/pages/delivery/components/Filter/index.tsx b/src/pages/delivery/components/Filter/index.tsx index f3bfb8a..d68c786 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/newCollection/index.tsx b/src/pages/newCollection/index.tsx index b3b89e8..479993c 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 b195022..14c2c1e 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 513e72d..1f09224 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 4c4b21f..a7e60bf 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