diff --git a/src/routes/List/CardList.js b/src/routes/List/CardList.js
index 36c15e7b2152a4ee919e57ad16acfe721e42f5a7..97c6f98c1f3af70f5bfad3b2e3b89112747e5e2a 100644
--- a/src/routes/List/CardList.js
+++ b/src/routes/List/CardList.js
@@ -1,5 +1,6 @@
import React, { PureComponent } from 'react';
import { connect } from 'dva';
+import { Link } from 'dva/router';
import { Card, Avatar, Button, Icon, List } from 'antd';
import PageHeaderLayout from '../../layouts/PageHeaderLayout';
@@ -65,19 +66,22 @@ export default class CardList extends PureComponent {
{
list && list.map(item => (
- 操作一, 操作二]}
- >
- }
- title={item.title}
- description={(
-
- {item.description}
-
- )}
- />
-
+
+ 操作一, 操作二]}
+ >
+ }
+ title={item.title}
+ description={(
+
+ {item.description}
+
+ )}
+ />
+
+
))
}
diff --git a/src/routes/List/CardList.less b/src/routes/List/CardList.less
index e8b4c44ab34d9c9f5a36ec1be95d7cc2861ea6f2..b67801360642e4ef86393b8d85054ba5ccf5c783 100644
--- a/src/routes/List/CardList.less
+++ b/src/routes/List/CardList.less
@@ -31,6 +31,7 @@
.cardDescription {
.textOverflowMulti();
+ color: @text-color;
}
.pageHeaderContent {
diff --git a/src/routes/List/CoverCardList.js b/src/routes/List/CoverCardList.js
index e0869866ef60bc335957ff4792381cf4516c0b20..1f2aaff21872d2e8d4f21c12d2b1628932ba95a6 100644
--- a/src/routes/List/CoverCardList.js
+++ b/src/routes/List/CoverCardList.js
@@ -161,9 +161,15 @@ export default class CoverCardList extends PureComponent {
类目二
类目三
类目四
+ 类目五
+ 类目六
+ 类目七
+ 类目八
+ 类目九
+ 类目十
- 类目五
- 类目六
+ 类目十一
+ 类目十二
)}
diff --git a/src/routes/List/FilterCardList.js b/src/routes/List/FilterCardList.js
index 81710b9925f9eb2a1d6ad12c2cef022bb3578bbe..9b1ee007015310264fa096c6c0b621a8ee6b6ac5 100644
--- a/src/routes/List/FilterCardList.js
+++ b/src/routes/List/FilterCardList.js
@@ -2,7 +2,7 @@ import React, { PureComponent } from 'react';
import numeral from 'numeral';
import { connect } from 'dva';
import { routerRedux } from 'dva/router';
-import { Row, Col, Form, Card, Select, Spin, Icon, Avatar } from 'antd';
+import { Row, Col, Form, Card, Select, Icon, Avatar, List, Tooltip } from 'antd';
import PageHeaderLayout from '../../layouts/PageHeaderLayout';
import StandardFormRow from '../../components/StandardFormRow';
@@ -199,15 +199,21 @@ export default class FilterCardList extends PureComponent {
-
- {
- loading &&
- }
+
{
- !loading && list && list.map(item => (
-
+ list && list.map(item => (
+
, , , ]}
+ actions={[
+ ,
+ ,
+ ,
+ ,
+ ]}
>
}
@@ -220,10 +226,10 @@ export default class FilterCardList extends PureComponent {
/>
-
+
))
}
-
+
);