diff --git a/src/layouts/BasicLayout.js b/src/layouts/BasicLayout.js index 4557367654c928a0992fae66ffedc94baf606206..9674e269274800a6cf07b0fc7bbec968bdaae14c 100644 --- a/src/layouts/BasicLayout.js +++ b/src/layouts/BasicLayout.js @@ -1,6 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { Layout, Menu, Icon, Avatar, Dropdown, Tag, message } from 'antd'; +import { Layout, Menu, Icon, Avatar, Dropdown, Tag, message, Spin } from 'antd'; import DocumentTitle from 'react-document-title'; import { connect } from 'dva'; import { Link, routerRedux } from 'dva/router'; @@ -164,8 +164,8 @@ class BasicLayout extends React.PureComponent { const menu = ( - 个人中心 - 设置 + 个人中心 + 设置 退出登录 @@ -243,12 +243,14 @@ class BasicLayout extends React.PureComponent { - - - - {currentUser.name} - - + {currentUser.name ? ( + + + + {currentUser.name} + + + ) : } diff --git a/src/layouts/BasicLayout.less b/src/layouts/BasicLayout.less index 538e795322156dba7093dcc7c2a83f8d8bc1c46f..40d3b95dedc7dcca0f2a95c4ca036d90b68ba252 100644 --- a/src/layouts/BasicLayout.less +++ b/src/layouts/BasicLayout.less @@ -89,9 +89,7 @@ margin-right: 8px; } :global(.ant-dropdown-menu-item) { - padding-left: 16px; - padding-right: 16px; - width: 190px; + width: 160px; } }