diff --git a/src/components/Layout/Menu.js b/src/components/Layout/Menu.js index 257df2a..1a2b8e4 100644 --- a/src/components/Layout/Menu.js +++ b/src/components/Layout/Menu.js @@ -31,9 +31,9 @@ const Menus = ({ siderFold, darkTheme, navOpenKeys, changeOpenKeys, menu, locati } return ( - + {item.icon && } - {(!siderFoldN || !menuTree.includes(item)) && item.name} + {item.name} ) diff --git a/src/router.js b/src/router.js index 06e2441..b027f09 100644 --- a/src/router.js +++ b/src/router.js @@ -3,6 +3,9 @@ import PropTypes from 'prop-types' import { Switch, Route, Redirect, routerRedux } from 'dva/router' import dynamic from 'dva/dynamic' import App from 'routes/app' +import {LocaleProvider} from 'antd'; +import zh_CN from 'antd/lib/locale-provider/zh_CN'; +import 'moment/locale/zh-cn'; const { ConnectedRouter } = routerRedux @@ -67,6 +70,7 @@ const Routers = function ({ history, app }) { return ( + ()} /> @@ -85,6 +89,7 @@ const Routers = function ({ history, app }) { + ) }