diff --git a/admin/src/pages/config/upload.vue b/admin/src/pages/config/upload.vue index 646d895..eeac1aa 100644 --- a/admin/src/pages/config/upload.vue +++ b/admin/src/pages/config/upload.vue @@ -40,7 +40,7 @@ const UploadList = async () => { const routerChange = (query) => { page_options.value = { search: query.search || default_page_options.search, - time: !!query.time ? JSON.parse(query.time) : default_page_options.time, + time: (!!query.time && query.time !== 'null') ? JSON.parse(query.time) : default_page_options.time, ext: query.ext || default_page_options.ext, from: query.from || default_page_options.from, page: Number(query.page) || default_page_options.page, diff --git a/api/app/Http/Controllers/UploadController.php b/api/app/Http/Controllers/UploadController.php index dd181b9..d4103cf 100644 --- a/api/app/Http/Controllers/UploadController.php +++ b/api/app/Http/Controllers/UploadController.php @@ -27,8 +27,8 @@ class UploadController extends Controller Login::admin([10]); $search = $request->post('search'); $time = $request->post('time'); - $start_time = !!$time[0] ? Lu::date(strtotime($time[0])) : ''; - $end_time = !!$time[1] ? Lu::date(strtotime($time[1])) : ''; + $start_time = !!$time[0] ? Lu::date(strtotime($time[0] . ' 00:00:00')) : ''; + $end_time = !!$time[1] ? Lu::date(strtotime($time[1] . ' 23:59:59')) : ''; $ext = $request->post('ext'); $from = $request->post('from'); $from_map = [