From 7bfc43c85f4de6f78484e608156add222879329c Mon Sep 17 00:00:00 2001 From: kuaifan Date: Tue, 19 Mar 2024 03:52:09 +0900 Subject: [PATCH] no message --- app/Http/Controllers/Api/DialogController.php | 3 +++ resources/assets/js/functions/common.js | 14 ++++++++++++-- resources/mobile | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Api/DialogController.php b/app/Http/Controllers/Api/DialogController.php index e19622405..b11c53daf 100755 --- a/app/Http/Controllers/Api/DialogController.php +++ b/app/Http/Controllers/Api/DialogController.php @@ -81,7 +81,10 @@ public function beyond() $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); diff --git a/resources/assets/js/functions/common.js b/resources/assets/js/functions/common.js index e7c1ca73f..c50f30c14 100755 --- a/resources/assets/js/functions/common.js +++ b/resources/assets/js/functions/common.js @@ -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(); + } } }, diff --git a/resources/mobile b/resources/mobile index 4d22b4981..16f06b304 160000 --- a/resources/mobile +++ b/resources/mobile @@ -1 +1 @@ -Subproject commit 4d22b4981d9db3913d6567232fc77ed88fd45e46 +Subproject commit 16f06b3044bdba0e71b5bac4c2099ee0c3b8c3d7