Merge branch 'master' into bms

king

2021-01-15 76a4300654a18d228838c3f27455dc8e7a8cd616

 src/menu/header/index.jsx

@@ -2,11 +2,11 @@
import { is, fromJS } from 'immutable'

import avatar from '@/assets/img/avatar.jpg'
import MainLogo from '@/assets/img/main-logo.png'
import './index.scss'

class MenuHeader extends Component {
  state = {
    logourl: window.GLOB.mainlogo,
    avatar: sessionStorage.getItem('CloudAvatar') || avatar,
    userName: sessionStorage.getItem('CloudUserName')
  }
@@ -19,7 +19,7 @@

    return (
      <header className="menu-header-container">
        <div className="header-logo"><img src={this.state.logourl} alt=""/></div>
        <div className="header-logo"><img src={MainLogo} alt=""/></div>
          <div className="header-setting">
            <img src={this.state.avatar} alt=""/>
            <span>