From 78014b02bf969394f7df48219df9974a46b23174 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Fri, 17 Sep 2021 14:11:31 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Head/NoticeContent.jsx                     | 2 +-
 src/forge/Head/header.scss                           | 9 ++++++---
 src/forge/SecuritySetting/notice/myNotice/Index.scss | 1 -
 src/forge/common/static.js                           | 2 ++
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/forge/Head/NoticeContent.jsx b/src/forge/Head/NoticeContent.jsx
index f5519f41..6b6384ec 100644
--- a/src/forge/Head/NoticeContent.jsx
+++ b/src/forge/Head/NoticeContent.jsx
@@ -186,7 +186,7 @@ function NoticeContent({ visible, showNotification, resetUserInfo, current_user:
           noticeUnreadList.map(item => {
             return (
               <div key={item.id + Math.random()} className="noticeCont-back" onClick={() => { readItem(item) }}>
-                <div className="noticeCont">
+                <div className={`noticeCont ${item.notification_url?'pointer':''}`}>
                   <span style={{ visibility: item.status === 1 ? 'visible' : 'hidden' }}>
                     <Badge color="#FA2020" />
                   </span>
diff --git a/src/forge/Head/header.scss b/src/forge/Head/header.scss
index affb697a..263cd1ee 100644
--- a/src/forge/Head/header.scss
+++ b/src/forge/Head/header.scss
@@ -200,9 +200,11 @@
 }
 
 .noticeCont-back{
+  .pointer{
+    cursor: pointer;
+  }
   &:hover{
     background: #F3F4F6;
-    cursor: pointer;
   }
 }
 
@@ -212,7 +214,7 @@
   padding: 12px 0 10px 0;
   line-height: 24px;
   border-bottom: 1px solid #EEEEEE;
-
+  cursor: default;
   i{
     font-size: 14px !important;
     margin-right: 6px;
@@ -227,6 +229,8 @@
   .noticeCont-text{
     display: flex;
     color:#333333;
+    flex:auto;
+    justify-content: space-between;
 
     & .content-span{
       word-break: break-all;
@@ -248,7 +252,6 @@
     .timeSpan{
       font-size: 12px;
       color: #666666;
-      margin-left: 5px;
     }
 
     .at-name{
diff --git a/src/forge/SecuritySetting/notice/myNotice/Index.scss b/src/forge/SecuritySetting/notice/myNotice/Index.scss
index d0eadee9..8eab84c0 100644
--- a/src/forge/SecuritySetting/notice/myNotice/Index.scss
+++ b/src/forge/SecuritySetting/notice/myNotice/Index.scss
@@ -91,7 +91,6 @@ button:active {
   & b{
     font-weight: 400;
     text-shadow: 0.5px 0 #333;
-    margin: 0 6px;
   }
 
   & .invisable-read{
diff --git a/src/forge/common/static.js b/src/forge/common/static.js
index a3973b38..17e10c4e 100644
--- a/src/forge/common/static.js
+++ b/src/forge/common/static.js
@@ -36,6 +36,8 @@ export const noticeSourceType = {
   PullRequestChanged:"icon-hebingqingqiuicon",  //	我创建或负责的合并请求状态变更
   PullRequestJournal:"icon-hebingqingqiuicon",  //	我创建或负责的合并请求有新的评论
   PullRequestClosed:"icon-hebingqingqiuicon",  //	提交的合并请求被拒绝
+  PullRequestMerged:"icon-hebingqingqiuicon",  //	提交的合并请求被合并
+  PullRequestClosed:"icon-hebingqingqiuicon",  //	提交的合并请求被关闭
   //里程碑
   ProjectMilestone:"icon-lichengbeiicon",  //	我管理的仓库有新的里程碑
 };
\ No newline at end of file