diff --git a/src/forge/Head/NoticeContent.jsx b/src/forge/Head/NoticeContent.jsx index 0ff7f785..7092b545 100644 --- a/src/forge/Head/NoticeContent.jsx +++ b/src/forge/Head/NoticeContent.jsx @@ -198,7 +198,7 @@ function NoticeContent({ visible, showNotification, resetUserInfo, current_user:
- + " + item.sender.name +"   " + item.content +" 中@我"}}> {item.time_ago}
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/img/miyao_middle_icon.png b/src/forge/SecuritySetting/img/miyao_middle_icon.png index 03584cfe..f69cba0e 100644 Binary files a/src/forge/SecuritySetting/img/miyao_middle_icon.png and b/src/forge/SecuritySetting/img/miyao_middle_icon.png differ diff --git a/src/forge/SecuritySetting/notice/myNotice/Index.jsx b/src/forge/SecuritySetting/notice/myNotice/Index.jsx index 69a15416..92960dff 100644 --- a/src/forge/SecuritySetting/notice/myNotice/Index.jsx +++ b/src/forge/SecuritySetting/notice/myNotice/Index.jsx @@ -192,6 +192,7 @@ function MyNotice(props) { ) } else if (noticeType === "2") { + console.log(item); //@我 return (
@@ -201,7 +202,8 @@ function MyNotice(props) { {item.sender && }
{item.status === 1 ? : }
-
{item.notification_url && window.open("https://"+`${item.notification_url}`)}} dangerouslySetInnerHTML={{__html: item.content}}>
+ {item.sender &&
{item.sender.name}
} +
{item.notification_url && window.open("https://"+`${item.notification_url}`)}} dangerouslySetInnerHTML={{__html: item.content+" 中@我"}}>
diff --git a/src/forge/SecuritySetting/notice/myNotice/Index.scss b/src/forge/SecuritySetting/notice/myNotice/Index.scss index 42d77d3a..ac0de198 100644 --- a/src/forge/SecuritySetting/notice/myNotice/Index.scss +++ b/src/forge/SecuritySetting/notice/myNotice/Index.scss @@ -131,6 +131,11 @@ button:active { line-height: 18px; padding: 0 0; } + + & .highlightSpan:hover{ + color: #466AFF; + cursor: pointer; + } .mynotice-cont{ padding:0; @@ -142,20 +147,20 @@ 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; } - & .highlightSpan{ - // margin-left: 12px; - &:hover{ - color: #466AFF; - cursor: pointer; - } + & .atme-sender-name{ + padding: 0 4px; + } + + & .atme-cont{ + max-width: 42rem; } } }