diff --git a/src/components/NoticeIcon/NoticeList.js b/src/components/NoticeIcon/NoticeList.js
index a6a56354a6b109d493d2e8127a53c585082bb997..ed6fa79d9423ea31c21ead8b5a7f29e31088d97e 100644
--- a/src/components/NoticeIcon/NoticeList.js
+++ b/src/components/NoticeIcon/NoticeList.js
@@ -1,14 +1,18 @@
import React from 'react';
-import { Avatar, Icon, List } from 'antd';
+import { Avatar, List } from 'antd';
import classNames from 'classnames';
import styles from './NoticeList.less';
-export default function NoticeList({ data = [], onClick, onClear, title, locale }) {
+export default function NoticeList({
+ data = [], onClick, onClear, title, locale, emptyText, emptyImage,
+}) {
if (data.length === 0) {
return (
-
- {locale.emptyText}
+ {emptyImage ? (
+
+ ) : null}
+
{emptyText || locale.emptyText}
);
}
diff --git a/src/components/NoticeIcon/NoticeList.less b/src/components/NoticeIcon/NoticeList.less
index a6be1d67cb595904529a18a9d53cfc59cc60762b..1dcfad44ffba3dafe7e7ad10a5486b5c92d91c62 100644
--- a/src/components/NoticeIcon/NoticeList.less
+++ b/src/components/NoticeIcon/NoticeList.less
@@ -54,15 +54,12 @@
.notFound {
text-align: center;
- height: 120px;
- line-height: 120px;
- font-size: 14px;
+ padding: 73px 0 88px 0;
color: @text-color-secondary;
- > i {
- font-size: 16px;
- margin-right: 8px;
- vertical-align: middle;
- margin-top: -1px;
+ img {
+ display: inline-block;
+ margin-bottom: 16px;
+ height: 76px;
}
}
diff --git a/src/components/NoticeIcon/demo/popover.md b/src/components/NoticeIcon/demo/popover.md
index 379e59c7d790c1e229fba7744455710ff8bc07d8..eff2edbf9bc9b8e0541511f11c844ee25207c472 100644
--- a/src/components/NoticeIcon/demo/popover.md
+++ b/src/components/NoticeIcon/demo/popover.md
@@ -51,9 +51,24 @@ ReactDOM.render(
}}
>
-
-
-
+
+
+
, mountNode);
diff --git a/src/components/NoticeIcon/index.js b/src/components/NoticeIcon/index.js
index ac7a51bd0faa9ac49b9f1b87ceb0794fec38d355..80ac2c16d873a34052e3bc2a45c94930d2e054f9 100644
--- a/src/components/NoticeIcon/index.js
+++ b/src/components/NoticeIcon/index.js
@@ -17,6 +17,7 @@ export default class NoticeIcon extends PureComponent {
emptyText: '暂无数据',
clear: '清空',
},
+ emptyImage: 'https://gw.alipayobjects.com/zos/rmsportal/wAhyIChODzsoKIOBHcBk.svg',
};
static Tab = TabPane;
constructor(props) {
@@ -45,6 +46,7 @@ export default class NoticeIcon extends PureComponent {
return (
this.onItemClick(item, child.props)}
onClear={() => this.props.onClear(child.props.title)}
diff --git a/src/layouts/BasicLayout.js b/src/layouts/BasicLayout.js
index f560947f5afb60b7f8bdda41866f0f6154bc75dc..c8d9e79a2db73c50a1b06a747d38ad5710fd418d 100644
--- a/src/layouts/BasicLayout.js
+++ b/src/layouts/BasicLayout.js
@@ -239,9 +239,24 @@ class BasicLayout extends React.PureComponent {
loading={fetchingNotices}
popupAlign={{ offset: [20, -16] }}
>
-
-
-
+
+
+
{currentUser.name ? (
diff --git a/src/layouts/BasicLayout.less b/src/layouts/BasicLayout.less
index 6c19f16cf04bb4e850801cc16fc795279c60a0a3..1921e73b179752b1a120e3cd8bc7c297732d1386 100644
--- a/src/layouts/BasicLayout.less
+++ b/src/layouts/BasicLayout.less
@@ -45,7 +45,7 @@
transition: all .3s;
padding: 0 24px;
&:hover {
- background: rgba(0, 0, 0, .04);
+ background: @primary-1;
}
}