From 4bb1b8d5384f7969dd9f3657a12bd3ff6eec466b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Wed, 15 Sep 2021 16:52:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/SecuritySetting/notice/myNotice/Index.jsx  | 12 ++++++++----
 src/forge/SecuritySetting/notice/myNotice/Index.scss |  7 ++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/forge/SecuritySetting/notice/myNotice/Index.jsx b/src/forge/SecuritySetting/notice/myNotice/Index.jsx
index 92960dffd..4a7a3094a 100644
--- a/src/forge/SecuritySetting/notice/myNotice/Index.jsx
+++ b/src/forge/SecuritySetting/notice/myNotice/Index.jsx
@@ -142,6 +142,10 @@ function MyNotice(props) {
     setBatchDeleteCheckAll(false);
   }
 
+  function turnToPersonalCenter(){
+    window.open(`/${current_user  && current_user.login}`);
+  }
+
   return (
     <div className="notice01">
       <div className="sshHead">
@@ -183,7 +187,7 @@ function MyNotice(props) {
               <div className="mynotice-cont stretch-style">
                 {item.status === 1 ? <Badge color="#FA2020" /> : <span className="system-notice-blank"></span>}
                 <i className={"iconfont "+noticeSourceType[item.source]}></i>
-                <span className={item.notification_url?"sysNotice-length highlightSpan":"sysNotice-length"} onClick={() => {item.notification_url && window.open("https://"+`${item.notification_url}`)}} dangerouslySetInnerHTML={{__html: item.content}}></span>
+                <span className={item.notification_url?"sysNotice-length highlightSpan":"sysNotice-length"} onClick={() => {item.notification_url && window.open("https://"+`${item.notification_url}`);readNotice([item.id])}} dangerouslySetInnerHTML={{__html: item.content}}></span>
               </div>
               <div className="mynotice-cont vertical-center-style float-left-little">
                 <span className={item.status === 1?"timeSpan":""}>{item.time_ago}</span>
@@ -199,11 +203,11 @@ function MyNotice(props) {
               <div className="mynotice-cont vertical-center-style">
                 {/* <input type="checkbox" className={isBatchDelete ? 'atme-checkbox' : 'invisible'} onChange={onChange} /> */}
                 <Checkbox value={item.id} className={isBatchDelete ? 'visible-checkbox' : 'invisible-checkbox'} onChange={onChange} checked={item.checkedBatch}></Checkbox>
-                {item.sender && <img src={`https://testforgeplus.trustie.net//${item.sender.image_url}`} className="currentImg" />}
+                {item.sender && <img src={`https://testforgeplus.trustie.net//${item.sender.image_url}`} className="currentImg" onClick={turnToPersonalCenter}/>}
                 <div className="atme-notice-text">
                   <div className="at-badge">{item.status === 1 ? <Badge color="#FA2020" /> : <span className="system-notice-blank"></span>}</div>
-                  {item.sender && <div className="atme-sender-name boldSpan">{item.sender.name}</div>}
-                  <div className={item.notification_url?"highlightSpan atme-cont":"atme-cont"} onClick={() => {item.notification_url && window.open("https://"+`${item.notification_url}`)}} dangerouslySetInnerHTML={{__html: item.content+"  中@我"}}></div>
+                  {/* {item.sender && <div className="atme-sender-name boldSpan">{item.sender.name}</div>} */}
+                  {item.sender && <div className={item.notification_url?"highlightSpan atme-cont":"atme-cont"} onClick={() => {item.notification_url && window.open("https://"+`${item.notification_url}`);readNotice([item.id])}} dangerouslySetInnerHTML={{__html: "<b onClick = {turnToPersonalCenter}>" + item.sender.name +"</b>&nbsp;&nbsp;&nbsp;" + item.content +"  中@我"}}></div>}
                 </div>
               </div>
               <div className="mynotice-cont vertical-center-style">
diff --git a/src/forge/SecuritySetting/notice/myNotice/Index.scss b/src/forge/SecuritySetting/notice/myNotice/Index.scss
index ac0de198a..b10f28a77 100644
--- a/src/forge/SecuritySetting/notice/myNotice/Index.scss
+++ b/src/forge/SecuritySetting/notice/myNotice/Index.scss
@@ -155,12 +155,9 @@ button:active {
         position:absolute;
       }
 
-      & .atme-sender-name{
-        padding: 0 4px;
-      }
-
       & .atme-cont{
-        max-width: 42rem;
+        max-width: 48rem;
+        margin-left: 12px;
       }
     }
   }