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 1/4] =?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 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{ From 49c66c73a7b61d185872e6d07ba3db7592af72c9 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:38 +0800 Subject: [PATCH 2/4] =?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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/forge/SecuritySetting/notice/myNotice/Index.jsx b/src/forge/SecuritySetting/notice/myNotice/Index.jsx index 986ea16cc..92960dffd 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("2");//消息类别tab栏选择 + const [noticeType, setNoticeType] = useState("0");//消息类别tab栏选择 const [selectedNum, setSelectedNum] = useState(0);//@我批量删除选择消息条数 const [isBatchDelete, setIsBatchDelete] = useState(false);//@我是否批量删除 const [batchDeleteCheckedAll, setBatchDeleteCheckAll] = useState(false);//@我批量删除--全选 From ec65ac3cef7b9faed215c046ff62bd59fcc059a6 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:05:24 +0800 Subject: [PATCH 3/4] =?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 --- .../SecuritySetting/img/miyao_middle_icon.png | Bin 900 -> 1028 bytes .../SecuritySetting/notice/myNotice/Index.scss | 13 +++++-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/forge/SecuritySetting/img/miyao_middle_icon.png b/src/forge/SecuritySetting/img/miyao_middle_icon.png index 03584cfe32a2b77b7a91424653e5429133a02c0d..f69cba0e89ba09cb7b5e5183f9e6e5b27145f957 100644 GIT binary patch literal 1028 zcmV+f1pE7mP)Px&zDYzuRA@u(nM-ICK@f(kdJiIq81*EI4-gM3DheVfL=YbcB0@y*fx>oovK|a7 zB8ZQWi-MpYWM^tdvP4llix2Q%@P!^kJm^6Ma}o6*-h!-|De15)o6XMdympPS4a=}h zb=CiMbq_T)2u&DL${j+8v&?*ih+Z`z#9x<~rgJIfQX#|%W_L&O2!_Y02Wd`Jr< zHh>Wh07m@kh+;+nU?7vp+|1|mFC)&KU>+KvySsaV=XsroxEc}H#SmUgtJzY|ecyjn zEEew#4i5f^3N#KNo6U9_2SSJ$0I&c6=9jK3OV_CWquPIA=8uT@2>`~f%>2GsEDje6 zg~`*58z@Bjd|PFjGH zus$L(CHc6al)4N6y>Y~wIjuUxWBRItrSXo@28fdSb_Qy!R(lKmPh03X09=Y9xZ1W! zXJC!%y02^L8rN3QTJL4%Tayg{0Ok@!0L}b1v1dh7j2b5Cg1;w=3TRndJzP~xBBONLOWh14O>B~=PB|*K~ zr&>qDFEqJaZkp$LZ<%>fDxOgxp||bqxS${d059W?A{^b?kM6- zj8Fi^Fq_RT%w#hC%)Bp#xJFa%BI2p2;v)f+6-X&_h}aJRGaIRDbRQ8%nfVM6U1($* zbU$6W==!-2{1<~RM zML`6?k0(K>EH)sblf64@)M5}HL@Wq3Xb^SG{mYH6ByEzNnIu9X=V@Th`JdmOz30w7 zm#AoInqC%$;mZI{7-J4slmV**PESwY69mCC0JiyflJ7)O^iZSGI9*n+6o9oh2JkF^ zi4_w4v7fAYxRGVhz?%h7bmv>vezC81vxbU{bXT>mc|w&-1It$H!0o zHyK%L-vn^`Iz-Ea?lZv(bJM1E-1d1nTCX7h_8 zRVxhO#r(mu*X!NkoO|lbos(qSId{0#YWY?!Y^4B}>>1JU@bGSu`y`ztdB_;^dEu-} a9RCJ2Q;%+sPs+Uj0000 Date: Wed, 15 Sep 2021 16:07:53 +0800 Subject: [PATCH 4/4] =?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 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/forge/Head/NoticeContent.jsx b/src/forge/Head/NoticeContent.jsx index 63bc6cb6b..7092b5458 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.sender.name +"   " + item.content +" 中@我"}}> {item.time_ago}