Merge remote-tracking branch 'origin/Gf-Vben-Admin' into Gf-Vben-Admin

# Conflicts:
#	package.json
#	src/api/sys/menu.ts
#	src/api/sys/user.ts
#	src/store/modules/permission.ts
#	src/utils/http/axios/index.ts
#	yarn.lock
This commit is contained in:
JinMao 2021-11-26 08:44:37 +08:00
commit eb75374cb0

View File

@ -89,9 +89,7 @@ export const useUserStore = defineStore({
): Promise<GetUserInfoModel | null> {
try {
const { goHome = true, mode, ...loginParams } = params;
const data = await loginApi(loginParams, mode);
const { token } = data;
const { token } = await loginApi(loginParams, mode);
// save token
this.setToken(token);
// get user info