From 6ca0e486972c73977a4f2b6e30e4d4c672443af6 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 15:36:16 +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/Head/NoticeContent.jsx                     |  2 +-
 src/forge/Head/header.scss                           |  4 ++--
 src/forge/SecuritySetting/notice/myNotice/Index.jsx  |  6 ++++--
 src/forge/SecuritySetting/notice/myNotice/Index.scss | 10 +++++++++-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/forge/Head/NoticeContent.jsx b/src/forge/Head/NoticeContent.jsx
index 0ff7f785..63bc6cb6 100644
--- a/src/forge/Head/NoticeContent.jsx
+++ b/src/forge/Head/NoticeContent.jsx
@@ -198,7 +198,7 @@ function NoticeContent({ visible, showNotification, resetUserInfo, current_user:
                   <Badge color="#FA2020" />
                 </span>
                 <div className="noticeCont-text">
-                  <span className="content-span atme-cont-span" dangerouslySetInnerHTML={{ __html: item.content }}></span>
+                  <span className="content-span atme-cont-span" dangerouslySetInnerHTML={{ __html: "<b>" + item.sender.name +"</b>  " + item.content +"中@我"}}></span>
                   <span className="timeSpan">{item.time_ago}</span>
                 </div>
               </div>
diff --git a/src/forge/Head/header.scss b/src/forge/Head/header.scss
index 5c332b43..9aa42570 100644
--- a/src/forge/Head/header.scss
+++ b/src/forge/Head/header.scss
@@ -232,12 +232,12 @@
       text-overflow: ellipsis;
       display: -webkit-box;
       -webkit-box-orient: vertical;
-      -webkit-line-clamp: 2; /* 这里是超出几行省略 */
+      -webkit-line-clamp: 2;
       overflow: hidden;
     }
 
     & .atme-cont-span{
-      width: 275px;
+      width: 272px;
     }
 
     & .notice-cont-span{
diff --git a/src/forge/SecuritySetting/notice/myNotice/Index.jsx b/src/forge/SecuritySetting/notice/myNotice/Index.jsx
index 69a15416..986ea16c 100644
--- a/src/forge/SecuritySetting/notice/myNotice/Index.jsx
+++ b/src/forge/SecuritySetting/notice/myNotice/Index.jsx
@@ -13,7 +13,7 @@ function MyNotice(props) {
   let resetUserInfo = props.resetUserInfo;
   let pageSize = 15;
 
-  const [noticeType, setNoticeType] = useState("0");//消息类别tab栏选择
+  const [noticeType, setNoticeType] = useState("2");//消息类别tab栏选择
   const [selectedNum, setSelectedNum] = useState(0);//@我批量删除选择消息条数
   const [isBatchDelete, setIsBatchDelete] = useState(false);//@我是否批量删除
   const [batchDeleteCheckedAll, setBatchDeleteCheckAll] = useState(false);//@我批量删除--全选
@@ -192,6 +192,7 @@ function MyNotice(props) {
             </div>
           )
         } else if (noticeType === "2") {
+          console.log(item);
           //@我
           return (
             <div className="mynotice-content vertical-center-style" key={item.id}>
@@ -201,7 +202,8 @@ function MyNotice(props) {
                 {item.sender && <img src={`https://testforgeplus.trustie.net//${item.sender.image_url}`} className="currentImg" />}
                 <div className="atme-notice-text">
                   <div className="at-badge">{item.status === 1 ? <Badge color="#FA2020" /> : <span className="system-notice-blank"></span>}</div>
-                  <div className={item.notification_url?"highlightSpan float-right-little":"float-right-little"} 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>}
+                  <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>
                 </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 42d77d3a..888270c6 100644
--- a/src/forge/SecuritySetting/notice/myNotice/Index.scss
+++ b/src/forge/SecuritySetting/notice/myNotice/Index.scss
@@ -142,14 +142,22 @@ button:active {
       display: none;
     }
     .atme-notice-text{
+      display: flex;
       position: relative;
       margin-left: 12px;
-      max-width: 48rem;
       word-break: break-all;
       & .at-badge{
         position:absolute;
       }
 
+      & .atme-sender-name{
+        padding: 0 4px;
+      }
+
+      & .atme-cont{
+        max-width: 42rem;
+      }
+
       & .highlightSpan{
         // margin-left: 12px;
         &:hover{