mirror of
https://github.com/kuaifan/dootask.git
synced 2025-12-26 04:50:18 +00:00
no message
This commit is contained in:
parent
77ea022ddf
commit
7bfc43c85f
@ -81,7 +81,10 @@ class DialogController extends AbstractController
|
||||
$unreadAt = Request::input('unread_at');
|
||||
$todoAt = Request::input('todo_at');
|
||||
//
|
||||
$unreadAt = Base::isNumber($unreadAt) ? intval($unreadAt) : trim($unreadAt);
|
||||
$unreadAt = Carbon::parse($unreadAt)->setTimezone(config('app.timezone'));
|
||||
//
|
||||
$todoAt = Base::isNumber($todoAt) ? intval($todoAt) : trim($todoAt);
|
||||
$todoAt = Carbon::parse($todoAt)->setTimezone(config('app.timezone'));
|
||||
//
|
||||
$data = WebSocketDialog::getDialogBeyond($user->userid, $unreadAt, $todoAt);
|
||||
|
||||
14
resources/assets/js/functions/common.js
vendored
14
resources/assets/js/functions/common.js
vendored
@ -1376,9 +1376,19 @@ const localforage = require("localforage");
|
||||
if ($A.isIos()) {
|
||||
await localforage.setItem('__test__', $A.Time())
|
||||
}
|
||||
$A.openLog && console.log('IDBTest OK',)
|
||||
$A.openLog && console.log('IDBTest OK')
|
||||
} 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();
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
@ -1 +1 @@
|
||||
Subproject commit 4d22b4981d9db3913d6567232fc77ed88fd45e46
|
||||
Subproject commit 16f06b3044bdba0e71b5bac4c2099ee0c3b8c3d7
|
||||
Loading…
x
Reference in New Issue
Block a user