lanjianrong 4 lat temu
rodzic
commit
b14188047b
1 zmienionych plików z 3 dodań i 2 usunięć
  1. 3 2
      src/components/RightContent/AvatarDropdown.tsx

+ 3 - 2
src/components/RightContent/AvatarDropdown.tsx

@@ -9,6 +9,7 @@ import styles from './index.less'
 import { clearAuthCache, removeToken } from '@/utils/auth'
 import ws from '@/utils/ws'
 import { isDevMode } from '@/utils/env'
+import consts from '@/consts'
 
 export type GlobalHeaderRightProps = {
   menu?: boolean
@@ -52,8 +53,8 @@ const AvatarDropdown: React.FC<GlobalHeaderRightProps> = ({ menu }) => {
           onOk: () => {
             // 清除AuthCache
             removeToken()
-            loginOut()
             setInitialState({ ...initialState, currentUser: undefined, roles: [], permData: {} })
+            loginOut()
             return
           }
         })
@@ -101,7 +102,7 @@ const AvatarDropdown: React.FC<GlobalHeaderRightProps> = ({ menu }) => {
           className={styles.avatar}
           src={
             (isDevMode() ? 'http://cld2qa.com' : 'http://zhcld.com') +
-            (currentUser?.avatar ? currentUser.avatar : '/global/img/avtra_2.jpg')
+            (currentUser?.avatar ?? consts.DEFAULT_AVATAR)
           }
           alt="avatar"
         />