Browse Source

better url #1072

pull/1149/head
ddcat1115 9 years ago
committed by jim
parent
commit
f87d7371bb
  1. 6
      src/common/menu.js
  2. 24
      src/common/router.js
  3. 4
      src/routes/Account/Center.js
  4. 0
      src/routes/Account/Center.less
  5. 0
      src/routes/Account/Settings/BaseView.js
  6. 0
      src/routes/Account/Settings/BaseView.less
  7. 2
      src/routes/Account/Settings/BindingView.js
  8. 0
      src/routes/Account/Settings/GeographicView.js
  9. 0
      src/routes/Account/Settings/GeographicView.less
  10. 14
      src/routes/Account/Settings/Info.js
  11. 0
      src/routes/Account/Settings/Info.less
  12. 2
      src/routes/Account/Settings/NotificationView.js
  13. 0
      src/routes/Account/Settings/PhoneView.js
  14. 0
      src/routes/Account/Settings/PhoneView.less
  15. 2
      src/routes/Account/Settings/SecurityView.js

6
src/common/menu.js

@ -116,13 +116,13 @@ const menuData = [{
}, { }, {
name: '个人页', name: '个人页',
icon: 'user', icon: 'user',
path: 'user-profile', path: 'account',
children: [{ children: [{
name: '个人中心', name: '个人中心',
path: 'user-center', path: 'center',
}, { }, {
name: '个人设置', name: '个人设置',
path: 'userinfo/base', path: 'settings',
}], }],
}]; }];

24
src/common/router.js

