diff --git a/config/config.js b/config/config.js index 294f39cdd8bdb8701cbfce81b7504c91171b3944..b5e9a89d068b5d51b43a3ac1598b8d69f2ae6768 100644 --- a/config/config.js +++ b/config/config.js @@ -24,6 +24,19 @@ export default { // 路由配置 routes: [ + // user + { + path: '/user', + component: './layouts/UserLayout', + routes: [ + { path: '/user', redirect: '/user/login' }, + { path: '/user/login', component: '/User/Login' }, + { path: '/user/register', component: './User/Register' }, + { path: '/user/register-result', component: './User/RegisterResult' }, + ], + }, + + // app { path: '/', component: './layouts/LoadingPage', @@ -102,8 +115,6 @@ export default { }, ], }, - - // user ], }, ], diff --git a/src/pages/User/Register.js b/src/pages/User/Register.js index 10273314c435757a26d7cea64ab4976197bb3ac5..50ab5bf05f89409014a5897f0170d20cc4150b54 100644 --- a/src/pages/User/Register.js +++ b/src/pages/User/Register.js @@ -40,7 +40,7 @@ export default class Register extends Component { if (register.status === 'ok') { dispatch( routerRedux.push({ - pathname: '/User/RegisterResult', + pathname: '/user/register-result', state: { account, }, diff --git a/src/pages/User/_layout.js b/src/pages/User/_layout.js deleted file mode 100644 index 978c8a11cfb150d34c3e116de2f99cd09d27cdcf..0000000000000000000000000000000000000000 --- a/src/pages/User/_layout.js +++ /dev/null @@ -1,15 +0,0 @@ -import React from 'react'; -import { getRouterData } from 'common/router'; -import { getMenuData } from 'common/menu'; -import UserLayout from '../layouts/UserLayout'; - -export default props => { - const { children, location } = props; - const routerData = getRouterData({}); - const menuData = getMenuData({}); - return ( - - {children} - - ); -}; diff --git a/src/pages/layouts/UserLayout.js b/src/pages/layouts/UserLayout.js index 7fff90e27673120e79e92bc6216db87267a39bdd..034cbf84f2260aba1672139f213550664abde94e 100644 --- a/src/pages/layouts/UserLayout.js +++ b/src/pages/layouts/UserLayout.js @@ -1,10 +1,10 @@ import React, { Fragment } from 'react'; import { Link } from 'dva/router'; -import DocumentTitle from 'react-document-title'; +// import DocumentTitle from 'react-document-title'; import { Icon } from 'antd'; -import GlobalFooter from '../components/GlobalFooter'; +import GlobalFooter from '../../components/GlobalFooter'; import styles from './UserLayout.less'; -import logo from '../assets/logo.svg'; +import logo from '../../assets/logo.svg'; // TODO:remove // import { getRoutes, getPageQuery, getQueryPath } from '../utils/utils'; @@ -42,33 +42,34 @@ const copyright = ( // } class UserLayout extends React.PureComponent { - getPageTitle() { - const { routerData, location } = this.props; - const { pathname } = location; - let title = 'Ant Design Pro'; - if (routerData[pathname] && routerData[pathname].name) { - title = `${routerData[pathname].name} - Ant Design Pro`; - } - return title; - } + // TODO title + // getPageTitle() { + // const { routerData, location } = this.props; + // const { pathname } = location; + // let title = 'Ant Design Pro'; + // if (routerData[pathname] && routerData[pathname].name) { + // title = `${routerData[pathname].name} - Ant Design Pro`; + // } + // return title; + // } render() { const { children } = this.props; return ( - -
-
-
-
- - logo - Ant Design - -
-
Ant Design 是西湖区最具影响力的 Web 设计规范
+ // TODO +
+
+
+
+ + logo + Ant Design +
- {children} - {/* +
Ant Design 是西湖区最具影响力的 Web 设计规范
+
+ {children} + {/* {getRoutes(match.path, routerData).map(item => ( */} -
-
-
+ +
+ // ); } }