hhyykk/ipms-sjy-ui
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy-ui.git synced 2025-07-19 05:15:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'yudao/dev' into dev

Browse Source 
# Conflicts:
#	src/config/axios/service.ts
#	src/types/auto-components.d.ts
This commit is contained in:
puhui999
2023-04-07 10:17:40 +08:00
parent e22363d061 5fb61f8cb8
commit d679a7a3be
125 changed files with 1222 additions and 1012 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/Login/components/LoginForm.vue
View File

@ -195,7 +195,7 @@ const getCode = async () => {
//获取租户ID
const getTenantId = async () => {
if (loginData.tenantEnable === 'true') {
const res = await LoginApi.getTenantIdByNameApi(loginData.loginForm.tenantName)
const res = await LoginApi.getTenantIdByName(loginData.loginForm.tenantName)
authUtil.setTenantId(res)
}
}
@ -222,7 +222,7 @@ const handleLogin = async (params) => {
return
}
loginData.loginForm.captchaVerification = params.captchaVerification
const res = await LoginApi.loginApi(loginData.loginForm)
const res = await LoginApi.login(loginData.loginForm)
if (!res) {
return
}
@ -264,7 +264,7 @@ const doSocialLogin = async (type: number) => {
loginLoading.value = true
if (loginData.tenantEnable === 'true') {
await message.prompt('请输入租户名称', t('common.reminder')).then(async ({ value }) => {
const res = await LoginApi.getTenantIdByNameApi(value)
const res = await LoginApi.getTenantIdByName(value)
authUtil.setTenantId(res)
})
}
@ -272,7 +272,7 @@ const doSocialLogin = async (type: number) => {
const redirectUri =
location.origin + '/social-login?type=' + type + '&redirect=' + (redirect.value || '/')
// 进行跳转
const res = await LoginApi.socialAuthRedirectApi(type, encodeURIComponent(redirectUri))
const res = await LoginApi.socialAuthRedirect(type, encodeURIComponent(redirectUri))
window.location.href = res
}
}