diff --git a/weapp/src/config.js b/weapp/src/config.js index 71b3443d..0182ed94 100644 --- a/weapp/src/config.js +++ b/weapp/src/config.js @@ -8,7 +8,7 @@ const baseConfig = { }; const development = { - baseUrl: 'https://3024-117-90-36-177.jp.ngrok.io', + baseUrl: 'https://c5a6-117-90-37-10.ap.ngrok.io', webUrl: 'https://smartwater.anxinyun.cn', pcode: 'fce4afe2-5b6a-408a-ab18-a2afa7fa027c', imgUrl: 'http://test.resources.anxinyun.cn/', diff --git a/weapp/src/packages/patrolView/index.jsx b/weapp/src/packages/patrolView/index.jsx index 44a05fb7..a8beeffb 100644 --- a/weapp/src/packages/patrolView/index.jsx +++ b/weapp/src/packages/patrolView/index.jsx @@ -20,7 +20,7 @@ function Index() { const { params: { filter } } = router const [isPatrol, setIsPatrol] = useState(true) - const [datePicker, setDatePicker] = useState(moment().format('YYYY-MM-DD')) + const [datePicker, setDatePicker] = useState('') const [listData, setListData] = useState([]) const [filterText, setFilterText] = useState('') const [systemInfo, setSystemInfo] = useState('') @@ -51,8 +51,8 @@ function Index() { const data = { limit, page, - startTime: datePicker + ' 00:00:00', - endTime: datePicker + ' 23:59:59', + startTime: datePicker ? datePicker + ' 00:00:00' : '', + endTime: datePicker ? datePicker + ' 23:59:59' : '', keyword: filterText, reportType: isPatrol ? 'patrol' : 'conserve', userId: filter === 'my' ? userInfo.id : '',