diff --git a/mock/notices.js b/mock/notices.js
index 782fac4fd2313603e7c7013bc1ba5ed90c20f352..3788ae5344e178f5b11d36f1bd809e8aaa7ebf72 100644
--- a/mock/notices.js
+++ b/mock/notices.js
@@ -56,8 +56,8 @@ export default {
id: '000000009',
title: '任务名称',
description: '任务需要在 2017-01-12 20:00 前启动',
- extra: '马上到期',
- status: 'urgent',
+ extra: '未开始',
+ status: 'todo',
type: '待办',
}, {
id: '000000010',
diff --git a/src/components/NoticeIcon/NoticeList.js b/src/components/NoticeIcon/NoticeList.js
index ed6fa79d9423ea31c21ead8b5a7f29e31088d97e..2ffe72ad29a00b753c06e03f00b7700ff8d374b1 100644
--- a/src/components/NoticeIcon/NoticeList.js
+++ b/src/components/NoticeIcon/NoticeList.js
@@ -29,7 +29,7 @@ export default function NoticeList({
className={styles.meta}
avatar={item.avatar ? : null}
title={
-
+
{item.title}
{item.extra}
diff --git a/src/components/NoticeIcon/NoticeList.less b/src/components/NoticeIcon/NoticeList.less
index 1dcfad44ffba3dafe7e7ad10a5486b5c92d91c62..db2bc6d10e90bb5753a5c3163b2f0fae4e4b8082 100644
--- a/src/components/NoticeIcon/NoticeList.less
+++ b/src/components/NoticeIcon/NoticeList.less
@@ -16,6 +16,7 @@
.avatar {
background: #fff;
+ margin-top: 4px;
}
&.read {
@@ -29,10 +30,7 @@
}
.title {
font-weight: normal;
- color: @text-color;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
+ margin-bottom: 8px;
}
.description {
font-size: 12px;
@@ -48,6 +46,7 @@
color: @text-color-secondary;
font-weight: normal;
margin-right: 0;
+ margin-top: -1.5px;
}
}
}
diff --git a/src/components/NoticeIcon/demo/popover.md b/src/components/NoticeIcon/demo/popover.md
index eff2edbf9bc9b8e0541511f11c844ee25207c472..1e1443a498a9e69de278ce636af883d0971019d2 100644
--- a/src/components/NoticeIcon/demo/popover.md
+++ b/src/components/NoticeIcon/demo/popover.md
@@ -55,13 +55,13 @@ ReactDOM.render(
list={noticeData['通知']}
title="通知"
emptyText="你已查看所有通知"
- emptyImage="https://gw.alipayobjects.com/zos/rmsportal/sAuJeJzSKbUmHfBQRzmZ.svg"
+ emptyImage="https://gw.alipayobjects.com/zos/rmsportal/wAhyIChODzsoKIOBHcBk.svg"
/>
{newNotice.extra};
}
@@ -243,13 +244,13 @@ class BasicLayout extends React.PureComponent {
list={noticeData['通知']}
title="通知"
emptyText="你已查看所有通知"
- emptyImage="https://gw.alipayobjects.com/zos/rmsportal/sAuJeJzSKbUmHfBQRzmZ.svg"
+ emptyImage="https://gw.alipayobjects.com/zos/rmsportal/wAhyIChODzsoKIOBHcBk.svg"
/>