From da47a3349dcfd87db23ab8e64fbf35fe1aea5685 Mon Sep 17 00:00:00 2001 From: 潘志宝 <979469083@qq.com> Date: 星期四, 14 十一月 2024 16:52:21 +0800 Subject: [PATCH] 预测项数据 --- src/views/Login/components/LoginForm.vue | 91 +-------------------------------------------- 1 files changed, 2 insertions(+), 89 deletions(-) diff --git a/src/views/Login/components/LoginForm.vue b/src/views/Login/components/LoginForm.vue index 6e7f0d8..22a80b2 100644 --- a/src/views/Login/components/LoginForm.vue +++ b/src/views/Login/components/LoginForm.vue @@ -82,49 +82,6 @@ mode="pop" @success="handleLogin" /> - <!--<el-col :span="24" style="padding-right: 10px; padding-left: 10px"> - <el-form-item> - <el-row :gutter="5" justify="space-between" style="width: 100%"> - <el-col :span="8"> - <XButton - :title="t('login.btnMobile')" - class="w-[100%]" - @click="setLoginState(LoginStateEnum.MOBILE)" - /> - </el-col> - <el-col :span="8"> - <XButton - :title="t('login.btnQRCode')" - class="w-[100%]" - @click="setLoginState(LoginStateEnum.QR_CODE)" - /> - </el-col> - <el-col :span="8"> - <XButton - :title="t('login.btnRegister')" - class="w-[100%]" - @click="setLoginState(LoginStateEnum.REGISTER)" - /> - </el-col> - </el-row> - </el-form-item> - </el-col>--> - <!--<el-divider content-position="center">{{ t('login.otherLogin') }}</el-divider> - <el-col :span="24" style="padding-right: 10px; padding-left: 10px"> - <el-form-item> - <div class="w-[100%] flex justify-between"> - <Icon - v-for="(item, key) in socialList" - :key="key" - :icon="item.icon" - :size="30" - class="anticon cursor-pointer" - color="#999" - @click="doSocialLogin(item.type)" - /> - </div> - </el-form-item> - </el-col>--> </el-row> </el-form> </template> @@ -143,13 +100,12 @@ defineOptions({ name: 'LoginForm' }) const { t } = useI18n() -const message = useMessage() const iconHouse = useIcon({ icon: 'ep:house' }) const iconAvatar = useIcon({ icon: 'ep:avatar' }) const iconLock = useIcon({ icon: 'ep:lock' }) const formLogin = ref() const { validForm } = useFormValid(formLogin) -const { setLoginState, getLoginState } = useLoginState() +const { getLoginState } = useLoginState() const { currentRoute, push } = useRouter() const permissionStore = usePermissionStore() const redirect = ref<string>('') @@ -176,13 +132,6 @@ rememberMe: true // 默认记录我。如果不需要,可手动修改 } }) - -const socialList = [ - { icon: 'ant-design:wechat-filled', type: 30 }, - { icon: 'ant-design:dingtalk-circle-filled', type: 20 }, - { icon: 'ant-design:github-filled', type: 0 }, - { icon: 'ant-design:alipay-circle-filled', type: 0 } -] // 获取验证码 const getCode = async () => { @@ -251,7 +200,7 @@ } authUtil.setToken(res) if (!redirect.value) { - redirect.value = '/' + redirect.value = '/index' } // 判断是否为SSO登录 if (redirect.value.indexOf('sso') !== -1) { @@ -265,42 +214,6 @@ } } -// 社交登录 -const doSocialLogin = async (type: number) => { - if (type === 0) { - message.error('此方式未配置') - } else { - loginLoading.value = true - if (loginData.tenantEnable === 'true') { - // 尝试先通过 tenantName 获取租户 - await getTenantId() - // 如果获取不到,则需要弹出提示,进行处理 - if (!authUtil.getTenantId()) { - try { - const data = await message.prompt('请输入租户名称', t('common.reminder')) - if (data?.action !== 'confirm') throw 'cancel' - const res = await LoginApi.getTenantIdByName(data.value) - authUtil.setTenantId(res) - } catch (error) { - if (error === 'cancel') return - } finally { - loginLoading.value = false - } - } - } - // 计算 redirectUri - // tricky: type、redirect需要先encode一次,否则钉钉回调会丢失。 - // 配合 Login/SocialLogin.vue#getUrlValue() 使用 - const redirectUri = - location.origin + - '/social-login?' + - encodeURIComponent(`type=${type}&redirect=${redirect.value || '/'}`) - - // 进行跳转 - const res = await LoginApi.socialAuthRedirect(type, encodeURIComponent(redirectUri)) - window.location.href = res - } -} watch( () => currentRoute.value, (route: RouteLocationNormalizedLoaded) => { -- Gitblit v1.9.3