From 0970e823dea48d8c457f7c69effddae973447f99 Mon Sep 17 00:00:00 2001 From: blp <2962632571@qq.com> Date: Sat, 28 Jan 2023 14:38:05 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=20=E8=AE=B0=E4=BD=8F=E6=88=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/login.js | 17 ------- src/api/login.ts | 49 +++++++++++++++++++ src/views/user/Login/index.vue | 86 ++++++++++++---------------------- 3 files changed, 79 insertions(+), 73 deletions(-) delete mode 100644 src/api/login.js create mode 100644 src/api/login.ts diff --git a/src/api/login.js b/src/api/login.js deleted file mode 100644 index 461d7628..00000000 --- a/src/api/login.js +++ /dev/null @@ -1,17 +0,0 @@ -import server from '@/utils/request' - -export const config = () => server.get(`/authorize/captcha/config`) - -export const code = () => server.get(`/authorize/captcha/image?width=130&height=30`) - -export const authLogin = (data) => server.post(`/authorize/login`, data) - -export const getInitSet = () => server.get(`/user/settings/init`) - -export const postInitSet = (data) => server.post(`/user/settings/init`, data) - -export const systemVersion = () => server.get(`/system/version`) - -export const bindInfo = () => server.get(`/application/sso/_all`) - -export const settingDetail = (scopes) => server.get(`/system/config/${scopes}`) \ No newline at end of file diff --git a/src/api/login.ts b/src/api/login.ts new file mode 100644 index 00000000..33684901 --- /dev/null +++ b/src/api/login.ts @@ -0,0 +1,49 @@ +import server from '@/utils/request' + +/** + * 获取验证码配置 + * @returns + */ +export const config = () => server.get(`/authorize/captcha/config`) + +/** + * 获取验证码图片 + * @returns + */ +export const code = () => server.get(`/authorize/captcha/image?width=130&height=30`) + +/** + * 登录 + * @returns + */ +export const authLogin = (data: any) => server.post(`/authorize/login`, data) + +/** + * 查询初始化配置信息 + * @returns + */ +export const getInitSet = () => server.get(`/user/settings/init`) + +/** + * 创建初始化配置信息 + * @returns + */ +export const postInitSet = (data: any) => server.post(`/user/settings/init`, data) + +/** + * 查询系统版本信息 + * @returns + */ +export const systemVersion = () => server.get(`/system/version`) + +/** + * 获取支持的SSO的应用 + * @returns + */ +export const bindInfo = () => server.get(`/application/sso/_all`) + +/** + * 查询配置信息 + * @returns + */ +export const settingDetail = (scopes: string) => server.get(`/system/config/${scopes}`) \ No newline at end of file diff --git a/src/views/user/Login/index.vue b/src/views/user/Login/index.vue index d41703b3..c5248629 100644 --- a/src/views/user/Login/index.vue +++ b/src/views/user/Login/index.vue @@ -83,19 +83,20 @@ ]" > -
- -
+ > + + 记住密码记住我 @@ -180,7 +188,6 @@ import { bindInfo, settingDetail, } from '@/api/login'; -import Cookies from 'js-cookie'; import { useUserInfo } from '@/store/userInfo'; import { LocalStore } from '@/utils/comm'; import { BASE_API_PATH, TOKEN_KEY, Version_Code } from '@/utils/variable'; @@ -220,34 +227,24 @@ iconMap.set('dingtalk-ent-app', getImage('/bind/dingtalk.png')); iconMap.set('wechat-webapp', getImage('/bind/wechat-webapp.png')); const onFinish = async () => { - form.remember - ? Cookies.set('user', encodeURIComponent(JSON.stringify(form)), { - expires: 7, - }) - : Cookies.remove('user'); - Cookies.set('username', form.username, { expires: 30 }); try { loading.value = true; const res: any = await authLogin(form); + loading.value = false; if (res.success) { store.$patch({ ...res.result, username: form.username, }); LocalStore.set(TOKEN_KEY, res?.result.token); - // if (res.result.username === 'admin') { - // const resp: any = await getInitSet(); - // if (resp.status === 200 && !resp.result.length) { - // window.location.href = '/#/init-home'; - // return; - // } - // } - // window.location.href = '/'; - - const resp: any = await getInitSet(); - if (resp.success) { - router.push('/demo'); + if (res.result.username === 'admin') { + const resp: any = await getInitSet(); + if (resp.status === 200 && !resp.result.length) { + window.location.href = '/#/init-home'; + return; + } } + window.location.href = '/'; } } catch (error) { form.verifyCode = ''; @@ -269,14 +266,6 @@ const getCode = async () => { } }; -const getCookie = () => { - // form.username = Cookies.get('username'); - if (!Cookies.get('user')) return; - const user = JSON.parse(decodeURIComponent(Cookies.get('user'))); - form.username = user.username; - form.password = user.password; - form.remember = user.remember || false; -}; const getOpen = () => { LocalStore.removeAll(); @@ -292,7 +281,7 @@ const getOpen = () => { } } }); - settingDetail('front').then((res) => { + settingDetail('front').then((res: any) => { if (res.status === 200) { const ico: any = document.querySelector('link[rel="icon"]'); ico.href = res.result.ico; @@ -337,7 +326,6 @@ watch( getOpen(); getCode(); -getCookie(); screenRotation(screenWidth.value, screenHeight.value); @@ -470,23 +458,9 @@ screenRotation(screenWidth.value, screenHeight.value); } .verifyCode { - .login-code-input { - width: 70%; - float: left; - } - .login-code { - width: 30%; - height: 32px; - float: left; - background-color: #e4e6e7; - img { - cursor: pointer; - vertical-align: middle; - } - .login-code-img { - width: 100%; - height: 100%; - } + img { + cursor: pointer; + // vertical-align: middle; } } }