github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2025-12-12 11:19:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf: 优化登录

Browse Source
This commit is contained in:
Pang 2024-03-07 07:17:24 +08:00
parent a68ab6512e
commit edfd6e6de2
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/Api/SystemController.php
View File

@ -126,6 +126,7 @@ class SystemController extends AbstractController
$setting['file_upload_limit'] = $setting['file_upload_limit'] ?: ''; $setting['file_upload_limit'] = $setting['file_upload_limit'] ?: '';
$setting['unclaimed_task_reminder'] = $setting['unclaimed_task_reminder'] ?: 'close'; $setting['unclaimed_task_reminder'] = $setting['unclaimed_task_reminder'] ?: 'close';
$setting['unclaimed_task_reminder_time'] = $setting['unclaimed_task_reminder_time'] ?: ''; $setting['unclaimed_task_reminder_time'] = $setting['unclaimed_task_reminder_time'] ?: '';
$setting['version'] = Base::getVersion();
// //
return Base::retSuccess('success', $setting ?: json_decode('{}')); return Base::retSuccess('success', $setting ?: json_decode('{}'));
} }

14
resources/assets/js/pages/login.vue
View File

@ -151,8 +151,8 @@
:title="$L('隐私协议')" :title="$L('隐私协议')"
:mask-closable="false"> :mask-closable="false">
<div class="privacy-content"> <div class="privacy-content">
<div>欢迎使用本软件！</div> <div>{{$L('欢迎使用本软件！')}}</div>
<p>在您使用本软件前，请您认真阅读并了解相应的<a target="_blank" :href="$A.apiUrl('privacy')">《{{ $L('隐私政策') }}》</a>，以了解我们的服务内容和您相关个人信息的处理规则。我们将严格的按照隐私服务协议为您提供服务，保护您的个人信息。</p> <p>{{$L('在您使用本软件前，请您认真阅读并了解相应的')}}<a target="_blank" :href="$A.apiUrl('privacy')">《{{ $L('隐私政策') }}》</a>, {{$L('以了解我们的服务内容和您相关个人信息的处理规则。')}}{{$L('我们将严格的按照隐私服务协议为您提供服务，保护您的个人信息。')}}</p>
</div> </div>
<div slot="footer" class="adaption"> <div slot="footer" class="adaption">
<Button type="default" @click="onPrivacy(false)">{{$L('不同意')}}</Button> <Button type="default" @click="onPrivacy(false)">{{$L('不同意')}}</Button>
@ -451,9 +451,13 @@ export default {
this.$store.dispatch("call", { this.$store.dispatch("call", {
url: `${url}system/setting`, url: `${url}system/setting`,
checkNetwork: false, checkNetwork: false,
}).then(async () => { }).then(async ({data}) => {
await this.setServerUrl(url) if (typeof data.version === "undefined" && typeof data.all_group_mute === "undefined") {
resolve() reject(`服务器（${$A.getDomain(value)}）版本过低`)
} else {
await this.setServerUrl(url)
resolve()
}
}).catch(({ret, msg}) => { }).catch(({ret, msg}) => {
if (ret === -1001) { if (ret === -1001) {
if (!/^https*:\/\//i.test(value)) { if (!/^https*:\/\//i.test(value)) {