xuan/TestRestructureWechatLymarketDist
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🐞 fix(时间显示):修复ios和部分安卓手机上显示时间错误的问题

Browse Source
This commit is contained in:
xuan 2022-12-06 14:40:34 +08:00
parent ec7f234dc4
commit 46e5c33bf7
11 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/format.js
View File

@ -115,7 +115,7 @@ export const formatWeightDiv = (val, digit = weightDigit) => {
return strip(Number(val / digit)) || 0 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) { if (val) {
const time = new Date(val) const time = new Date(val)
const Y = time.getFullYear() 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('HH', h.toString().padStart(2, '0'))
.replace('mm', m.toString().padStart(2, '0')) .replace('mm', m.toString().padStart(2, '0'))
.replace('ss', s.toString().padStart(2, '0')) .replace('ss', s.toString().padStart(2, '0'))
console.log('fmt', fmt)
return fmt return fmt
} }
else { else {

20
src/components/SelectTimePicker/index.tsx
View File

@ -27,46 +27,46 @@ const FilterTimeOptions = {
name: '今天', name: '今天',
date_min: `${dayjs(new Date()) date_min: `${dayjs(new Date())
.add(0, 'day') .add(0, 'day')
.format('YYYY-MM-DD')} 00:00:00`, .format('YYYY/MM/DD')} 00:00:00`,
date_max: `${dayjs(new Date()) date_max: `${dayjs(new Date())
.add(1, 'day') .add(1, 'day')
.format('YYYY-MM-DD')} 00:00:00`, .format('YYYY/MM/DD')} 00:00:00`,
}, },
2: { 2: {
name: '昨日', name: '昨日',
date_min: `${dayjs(new Date()) date_min: `${dayjs(new Date())
.add(-1, 'day') .add(-1, 'day')
.format('YYYY-MM-DD')} 00:00:00`, .format('YYYY/MM/DD')} 00:00:00`,
date_max: `${dayjs(new Date()) date_max: `${dayjs(new Date())
.add(0, 'day') .add(0, 'day')
.format('YYYY-MM-DD')} 00:00:00`, .format('YYYY/MM/DD')} 00:00:00`,
}, },
3: { 3: {
name: '近7日', name: '近7日',
date_min: `${dayjs(new Date()) date_min: `${dayjs(new Date())
.add(-7, 'day') .add(-7, 'day')
.format('YYYY-MM-DD')} 00:00:00`, .format('YYYY/MM/DD')} 00:00:00`,
date_max: `${dayjs(new Date()) date_max: `${dayjs(new Date())
.add(0, 'day') .add(0, 'day')
.format('YYYY-MM-DD')} 00:00:00`, .format('YYYY/MM/DD')} 00:00:00`,
}, },
4: { 4: {
name: '近30日', name: '近30日',
date_min: `${dayjs(new Date()) date_min: `${dayjs(new Date())
.add(-30, 'day') .add(-30, 'day')
.format('YYYY-MM-DD')} 00:00:00`, .format('YYYY/MM/DD')} 00:00:00`,
date_max: `${dayjs(new Date()) date_max: `${dayjs(new Date())
.add(0, 'day') .add(0, 'day')
.format('YYYY-MM-DD')} 00:00:00`, .format('YYYY/MM/DD')} 00:00:00`,
}, },
5: { 5: {
name: '近90日', name: '近90日',
date_min: `${dayjs(new Date()) date_min: `${dayjs(new Date())
.add(-90, 'day') .add(-90, 'day')
.format('YYYY-MM-DD')} 00:00:00`, .format('YYYY/MM/DD')} 00:00:00`,
date_max: `${dayjs(new Date()) date_max: `${dayjs(new Date())
.add(0, 'day') .add(0, 'day')
.format('YYYY-MM-DD')} 00:00:00`, .format('YYYY/MM/DD')} 00:00:00`,
}, },
custom: { custom: {
name: '自定义时间', name: '自定义时间',

2
src/components/calendar/body/index.tsx
View File

@ -26,7 +26,7 @@ const defaultProps: Partial<AtCalendarBodyProps> = {
end: Date.now(), end: Date.now(),
start: Date.now(), start: Date.now(),
}, },
format: 'YYYY-MM-DD', format: 'YYYY/MM/DD',
generateDate: Date.now(), generateDate: Date.now(),
} }

2
src/components/calendar/index.tsx
View File

@ -23,7 +23,7 @@ const defaultProps: AtCalendarDefaultProps = {
isVertical: false, isVertical: false,
selectedDates: [], selectedDates: [],
isMultiSelect: false, isMultiSelect: false,
format: 'YYYY-MM-DD', format: 'YYYY/MM/DD',
currentDate: Date.now(), currentDate: Date.now(),
monthFormat: 'YYYY年MM月', monthFormat: 'YYYY年MM月',
} }

6
src/components/timePicker/index.tsx
View File

