feats

src/components/GlobalHeader/AvatarDropdown.jsx

@@ -47,10 +47,11 @@ class AvatarDropdown extends React.Component {
       currentUser = {
         avatar: '',
         userName: '',
-        miniAppName: '',
+        miniapp: {},
       },
       menu,
     } = this.props;
+
     const menuHeaderDropdown = (
       <Menu className={styles.menu} selectedKeys={[]} onClick={this.onMenuClick}>
         {menu && (
@@ -82,12 +83,12 @@ class AvatarDropdown extends React.Component {
         <HeaderDropdown overlay={menuHeaderDropdown}>
             <div className={`${styles.action} ${styles.account}`} style={{display:'flex'}}>
               
-         <div style={{margin:'10px 0' }}>
+         <div style={{ margin: '10px 0' }}>
               <p align="right" className={styles.name}>{currentUser.loginName}</p>
      
-              <p align="right" className={styles.name}>欢迎登录{currentUser.miniAppName}</p>
+              <p align="right" className={styles.name}>欢迎登录{(currentUser.miniapp || {}).miniAppName}</p>
           </div>
-          <Avatar size="small" className={styles.avatar} src={currentUser.avatar === null ? currentUser.photo:currentUser.avatar} alt="avatar" />
+          <Avatar size="small" className={styles.avatar} src={currentUser.avatar === null ? currentUser.photo : currentUser.avatar} alt="avatar" />
             </div>
         </HeaderDropdown>