Merge pull request #9721 from dataease/pr@dev-v2@feat_mobile_platform_login

feat(X-Pack): 第三方平台移动端免登录进入
This commit is contained in:
fit2cloud-chenyw 2024-05-20 09:54:38 +08:00 committed by GitHub
commit bbc6064045
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 3 deletions

View File

@ -7,7 +7,7 @@ import { usePermissionStoreWithOut, pathValid, getFirstAuthMenu } from '@/store/
import { usePageLoading } from '@/hooks/web/usePageLoading'
import { getRoleRouters } from '@/api/common'
import { useCache } from '@/hooks/web/useCache'
import { isMobile, checkPlatform } from '@/utils/utils'
import { isMobile, checkPlatform, isLarkPlatform, isPlatformClient } from '@/utils/utils'
import { interactiveStoreWithOut } from '@/store/modules/interactive'
import { useAppearanceStoreWithOut } from '@/store/modules/appearance'
import { useEmbedded } from '@/store/modules/embedded'
@ -34,7 +34,7 @@ router.beforeEach(async (to, from, next) => {
loadDone()
if (to.name === 'link') {
window.location.href = window.origin + '/mobile.html#' + to.path
} else {
} else if (!isPlatformClient() && !isLarkPlatform()) {
window.location.href = window.origin + '/mobile.html#/index'
}
}

View File

@ -256,7 +256,13 @@ onMounted(() => {
</div>
<div class="login-form-content" v-loading="loading">
<div class="login-form-center">
<el-form ref="formRef" :model="state.loginForm" :rules="rules" size="default">
<el-form
ref="formRef"
:model="state.loginForm"
:rules="rules"
size="default"
:disabled="preheat"
>
<div class="login-logo">
<Icon
v-if="!loginLogoUrl && axiosFinished"