github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-01-25 20:08:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
kuaifan 2024-03-19 03:52:09 +09:00
parent 77ea022ddf
commit 7bfc43c85f
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/Api/DialogController.php
View File

@ -81,7 +81,10 @@ class DialogController extends AbstractController
$unreadAt = Request::input('unread_at'); $unreadAt = Request::input('unread_at');
$todoAt = Request::input('todo_at'); $todoAt = Request::input('todo_at');
// //
$unreadAt = Base::isNumber($unreadAt) ? intval($unreadAt) : trim($unreadAt);
$unreadAt = Carbon::parse($unreadAt)->setTimezone(config('app.timezone')); $unreadAt = Carbon::parse($unreadAt)->setTimezone(config('app.timezone'));
//
$todoAt = Base::isNumber($todoAt) ? intval($todoAt) : trim($todoAt);
$todoAt = Carbon::parse($todoAt)->setTimezone(config('app.timezone')); $todoAt = Carbon::parse($todoAt)->setTimezone(config('app.timezone'));
// //
$data = WebSocketDialog::getDialogBeyond($user->userid, $unreadAt, $todoAt); $data = WebSocketDialog::getDialogBeyond($user->userid, $unreadAt, $todoAt);

14
resources/assets/js/functions/common.js vendored
View File

@ -1376,9 +1376,19 @@ const localforage = require("localforage");
if ($A.isIos()) { if ($A.isIos()) {
await localforage.setItem('__test__', $A.Time()) await localforage.setItem('__test__', $A.Time())
} }
$A.openLog && console.log('IDBTest OK',) $A.openLog && console.log('IDBTest OK')
} catch (error) { } catch (error) {
$A.openLog && console.error('IDBTest Error: ', error) if ($A.openLog) {
console.error('IDBTest Error: ', error)
$A.modalWarning({
content: error.message,
onOk: () => {
$A.reloadUrl();
}
});
} else {
$A.reloadUrl();
}
} }
}, },

2
resources/mobile

@ -1 +1 @@
Subproject commit 4d22b4981d9db3913d6567232fc77ed88fd45e46 Subproject commit 16f06b3044bdba0e71b5bac4c2099ee0c3b8c3d7