浏览代码

对接后端更改做了适配,

thiszhc 1 年之前
父节点
当前提交
6e3aec7c50
共有 2 个文件被更改,包括 8 次插入11 次删除
  1. 5 6
      src/api/login.ts
  2. 3 5
      src/layout/components/SocialLogin/index.vue

+ 5 - 6
src/api/login.ts

@@ -66,20 +66,19 @@ export function getCodeImg(): AxiosPromise<VerifyCodeResult> {
  * 第三方登录
  * @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
   });
 }
 

+ 3 - 5
src/layout/components/SocialLogin/index.vue

@@ -21,7 +21,6 @@ const code = route.query.code;
 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 @@ const loginType = getToken() ? 'register' : 'login';
  * @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 @@ await socialLogin(source, tenantId, loginType, code, state)
       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;