Merge branch 'fix-v2-220418-home-bug' into 'v2-220418'

src/layouts/components/AvatarDropdown.tsx

@@ -12,6 +12,7 @@ import { ReactComponent as DefaultAvatar } from '@/assets/imgs/default_avatar.sv
 
 const AvatarDropdown = (props) => {
   const intl = useIntl();
+  const userAuth = getAuth();
   const logout = () => {
     removeAuth()
     removeRouters()
@@ -19,7 +20,7 @@ const AvatarDropdown = (props) => {
   }
 
   const currentUser = {
-    name: getAuth()?.company || intl.formatMessage({id: 'common.weizhiyonghu'}),
+    name: userAuth.name || userAuth?.company || intl.formatMessage({id: 'common.weizhiyonghu'}),
     avatar: props.UserStore.avatar || '',
   }
 

src/pages/home/components/UserCenter/index.less

@@ -159,13 +159,14 @@
             justify-content: center;
             width: 140px;
             margin-right: auto;
+            margin-right: 16px;
             .levelImg {
               height: 16px;
             }
           }
 
           .score {
-            width: 140px;
+            // width: 140px;
             text-align: center;
             margin-right: auto;
           }

src/pages/home/components/UserCenter/index.tsx

@@ -68,6 +68,26 @@ const UserCenter: React.FC<Iprops> = (props) => {
 
   const isVerifyFail = useMemo(() => [2, 4].includes(userAuth.validateStatus), [userAuth]);
 
+  const renderUserLevelAndScore = () => {
+    if (enableMultiTenancy) {
+      return null;
+    }
+    return (
+      <>
+        {
+          userAuth.levelTag && (
+            <div className={styles.level}>
+              {intl.formatMessage({ id: 'home.userCenter.level' })}： <StatusTag type={'primary'} title={userAuth.levelTag} />
+            </div>
+          ) || null
+        }
+        <div className={styles.score}>
+          {intl.formatMessage({ id: 'home.userCenter.score' })}： <strong>{userAuth.score}</strong>
+        </div>
+      </>
+    )
+  }
+
   return (
     <div className={styles.container}>
       <div className={styles.header}>
@@ -140,16 +160,7 @@ const UserCenter: React.FC<Iprops> = (props) => {
           </div>
           <div className={styles.otherValues}>
             <div className={styles.divider}>
-              {!enableMultiTenancy && (
-                <>
-                  <div className={styles.level}>
-                    {intl.formatMessage({ id: 'home.userCenter.level' })}： <StatusTag type={'primary'} title={userAuth.levelTag} />
-                  </div>
-                  <div className={styles.score}>
-                    {intl.formatMessage({ id: 'home.userCenter.score' })}： <strong>{userAuth.score}</strong>
-                  </div>
-                </>
-              )}
+              {renderUserLevelAndScore()}
               {
                 userAuth.urls.includes(USER_CENTER_URL) && (
                   <Link to={USER_CENTER_URL} className={styles.link}>{intl.formatMessage({ id: 'home.userCenter.userAuth.link' })}</Link>