Merge branch 'lmy' of http://119.78.67.12/git/root/ops_2024_vue into hd

src/store/modules/user.ts

@@ -16,7 +16,7 @@ import { RouteRecordRaw } from 'vue-router';
 import { PAGE_NOT_FOUND_ROUTE } from '/@/router/routes/basic';
 import { isArray } from '/@/utils/is';
 import { h } from 'vue';
-
+import { message } from 'ant-design-vue';
 interface UserState {
   userInfo: GetUserInfoModel;
   token?: string;
@@ -119,14 +119,22 @@ export const useUserStore = defineStore({
     },
     //数据对接模拟登录
     async tmallabSimulationLogin(params: { loginName: string; password: string }): Promise<any> {
-      try {
-        const data = await tmallabLoginApi(params);
+      const data = await tmallabLoginApi(params);
+      if (data.success) {
         this.setTmallabToken(data.data.token);
         this.setToken(data.data.token);
         return this.afterLoginAction(true, data.data);
-      } catch (error) {
-        return Promise.reject(error);
+      } else {
+        message.error(data.message);
       }
+      // try {
+      //   const data = await tmallabLoginApi(params);
+      //   this.setTmallabToken(data.data.token);
+      //   this.setToken(data.data.token);
+      //   return this.afterLoginAction(true, data.data);
+      // } catch (error) {
+      //   return Promise.reject(error);
+      // }
     },
     async afterLoginAction(goHome?: boolean, data?: any): Promise<GetUserInfoModel | null> {
       if (!this.getTmallabToken) return null;