jackson 6 сар өмнө
parent
commit
3202956116

+ 3 - 0
src/api/errorHandle.ts

@@ -4,11 +4,14 @@ import { ErrCodeMap } from "@/constants";
 interface ErrorData {
   errCode: number;
   errMsg?: string;
+  message?: string;
 }
 
 export const errorHandle = (err: unknown) => {
   const errData = err as ErrorData;
   if (errData.errMsg) {
     message.error(ErrCodeMap[errData.errCode] || errData.errMsg);
+  } else {
+    message.error(errData.message);
   }
 };

+ 7 - 3
src/layout/LeftNavBar/index.tsx

@@ -8,7 +8,7 @@ import ImageResizer from "react-image-file-resizer";
 import { UNSAFE_NavigationContext, useResolvedPath } from "react-router-dom";
 import { v4 as uuidV4 } from "uuid";
 
-import { modal } from "@/AntdGlobalComp";
+import { message, modal } from "@/AntdGlobalComp";
 import { updateBusinessUserInfo } from "@/api/login";
 import contact_icon from "@/assets/images/nav/nav_bar_contact.png";
 import contact_icon_active from "@/assets/images/nav/nav_bar_contact_active.png";
@@ -215,8 +215,12 @@ const LeftNavBar = memo(() => {
       };
       await updateBusinessUserInfo(newInfo);
       updateSelfInfo(newInfo);
-    } catch (error) {
-      feedbackToast({ error: t("toast.updateAvatarFailed") });
+    } catch (error: any) {
+      if(error.message){
+        message.error(error.message);
+      } else {
+        feedbackToast({ error: t("toast.updateAvatarFailed") });
+      }
     }
   };
 

+ 3 - 0
src/layout/TopSearchBar/index.tsx

@@ -27,6 +27,7 @@ import emitter, { OpenUserCardParams } from "@/utils/events";
 
 import { IMSDK } from "../MainContentWrap";
 import SearchUserOrGroup from "./SearchUserOrGroup";
+import { message } from "@/AntdGlobalComp";
 
 type UserCardState = OpenUserCardParams & {
   cardInfo?: CardInfo;
@@ -87,6 +88,8 @@ const TopSearchBar = () => {
             },
           });
           rtcRef.current?.openOverlay();
+        }).catch(error => {
+          message.error(error.message);
         });
       }
     };

+ 5 - 7
src/pages/common/UserCardModal/index.tsx

@@ -115,14 +115,12 @@ const UserCardModal: ForwardRefRenderFunction<
       userInfo = { ...friendInfo };
     }
 
-    try {
-      const {
-        data: { users },
-      } = await getBusinessUserInfo([userID!]);
+    getBusinessUserInfo([userID!]).then(({data: { users }}) => {
       userInfo = { ...userInfo, ...users[0] };
-    } catch (error) {
-      console.error("get business user info failed", userID, error);
-    }
+    }).catch(error => {
+      message.error(error.message);
+    })
+
     return userInfo;
   };
 

+ 9 - 2
src/store/user.ts

@@ -10,6 +10,7 @@ import { clearIMProfile, getLocale, setLocale } from "@/utils/storage";
 import { useContactStore } from "./contact";
 import { useConversationStore } from "./conversation";
 import { AppConfig, AppSettings, IMConnectState, UserStore } from "./type";
+import { message } from "@/AntdGlobalComp";
 
 export const useUserStore = create<UserStore>()((set, get) => ({
   syncState: "success",
@@ -44,10 +45,16 @@ export const useUserStore = create<UserStore>()((set, get) => ({
         set(() => ({ selfInfo: data as unknown as BusinessUserInfo }));
         getBusinessUserInfo([data.userID]).then(({ data: { users } }) =>
           set((state) => ({ selfInfo: { ...state.selfInfo, ...users[0] } })),
-        );
+        ).catch(error => {
+          message.error(error.message);
+        });
       })
       .catch((error) => {
-        feedbackToast({ error, msg: t("toast.getSelfInfoFailed") });
+        if(error.message){
+          message.error(error.message);
+        } else {
+          feedbackToast({ msg: t("toast.getSelfInfoFailed") });
+        }
         get().userLogout();
       });
   },