From 6e3aec7c50c1dadcbbafbd5f04880f5395480f67 Mon Sep 17 00:00:00 2001
From: thiszhc <2029364173@qq.com>
Date: 星期六, 01 七月 2023 15:05:48 +0800
Subject: [PATCH] 对接后端更改做了适配，
---
src/layout/components/SocialLogin/index.vue | 8 +++-----
src/api/login.ts | 11 +++++------
2 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/src/api/login.ts b/src/api/login.ts
index f60406c..655d6c9 100644
--- a/src/api/login.ts
+++ b/src/api/login.ts
@@ -66,20 +66,19 @@
* 绗笁鏂圭櫥褰�
* @param source 绗笁鏂圭櫥褰曠被鍨�
* */
-export function socialLogin(source: string, tenantId: string, loginType: string, code: any, state: any): AxiosPromise<any> {
+export function socialLogin(source: string, tenantId: string, code: any, state: any): AxiosPromise<any> {
const data = {
- code,
- state,
+ socialCode: code,
+ socialState: state,
source,
tenantId,
- loginType,
clientId: 'e5cd7e4891bf95d1d19206ce24a7b32e',
grantType: 'social'
};
return request({
url: '/auth/social-login',
- method: 'get',
- params: data
+ method: 'post',
+ data: data
});
}
diff --git a/src/layout/components/SocialLogin/index.vue b/src/layout/components/SocialLogin/index.vue
index 82fb253..5c04df5 100644
--- a/src/layout/components/SocialLogin/index.vue
+++ b/src/layout/components/SocialLogin/index.vue
@@ -21,7 +21,6 @@
const state = route.query.state;
const source = route.query.source as string;
const tenantId = Cookies.get("tenantId") ? Cookies.get("tenantId") as string : '000000';
-const loginType = getToken() ? 'register' : 'login';
/**
* 閫氳繃code鑾峰彇token
@@ -29,7 +28,7 @@
* @param {string} code
* @param {string} state
*/
-await socialLogin(source, tenantId, loginType, code, state)
+await socialLogin(source, tenantId, code, state)
.then(async (res) => {
if (res.code !== 200) {
ElMessage.error(res.msg);
@@ -37,10 +36,9 @@
return;
}
loading.value = false;
- // setToken(res.msg);
- loginType === 'login' ? setToken(res.data) : ElMessage.success(res.msg);
+ setToken(res.data.access_token)
+ ElMessage.success(res.msg);
location.href = import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
-
})
.catch(() => {
loading.value = false;
--
Gitblit v1.9.3