diff --git a/src/api/login.ts b/src/api/login.ts index d4ceb49..e85ce3e 100644 --- a/src/api/login.ts +++ b/src/api/login.ts @@ -2,7 +2,9 @@ import request from '@/utils/request'; import { AxiosPromise } from 'axios'; import { LoginData, LoginResult, VerifyCodeResult, TenantInfo } from './types'; import { UserInfo } from '@/api/system/user/types'; -import { da } from 'element-plus/es/locale'; + +// pc端固定客户端授权id +const clientId = 'e5cd7e4891bf95d1d19206ce24a7b32e'; /** * @param data {LoginData} @@ -11,7 +13,7 @@ import { da } from 'element-plus/es/locale'; export function login(data: LoginData): AxiosPromise { const params = { ...data, - clientId: data.clientId || 'e5cd7e4891bf95d1d19206ce24a7b32e', + clientId: data.clientId || clientId, grantType: data.grantType || 'password' }; return request({ @@ -59,14 +61,14 @@ export function getCodeImg(): AxiosPromise { timeout: 20000 }); } + /** * 第三方登录 - * @param source 第三方登录类型 - * */ + */ export function callback(data: LoginData): AxiosPromise { const LoginData = { ...data, - clientId: 'e5cd7e4891bf95d1d19206ce24a7b32e', + clientId: clientId, grantType: 'social' }; return request({ diff --git a/src/layout/components/SocialLogin/index.vue b/src/layout/components/SocialCallback/index.vue similarity index 96% rename from src/layout/components/SocialLogin/index.vue rename to src/layout/components/SocialCallback/index.vue index 7656673..faf7d50 100644 --- a/src/layout/components/SocialLogin/index.vue +++ b/src/layout/components/SocialCallback/index.vue @@ -1,5 +1,5 @@