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

🐞 fix(时间选择器): 修复根据时间筛选结果的问题

Browse Source
This commit is contained in:
xuan
2022-12-07 15:15:08 +08:00
parent caf228d121
commit 0992ef1208
10 changed files with 66 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/delivery/components/Filter/index.tsx
+10 -10
View File
@@ -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
src/pages/delivery/index.tsx
+2 -1
View File
@@ -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)