xiaohu 7 лет назад
Родитель
Сommit
20c01e08b2

+ 1 - 1
src/pages/Account/Center/Applications.js

@@ -2,7 +2,7 @@ import React from 'react';
 import { List, Card, Icon, Dropdown, Menu, Avatar, Tooltip } from 'antd';
 import numeral from 'numeral';
 import { formatWan } from '../../../utils/utils';
-import stylesApplications from '../../List/Applications.less';
+import stylesApplications from '../../List/Search/Applications.less';
 
 export default props => {
   const { list } = props;

+ 1 - 1
src/pages/Account/Center/Articles.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { List, Icon, Avatar, Tag } from 'antd';
 import moment from 'moment';
-import stylesArticles from '../../List/Articles.less';
+import stylesArticles from '../../List/Search/Articles.less';
 import styles from './Articles.less';
 
 export default props => {

+ 1 - 1
src/pages/Account/Center/Projects.js

@@ -2,7 +2,7 @@ import React from 'react';
 import { List, Card } from 'antd';
 import moment from 'moment';
 import AvatarList from '../../../components/AvatarList';
-import stylesProjects from '../../List/Projects.less';
+import stylesProjects from '../../List/Search/Projects.less';
 
 export default props => {
   const { list } = props;

+ 1 - 1
src/pages/List/Applications.js

@@ -5,7 +5,7 @@ import { Row, Col, Form, Card, Select, Icon, Avatar, List, Tooltip, Dropdown, Me
 import TagSelect from 'components/TagSelect';
 import StandardFormRow from 'components/StandardFormRow';
 
-import { formatWan } from '../../utils/utils';
+import { formatWan } from '../../../utils/utils';
 
 import styles from './Applications.less';
 

+ 1 - 1
src/pages/List/Applications.less

@@ -1,5 +1,5 @@
 @import '~antd/lib/style/themes/default.less';
-@import '../../utils/utils.less';
+@import '../../../utils/utils.less';
 
 .filterCardList {
   margin-bottom: -24px;

src/pages/List/Articles.js → src/pages/List/Search/Articles.js


+ 1 - 1
src/pages/List/Articles.less

@@ -1,5 +1,5 @@
 @import '~antd/lib/style/themes/default.less';
-@import '../../utils/utils.less';
+@import '../../../utils/utils.less';
 
 .listContent {
   .description {

src/pages/List/Projects.js → src/pages/List/Search/Projects.js


+ 1 - 1
src/pages/List/Projects.less

@@ -1,5 +1,5 @@
 @import '~antd/lib/style/themes/default.less';
-@import '../../utils/utils.less';
+@import '../../../utils/utils.less';
 
 .coverCardList {
   margin-bottom: -24px;

+ 15 - 16
src/pages/List/List.js

@@ -1,23 +1,22 @@
 import React, { Component } from 'react';
-import { routerRedux, Route, Switch } from 'dva/router';
+import { routerRedux } from 'dva/router';
 import { connect } from 'dva';
 import { Input } from 'antd';
-import PageHeaderLayout from '../../layouts/PageHeaderLayout';
-import { getRoutes } from '../../utils/utils';
+import PageHeaderLayout from '../../../layouts/PageHeaderLayout';
 
 @connect()
 export default class SearchList extends Component {
   handleTabChange = key => {
     const { dispatch, match } = this.props;
     switch (key) {
-      case 'articles':
-        dispatch(routerRedux.push(`${match.url}/articles`));
+      case 'Articles':
+        dispatch(routerRedux.push(`${match.url}/Articles`));
         break;
-      case 'applications':
-        dispatch(routerRedux.push(`${match.url}/applications`));
+      case 'Applications':
+        dispatch(routerRedux.push(`${match.url}/Applications`));
         break;
-      case 'projects':
-        dispatch(routerRedux.push(`${match.url}/projects`));
+      case 'Projects':
+        dispatch(routerRedux.push(`${match.url}/Projects`));
         break;
       default:
         break;
@@ -27,15 +26,15 @@ export default class SearchList extends Component {
   render() {
     const tabList = [
       {
-        key: 'articles',
+        key: 'Articles',
         tab: '文章',
       },
       {
-        key: 'applications',
+        key: 'Applications',
         tab: '应用',
       },
       {
-        key: 'projects',
+        key: 'Projects',
         tab: '项目',
       },
     ];
@@ -52,8 +51,7 @@ export default class SearchList extends Component {
       </div>
     );
 
-    const { match, routerData, location } = this.props;
-    const routes = getRoutes(match.path, routerData);
+    const { match, children, location } = this.props;
 
     return (
       <PageHeaderLayout
@@ -63,11 +61,12 @@ export default class SearchList extends Component {
         tabActiveKey={location.pathname.replace(`${match.path}/`, '')}
         onTabChange={this.handleTabChange}
       >
-        <Switch>
+        {children}
+        {/* <Switch>
           {routes.map(item => (
             <Route key={item.key} path={item.path} component={item.component} exact={item.exact} />
           ))}
-        </Switch>
+        </Switch> */}
       </PageHeaderLayout>
     );
   }