From a074cb9664cfccac4df536375f91c43ce6fc88b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A6=E8=8D=A3=E8=B6=85?= <302645122@qq.com> Date: Fri, 25 Feb 2022 10:54:20 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=9B=9E=E6=BB=9A=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=90=8E=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/SystemController.php | 24 ++++++++++++++++++- app/Models/WebSocketDialog.php | 1 + resources/assets/js/pages/manage.vue | 2 +- .../pages/manage/components/DialogWrapper.vue | 1 + .../pages/manage/setting/system/setting.vue | 12 ++++++++++ .../sass/pages/components/dialog-wrapper.scss | 12 ++++++++++ 6 files changed, 50 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Api/SystemController.php b/app/Http/Controllers/Api/SystemController.php index da2163959..a6b0fd2c6 100755 --- a/app/Http/Controllers/Api/SystemController.php +++ b/app/Http/Controllers/Api/SystemController.php @@ -41,7 +41,7 @@ class SystemController extends AbstractController User::auth('admin'); $all = Request::input(); foreach ($all AS $key => $value) { - if (!in_array($key, ['reg', 'reg_invite', 'login_code', 'password_policy', 'project_invite', 'chat_nickname', 'auto_archived', 'archived_day'])) { + if (!in_array($key, ['reg', 'reg_invite', 'login_code', 'password_policy', 'project_invite', 'chat_nickname', 'auto_archived', 'archived_day', 'start_home', 'home_footer'])) { unset($all[$key]); } } @@ -72,6 +72,7 @@ class SystemController extends AbstractController $setting['chat_nickname'] = $setting['chat_nickname'] ?: 'optional'; $setting['auto_archived'] = $setting['auto_archived'] ?: 'close'; $setting['archived_day'] = floatval($setting['archived_day']) ?: 7; + $setting['start_home'] = $setting['start_home'] ?: 'close'; // return Base::retSuccess('success', $setting ?: json_decode('{}')); } @@ -478,4 +479,25 @@ class SystemController extends AbstractController // return $data; } + + + /** + * @api {get} api/system/get/starthome 13. 启动首页设置信息 + * + * @apiDescription 用于判断注册是否需要启动首页 + * @apiVersion 1.0.0 + * @apiGroup system + * @apiName get__starthome + * + * @apiSuccess {Number} ret 返回状态码（1正确、0错误） + * @apiSuccess {String} msg 返回信息（错误描述） + * @apiSuccess {Object} data 返回数据 + */ + public function get__starthome() + { + return Base::retSuccess('success', [ + 'need_start' => Base::settingFind('system', 'start_home') == 'open', + 'home_footer' => Base::settingFind('system', 'home_footer') + ]); + } } diff --git a/app/Models/WebSocketDialog.php b/app/Models/WebSocketDialog.php index 7bd1e98dd..ceb33c8f7 100644 --- a/app/Models/WebSocketDialog.php +++ b/app/Models/WebSocketDialog.php @@ -112,6 +112,7 @@ class WebSocketDialog extends AbstractModel // 对方信息 $dialog->dialog_user = null; $dialog->group_info = null; + $dialog->top_at = WebSocketDialogUser::whereDialogId($dialog->id)->whereUserid($userid)->value('top_at'); switch ($dialog->type) { case "user": $dialog_user = $builder->where('userid', '!=', $userid)->first(); diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue index 3621fe093..67ea56d1f 100644 --- a/resources/assets/js/pages/manage.vue +++ b/resources/assets/js/pages/manage.vue @@ -672,7 +672,7 @@ export default { return { "active": this.curPath == '/manage/' + path, "open-menu": openMenu === true, - "top": item.top_at, + "top": item.top_at && this.curPath != '/manage/' + path, "operate": item.id == this.topOperateItem.id && this.topOperateVisible }; }, diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue index c9825f0d6..412bb5188 100644 --- a/resources/assets/js/pages/manage/components/DialogWrapper.vue +++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue @@ -13,6 +13,7 @@

{{dialogData.name}}

({{peopleNum}}) +