diff --git a/src/forge/Head/NoticeContent.jsx b/src/forge/Head/NoticeContent.jsx
index 0ff7f785f..63bc6cb6b 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 5c332b43a..9aa425702 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 69a154165..986ea16cc 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) {
)
} 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 42d77d3ab..888270c64 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{