@ -21,10 +21,10 @@ const TimePicker = (props: Props) => {
// 如果选的是同一天的日期, end 自动加一天 // 如果选的是同一天的日期, end 自动加一天
if (!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) { 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) setTime(e)
} }
@ -34,7 +34,7 @@ const TimePicker = (props: Props) => {
<View className={styles['time-box']}> <View className={styles['time-box']}>
<AtCalendar <AtCalendar
isMultiSelect isMultiSelect
format="YYYY-MM-DD 00:00:00" format="YYYY/MM/DD 00:00:00"
currentDate={{ currentDate={{
start, start,
end, end,

2
src/pages/colorRelated/takeColor/components/ColorCard/index.tsx
View File

@ -107,7 +107,7 @@ const ColorCard: FC<PropsType> = (params) => {
<Text> <Text>
{formatHashTag(item.product_color_code, item.product_color_name)}({moveBorder}) {formatHashTag(item.product_color_code, item.product_color_name)}({moveBorder})
</Text> </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>
<View className={styles['c-lab']}> <View className={styles['c-lab']}>
<View className={classnames(styles['c-lab-button'], { again: item.sampling })} onClick={handleTakeColor}> <View className={classnames(styles['c-lab-button'], { again: item.sampling })} onClick={handleTakeColor}>

20
src/pages/delivery/components/Filter/index.tsx
View File

@ -54,28 +54,28 @@ export const filterTimeOptions = {
}, },
1: { 1: {
name: '今天', name: '今天',
date_min: `${dayjs(new Date()).add(0, '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`, date_max: `${dayjs(new Date()).add(1, 'day').format('YYYY/MM/DD')} 00:00:00`,
}, },
2: { 2: {
name: '昨日', name: '昨日',
date_min: `${dayjs(new Date()).add(-1, '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`, date_max: `${dayjs(new Date()).add(0, 'day').format('YYYY/MM/DD')} 00:00:00`,
}, },
3: { 3: {
name: '近7日', name: '近7日',
date_min: `${dayjs(new Date()).add(-7, '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`, date_max: `${dayjs(new Date()).add(0, 'day').format('YYYY/MM/DD')} 00:00:00`,
}, },
4: { 4: {
name: '近30日', name: '近30日',
date_min: `${dayjs(new Date()).add(-30, '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`, date_max: `${dayjs(new Date()).add(0, 'day').format('YYYY/MM/DD')} 00:00:00`,
}, },
5: { 5: {
name: '近90日', name: '近90日',
date_min: `${dayjs(new Date()).add(-90, '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`, date_max: `${dayjs(new Date()).add(0, 'day').format('YYYY/MM/DD')} 00:00:00`,
}, },
} as const } as const

16
src/pages/newCollection/index.tsx
View File

@ -29,8 +29,8 @@ const NewCollection = () => {
page: 1, page: 1,
size: 10, size: 10,
search_name: '', search_name: '',
start_time: `${dayjs(new Date(`${myDate?.toLocaleDateString()} ` + '00:00:00')).subtract(14, '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`, 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 }) const pageNum = useRef({ size: searchField.size, page: searchField.page })
@ -109,8 +109,8 @@ const NewCollection = () => {
{ {
id: 1, id: 1,
name: '默认14天内', name: '默认14天内',
start_time: `${dayjs(new Date(`${myDate?.toLocaleDateString()} ` + '00:00:00')).subtract(14, '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`, end_time: `${dayjs(new Date(`${myDate?.toLocaleDateString()} ` + '00:00:00')).add(1, 'day').format('YYYY/MM/DD')} 00:00:00`,
checked: true, checked: true,
}, },
{ {
@ -148,8 +148,8 @@ const NewCollection = () => {
start: '', start: '',
end: '', end: '',
} }
obj.start = `${dayjs(new Date(`${myDate?.toLocaleDateString()} ` + '00:00:00')).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` obj.end = `${dayjs(new Date(obj?.start)).add(1, 'day').format('YYYY/MM/DD')} 00:00:00`
eq.value = obj eq.value = obj
} }
setSearchField(val => ({ ...val, start_time: eq?.value?.start, end_time: eq?.value?.end })) setSearchField(val => ({ ...val, start_time: eq?.value?.start, end_time: eq?.value?.end }))
@ -214,8 +214,8 @@ const NewCollection = () => {
pageNum.current.size = 10 pageNum.current.size = 10
setSearchField({ setSearchField({
...searchField, ...searchField,
start_time: `${dayjs(new Date(`${myDate?.toLocaleDateString()} ` + '00:00:00')).subtract(14, '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`, end_time: `${dayjs(new Date(`${myDate?.toLocaleDateString()} ` + '00:00:00')).add(1, 'day').format('YYYY/MM/DD')} 00:00:00`,
size: 10, size: 10,
}) })
setStart(myDate.toLocaleDateString()) setStart(myDate.toLocaleDateString())

4
src/pages/refundPage/index.tsx
View File

@ -223,8 +223,8 @@ const RefundPage = () => {
start: '', start: '',
end: '', end: '',
} }
obj.start = `${dayjs(new Date(`${myDate?.toLocaleDateString()} ` + '00:00:00')).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` obj.end = `${dayjs(new Date(obj?.start)).add(1, 'day').format('YYYY/MM/DD')} 00:00:00`
eq.value = obj eq.value = obj
} }
setSearchField(val => ({ ...val, sale_start_time: eq?.value?.start, sale_end_time: eq?.value?.end, size: 10 })) setSearchField(val => ({ ...val, sale_start_time: eq?.value?.start, sale_end_time: eq?.value?.end, size: 10 }))

