update

src/store/modules/user.ts

@@ -6,6 +6,7 @@ import { getAuthCache, setAuthCache } from '/@/utils/auth.ts';
 import { useRouter } from 'vue-router';
 import { LoginInfo, LoginParams, UserInfo } from '/@/store/modules/storeType.ts';
 import { store } from '/@/store';
+import { message } from 'ant-design-vue';
 
 const router = useRouter();
 export const useUserStore = defineStore({
@@ -16,8 +17,8 @@ export const useUserStore = defineStore({
         //登录返回信息
         loginInfo: null,
         themeType: '', // dark 1, light 2
-        flag1: null, //银川权限标识
-        flag2: null, //西安权限标识
+        flag1: '', //银川权限标识
+        flag2: '', //西安权限标识
     }),
     getters: {
         getUserInfo(): UserInfo {
@@ -70,11 +71,15 @@ export const useUserStore = defineStore({
             try {
                 const { goHome = true, mode, ...loginParams } = params;
                 const data = await loginApi(loginParams, mode);
-                const { token, userInfo } = data.result;
-                // save token
-                this.setToken(token, false);
-                this.setUserInfo(userInfo);
-                return { userInfo, token };
+                if (data && data['result']) {
+                    const { token, userInfo } = data.result;
+                    // save token
+                    this.setToken(token, false);
+                    this.setUserInfo(userInfo);
+                    return { userInfo, token };
+                } else {
+                    return Promise.reject(data);
+                }
             } catch (error) {
                 return Promise.reject(error);
             }