From edfd6e6de2fdd0e6c54d1069a89eb17fbf2751bd Mon Sep 17 00:00:00 2001 From: Pang Date: Thu, 7 Mar 2024 07:17:24 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/SystemController.php | 1 + resources/assets/js/pages/login.vue | 14 +++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/Api/SystemController.php b/app/Http/Controllers/Api/SystemController.php index dd448a759..764769916 100755 --- a/app/Http/Controllers/Api/SystemController.php +++ b/app/Http/Controllers/Api/SystemController.php @@ -126,6 +126,7 @@ class SystemController extends AbstractController $setting['file_upload_limit'] = $setting['file_upload_limit'] ?: ''; $setting['unclaimed_task_reminder'] = $setting['unclaimed_task_reminder'] ?: 'close'; $setting['unclaimed_task_reminder_time'] = $setting['unclaimed_task_reminder_time'] ?: ''; + $setting['version'] = Base::getVersion(); // return Base::retSuccess('success', $setting ?: json_decode('{}')); } diff --git a/resources/assets/js/pages/login.vue b/resources/assets/js/pages/login.vue index 05f2e4f41..4cbd6bf22 100644 --- a/resources/assets/js/pages/login.vue +++ b/resources/assets/js/pages/login.vue @@ -151,8 +151,8 @@ :title="$L('隐私协议')" :mask-closable="false">
-
欢迎使用本软件!
-

在您使用本软件前,请您认真阅读并了解相应的《{{ $L('隐私政策') }}》,以了解我们的服务内容和您相关个人信息的处理规则。我们将严格的按照隐私服务协议为您提供服务,保护您的个人信息。

+
{{$L('欢迎使用本软件!')}}
+

{{$L('在您使用本软件前,请您认真阅读并了解相应的')}}《{{ $L('隐私政策') }}》, {{$L('以了解我们的服务内容和您相关个人信息的处理规则。')}}{{$L('我们将严格的按照隐私服务协议为您提供服务,保护您的个人信息。')}}

@@ -451,9 +451,13 @@ export default { this.$store.dispatch("call", { url: `${url}system/setting`, checkNetwork: false, - }).then(async () => { - await this.setServerUrl(url) - resolve() + }).then(async ({data}) => { + if (typeof data.version === "undefined" && typeof data.all_group_mute === "undefined") { + reject(`服务器(${$A.getDomain(value)})版本过低`) + } else { + await this.setServerUrl(url) + resolve() + } }).catch(({ret, msg}) => { if (ret === -1001) { if (!/^https*:\/\//i.test(value)) {