20
src/pages/saleStatistic/index.tsx
View File

@ -34,46 +34,46 @@ const FilterTimeOptions = {
name: '今天', name: '今天',
date_min: `${dayjs(new Date()) date_min: `${dayjs(new Date())
.add(0, 'day') .add(0, 'day')
.format('YYYY-MM-DD')} 00:00:00`, .format('YYYY/MM/DD')} 00:00:00`,
date_max: `${dayjs(new Date()) date_max: `${dayjs(new Date())
.add(1, 'day') .add(1, 'day')
.format('YYYY-MM-DD')} 00:00:00`, .format('YYYY/MM/DD')} 00:00:00`,
}, },
1: { 1: {
name: '昨日', name: '昨日',
date_min: `${dayjs(new Date()) date_min: `${dayjs(new Date())
.add(-1, 'day') .add(-1, 'day')
.format('YYYY-MM-DD')} 00:00:00`, .format('YYYY/MM/DD')} 00:00:00`,
date_max: `${dayjs(new Date()) date_max: `${dayjs(new Date())
.add(0, 'day') .add(0, 'day')
.format('YYYY-MM-DD')} 00:00:00`, .format('YYYY/MM/DD')} 00:00:00`,
}, },
2: { 2: {
name: '近7日', name: '近7日',
date_min: `${dayjs(new Date()) date_min: `${dayjs(new Date())
.add(-7, 'day') .add(-7, 'day')
.format('YYYY-MM-DD')} 00:00:00`, .format('YYYY/MM/DD')} 00:00:00`,
date_max: `${dayjs(new Date()) date_max: `${dayjs(new Date())
.add(0, 'day') .add(0, 'day')
.format('YYYY-MM-DD')} 00:00:00`, .format('YYYY/MM/DD')} 00:00:00`,
}, },
3: { 3: {
name: '近30日', name: '近30日',
date_min: `${dayjs(new Date()) date_min: `${dayjs(new Date())
.add(-30, 'day') .add(-30, 'day')
.format('YYYY-MM-DD')} 00:00:00`, .format('YYYY/MM/DD')} 00:00:00`,
date_max: `${dayjs(new Date()) date_max: `${dayjs(new Date())
.add(0, 'day') .add(0, 'day')
.format('YYYY-MM-DD')} 00:00:00`, .format('YYYY/MM/DD')} 00:00:00`,
}, },
4: { 4: {
name: '近90日', name: '近90日',
date_min: `${dayjs(new Date()) date_min: `${dayjs(new Date())
.add(-90, 'day') .add(-90, 'day')
.format('YYYY-MM-DD')} 00:00:00`, .format('YYYY/MM/DD')} 00:00:00`,
date_max: `${dayjs(new Date()) date_max: `${dayjs(new Date())
.add(0, 'day') .add(0, 'day')
.format('YYYY-MM-DD')} 00:00:00`, .format('YYYY/MM/DD')} 00:00:00`,
}, },
} }

20
src/pages/takeDelivery/components/Filter/index.tsx
View File

@ -35,28 +35,28 @@ export const filterTimeOptions = {
}, },
1: { 1: {
name: '今天', name: '今天',
date_min: `${dayjs(new Date()).add(0, '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`, date_max: `${dayjs(new Date()).add(1, 'day').format('YYYY/MM/DD')} 00:00:00`,
}, },
2: { 2: {
name: '昨日', name: '昨日',
date_min: `${dayjs(new Date()).add(-1, '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`, date_max: `${dayjs(new Date()).add(0, 'day').format('YYYY/MM/DD')} 00:00:00`,
}, },
3: { 3: {
name: '近7日', name: '近7日',
date_min: `${dayjs(new Date()).add(-7, '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`, date_max: `${dayjs(new Date()).add(0, 'day').format('YYYY/MM/DD')} 00:00:00`,
}, },
4: { 4: {
name: '近30日', name: '近30日',
date_min: `${dayjs(new Date()).add(-30, '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`, date_max: `${dayjs(new Date()).add(0, 'day').format('YYYY/MM/DD')} 00:00:00`,
}, },
5: { 5: {
name: '近90日', name: '近90日',
date_min: `${dayjs(new Date()).add(-90, '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`, date_max: `${dayjs(new Date()).add(0, 'day').format('YYYY/MM/DD')} 00:00:00`,
}, },
} as const } as const