mirror of
https://github.com/jeecgboot/JeecgBoot.git
synced 2026-02-03 09:05:28 +08:00
sas分支前端同步master分支
This commit is contained in:
@ -151,7 +151,6 @@ export const useUserStore = defineStore({
|
||||
): Promise<GetUserInfoModel | null> {
|
||||
try {
|
||||
const { goHome = true, mode, ...loginParams } = params;
|
||||
loginParams.grant_type = 'password';
|
||||
const data = await loginApi(loginParams, mode);
|
||||
const { token, userInfo } = data;
|
||||
// save token
|
||||
@ -249,11 +248,10 @@ export const useUserStore = defineStore({
|
||||
): Promise<GetUserInfoModel | null> {
|
||||
try {
|
||||
const { goHome = true, mode, ...loginParams } = params;
|
||||
loginParams.grant_type = 'phone';
|
||||
const data = await phoneLoginApi(loginParams, mode);
|
||||
const { access_token } = data;
|
||||
const { token } = data;
|
||||
// save token
|
||||
this.setToken(access_token);
|
||||
this.setToken(token);
|
||||
return this.afterLoginAction(goHome, data);
|
||||
} catch (error) {
|
||||
return Promise.reject(error);
|
||||
@ -358,11 +356,10 @@ export const useUserStore = defineStore({
|
||||
): Promise<any | null> {
|
||||
try {
|
||||
const { goHome = true, mode, ...ThirdLoginParams } = params;
|
||||
ThirdLoginParams.grant_type = "social";
|
||||
const data = await thirdLogin(ThirdLoginParams, mode);
|
||||
const { access_token } = data;
|
||||
const { token } = data;
|
||||
// save token
|
||||
this.setToken(access_token);
|
||||
this.setToken(token);
|
||||
return this.afterLoginAction(goHome, data);
|
||||
} catch (error) {
|
||||
return Promise.reject(error);
|
||||
|
||||
Reference in New Issue
Block a user