@ -163,23 +163,23 @@ export const getRouterData = (app) => {
'/user/register-result': { '/user/register-result': {
component: dynamicWrapper(app, [], () => import('../routes/User/RegisterResult')), component: dynamicWrapper(app, [], () => import('../routes/User/RegisterResult')),
}, },
'/user-profile/user-center': { '/account/center': {
component: dynamicWrapper(app, ['list', 'user', 'project'], () => import('../routes/UserProfile/UserCenter')), component: dynamicWrapper(app, ['list', 'user', 'project'], () => import('../routes/Account/Center')),
}, },
'/user-profile/userinfo': { '/account/settings': {
component: dynamicWrapper(app, ['geographic'], () => import('../routes/UserProfile/Userinfo/Info')), component: dynamicWrapper(app, ['geographic'], () => import('../routes/Account/Settings/Info')),
}, },
'/user-profile/userinfo/base': { '/account/settings/base': {
component: dynamicWrapper(app, ['geographic'], () => import('../routes/UserProfile/Userinfo/BaseView')), component: dynamicWrapper(app, ['geographic'], () => import('../routes/Account/Settings/BaseView')),
}, },
'/user-profile/userinfo/safe': { '/account/settings/security': {
component: dynamicWrapper(app, ['geographic'], () => import('../routes/UserProfile/Userinfo/SafeView')), component: dynamicWrapper(app, ['geographic'], () => import('../routes/Account/Settings/SecurityView')),
}, },
'/user-profile/userinfo/account': { '/account/settings/binding': {
component: dynamicWrapper(app, ['geographic'], () => import('../routes/UserProfile/Userinfo/AccountView')), component: dynamicWrapper(app, ['geographic'], () => import('../routes/Account/Settings/BindingView')),
}, },
'/user-profile/userinfo/message': { '/account/settings/notification': {
component: dynamicWrapper(app, ['geographic'], () => import('../routes/UserProfile/Userinfo/MessageView')), component: dynamicWrapper(app, ['geographic'], () => import('../routes/Account/Settings/NotificationView')),
}, },
// '/user/:id': { // '/user/:id': {
// component: dynamicWrapper(app, [], () => import('../routes/User/SomeComponent')), // component: dynamicWrapper(app, [], () => import('../routes/User/SomeComponent')),

4
src/routes/UserProfile/UserCenter.js → src/routes/Account/Center.js

@ -20,8 +20,8 @@ import {
} from 'antd'; } from 'antd';
import AvatarList from '../../components/AvatarList'; import AvatarList from '../../components/AvatarList';
import { formatWan } from '../../utils/utils'; import { formatWan } from '../../utils/utils';
import styles from './UserCenter.less';
import stylesProjects from '../List/Projects.less'; import stylesProjects from '../List/Projects.less';
import styles from './Center.less';
import stylesArticles from '../List/Articles.less'; import stylesArticles from '../List/Articles.less';
import stylesApplications from '../List/Applications.less'; import stylesApplications from '../List/Applications.less';
import GridContent from '../../layouts/GridContent'; import GridContent from '../../layouts/GridContent';
@ -34,7 +34,7 @@ import GridContent from '../../layouts/GridContent';
project, project,
projectLoading: loading.effects['project/fetchNotice'], projectLoading: loading.effects['project/fetchNotice'],
})) }))
export default class UserCenter extends PureComponent { export default class Center extends PureComponent {
state = { state = {
key: 'article', key: 'article',
newTags: [], newTags: [],

0
src/routes/UserProfile/UserCenter.less → src/routes/Account/Center.less

0
src/routes/UserProfile/Userinfo/BaseView.js → src/routes/Account/Settings/BaseView.js

0
src/routes/UserProfile/Userinfo/BaseView.less → src/routes/Account/Settings/BaseView.less

2
src/routes/UserProfile/Userinfo/AccountView.js → src/routes/Account/Settings/BindingView.js

@ -1,7 +1,7 @@
import React, { Component, Fragment } from 'react'; import React, { Component, Fragment } from 'react';
import { Icon, List } from 'antd'; import { Icon, List } from 'antd';
export default class AccountView extends Component { export default class BindingView extends Component {
getData = () => { getData = () => {
return [ return [
{ {

0
src/routes/UserProfile/Userinfo/GeographicView.js → src/routes/Account/Settings/GeographicView.js

0
src/routes/UserProfile/Userinfo/GeographicView.less → src/routes/Account/Settings/GeographicView.less

14
src/routes/UserProfile/Userinfo/Info.js → src/routes/Account/Settings/Info.js

@ -10,9 +10,9 @@ const { Item } = Menu;
const menuMap = { const menuMap = {
base: '基本设置', base: '基本设置',
safe: '安全设置', security: '安全设置',
account: '账号绑定', binding: '账号绑定',
message: '新消息通知', notification: '新消息通知',
}; };
@connect(({ user }) => ({ @connect(({ user }) => ({
@ -45,7 +45,7 @@ export default class Info extends Component {
return menuMap[this.state.selectKey]; return menuMap[this.state.selectKey];
}; };
selectKey = ({ key }) => { selectKey = ({ key }) => {
this.props.dispatch(routerRedux.push(`/user-profile/userinfo/${key}`)); this.props.dispatch(routerRedux.push(`/account/settings/${key}`));
this.setState({ this.setState({
selectKey: key, selectKey: key,
}); });
@ -101,7 +101,11 @@ export default class Info extends Component {
exact={item.exact} exact={item.exact}
/> />
))} ))}
<Redirect exact from="/userinfo" to="/userinfo/base" /> <Redirect
exact
from="/account/settings"
to="/account/settings/base"
/>
<Redirect to="/exception/404" /> <Redirect to="/exception/404" />
</Switch> </Switch>
</div> </div>

0
src/routes/UserProfile/Userinfo/Info.less → src/routes/Account/Settings/Info.less

2
src/routes/UserProfile/Userinfo/MessageView.js → src/routes/Account/Settings/NotificationView.js

@ -3,7 +3,7 @@ import { Switch, List } from 'antd';
const Action = <Switch checkedChildren="开" unCheckedChildren="关" defaultChecked />; const Action = <Switch checkedChildren="开" unCheckedChildren="关" defaultChecked />;
export default class MessageView extends Component { export default class NotificationView extends Component {
getData = () => { getData = () => {
return [ return [
{ {

0
src/routes/UserProfile/Userinfo/PhoneView.js → src/routes/Account/Settings/PhoneView.js

0
src/routes/UserProfile/Userinfo/PhoneView.less → src/routes/Account/Settings/PhoneView.less

2
src/routes/UserProfile/Userinfo/SafeView.js → src/routes/Account/Settings/SecurityView.js

@ -7,7 +7,7 @@ const passwordStrength = {
weak: <font className="weak">弱</font>, weak: <font className="weak">弱</font>,
}; };
export default class SafeView extends Component { export default class SecurityView extends Component {
getData = () => { getData = () => {
return [ return [
{ {
Loading…
Cancel
Save