diff --git a/mock/notices.js b/mock/notices.js index 681b10a1cb3b1f1d06a8d26661b6f34714104202..76ab162e249eecd4c2dc6a371d89ab6aa7e8adf3 100644 --- a/mock/notices.js +++ b/mock/notices.js @@ -5,14 +5,14 @@ const getNotices = (req, res) => avatar: 'https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png', title: '你收到了 14 份新周报', datetime: '2017-08-09', - type: '通知', + type: 'notification', }, { id: '000000002', avatar: 'https://gw.alipayobjects.com/zos/rmsportal/OKJXDXrmkNshAMvwtvhu.png', title: '你推荐的 曲妮妮 已通过第三轮面试', datetime: '2017-08-08', - type: '通知', + type: 'notification', }, { id: '000000003', @@ -20,21 +20,21 @@ const getNotices = (req, res) => title: '这种模板可以区分多种通知类型', datetime: '2017-08-07', read: true, - type: '通知', + type: 'notification', }, { id: '000000004', avatar: 'https://gw.alipayobjects.com/zos/rmsportal/GvqBnKhFgObvnSGkDsje.png', title: '左侧图标用于区分不同的类型', datetime: '2017-08-07', - type: '通知', + type: 'notification', }, { id: '000000005', avatar: 'https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png', title: '内容不要超过两行字,超出时自动截断', datetime: '2017-08-07', - type: '通知', + type: 'notification', }, { id: '000000006', @@ -42,7 +42,7 @@ const getNotices = (req, res) => title: '曲丽丽 评论了你', description: '描述信息描述信息描述信息', datetime: '2017-08-07', - type: '消息', + type: 'message', }, { id: '000000007', @@ -50,7 +50,7 @@ const getNotices = (req, res) => title: '朱偏右 回复了你', description: '这种模板用于提醒谁与你发生了互动,左侧放『谁』的头像', datetime: '2017-08-07', - type: '消息', + type: 'message', }, { id: '000000008', @@ -58,7 +58,7 @@ const getNotices = (req, res) => title: '标题', description: '这种模板用于提醒谁与你发生了互动,左侧放『谁』的头像', datetime: '2017-08-07', - type: '消息', + type: 'message', }, { id: '000000009', @@ -66,7 +66,7 @@ const getNotices = (req, res) => description: '任务需要在 2017-01-12 20:00 前启动', extra: '未开始', status: 'todo', - type: '待办', + type: 'event', }, { id: '000000010', @@ -74,7 +74,7 @@ const getNotices = (req, res) => description: '冠霖提交于 2017-01-06,需在 2017-01-07 前完成代码变更任务', extra: '马上到期', status: 'urgent', - type: '待办', + type: 'event', }, { id: '000000011', @@ -82,7 +82,7 @@ const getNotices = (req, res) => description: '指派竹尔于 2017-01-09 前完成更新并发布', extra: '已耗时 8 天', status: 'doing', - type: '待办', + type: 'event', }, { id: '000000012', @@ -90,7 +90,7 @@ const getNotices = (req, res) => description: '冠霖提交于 2017-01-06,需在 2017-01-07 前完成代码变更任务', extra: '进行中', status: 'processing', - type: '待办', + type: 'event', }, ]); diff --git a/src/components/GlobalHeader/RightContent.js b/src/components/GlobalHeader/RightContent.js index 5272a986f9107c3187084b0e2881de662c06b102..a77190fa0334df92a13781493bb540b7951b6e32 100644 --- a/src/components/GlobalHeader/RightContent.js +++ b/src/components/GlobalHeader/RightContent.js @@ -88,7 +88,11 @@ export default class GlobalHeaderRight extends PureComponent { { console.log('input', value); // eslint-disable-line }} @@ -119,19 +123,19 @@ export default class GlobalHeaderRight extends PureComponent { popupAlign={{ offset: [20, -16] }} >