From 6d9c089cebac440c78573e9fa95190ee9ead674c Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 18 九月 2024 16:34:28 +0800
Subject: [PATCH] http api
---
src/views/Login/components/LoginForm.vue | 104 ++++++----------------------------------------------
1 files changed, 12 insertions(+), 92 deletions(-)
diff --git a/src/views/Login/components/LoginForm.vue b/src/views/Login/components/LoginForm.vue
index a6affea..7b161e3 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>
@@ -176,13 +133,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 () => {
@@ -253,54 +203,24 @@
if (!redirect.value) {
redirect.value = '/'
}
- // 判断是否为SSO登录
- if (redirect.value.indexOf('sso') !== -1) {
- window.location.href = window.location.href.replace('/login?redirect=', '')
- } else {
- push({ path: redirect.value || permissionStore.addRouters[0].path })
- }
+ let tenantId = authUtil.getTenantId()
+ // if(tenantId != 1) {
+ // //只要不是系统租户，登录成功跳转到home2页面
+ // window.location.href = '/home2'
+ // } else {
+ // 判断是否为SSO登录
+ if (redirect.value.indexOf('sso') !== -1) {
+ window.location.href = window.location.href.replace('/login?redirect=', '')
+ } else {
+ push({ path: redirect.value || permissionStore.addRouters[0].path })
+ }
+ // }
} finally {
loginLoading.value = false
loading.value.close()
}
}
-// 社交登录
-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