diff --git a/src/api/login/index.ts b/src/api/login/index.ts index 613bc2d9e..444f0f27c 100644 --- a/src/api/login/index.ts +++ b/src/api/login/index.ts @@ -69,14 +69,4 @@ export const getCodeImg = () => { url: 'system/captcha/captchaImage', headers: { isToken: false }}) -} -// export function getCodeImg() { -// return request({ -// url: '/captchaImage', -// headers: { -// isToken: false -// }, -// method: 'get', -// timeout: 20000 -// }) -// } +} \ No newline at end of file diff --git a/src/views/Login/components/LoginForm.vue b/src/views/Login/components/LoginForm.vue index e5efa012a..43d283c35 100644 --- a/src/views/Login/components/LoginForm.vue +++ b/src/views/Login/components/LoginForm.vue @@ -29,7 +29,7 @@
+ :prefix-icon="iconLock" @keyup.enter="handleLogin()" /> @@ -204,6 +204,7 @@ const handleLogin = async (params) => { if (redirect.value.indexOf('sso') !== -1) { window.location.href = window.location.href.replace('/login?redirect=', '') } else { + console.log(redirect.value) push({ path: redirect.value || permissionStore.addRouters[0].path }) } } finally { @@ -229,6 +230,7 @@ const doSocialLogin = async (type: number) => { location.origin + '/social-login?type=' + type + '&redirect=' + (redirect.value || '/') // 进行跳转 const res = await LoginApi.socialAuthRedirect(type, encodeURIComponent(redirectUri)) + console.log(33) window.location.href = res } }