From 26de781181aee47331affe21964542d425fd5e15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Mon, 27 Sep 2021 11:32:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=80=9A=E7=9F=A5tab?=
 =?UTF-8?q?=E6=A0=8F=E8=B7=B3=E8=BD=AC=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Head/Header.js                            | 2 +-
 src/forge/SecuritySetting/Index.jsx                 | 2 +-
 src/forge/SecuritySetting/notice/myNotice/Index.jsx | 8 ++------
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js
index f22e3754d..41d7fcfd3 100644
--- a/src/forge/Head/Header.js
+++ b/src/forge/Head/Header.js
@@ -448,7 +448,7 @@ class NewHeader extends Component {
                 onVisibleChange={this.handleVisibleChange}
                 destroyTooltipOnHide
               >
-                <Link to={{pathname:"/settings/notice",state:{noticeType:"notification"}}} className="message-icon">
+                <Link to={"/settings/notice"} className="message-icon">
                   <Badge count={current_user.message_unread_total}>
                     <i className="iconfont icon-xiaoxilingdang color-grey-6 ml15 mr15"></i>
                   </Badge>
diff --git a/src/forge/SecuritySetting/Index.jsx b/src/forge/SecuritySetting/Index.jsx
index ad0996f7b..8419fd31c 100644
--- a/src/forge/SecuritySetting/Index.jsx
+++ b/src/forge/SecuritySetting/Index.jsx
@@ -61,7 +61,7 @@ function Index(props){
             </ul>
             <ul className="securityUl ul-border-buttom">
               <li>消息通知</li>
-              <li className={(pathname.indexOf("/settings/notice")>-1 && pathname.indexOf("/settings/notice/config") == -1) || pathname.indexOf("/settings/notice/privateLetter")>-1 ?"active":""}><Link to={{pathname:"/settings/notice",state:{noticeType:"notification"}}}><i className="iconfont icon-wodetongzhi"></i><span className="text-shodow-bold">我的通知</span></Link></li>
+              <li className={(pathname.indexOf("/settings/notice")>-1 && pathname.indexOf("/settings/notice/config") == -1) || pathname.indexOf("/settings/notice/privateLetter")>-1 ?"active":""}><Link to={"/settings/notice"}><i className="iconfont icon-wodetongzhi"></i><span className="text-shodow-bold">我的通知</span></Link></li>
               {/* <li className={pathname.indexOf("/settings/notice/config")>-1 ?"active":""}><Link to={'/settings/notice/config'}><i className="iconfont icon-tongzhiguanli"></i><span className="text-shodow-bold">通知管理</span></Link></li> */}
             </ul>
             <ul className="securityUl">
diff --git a/src/forge/SecuritySetting/notice/myNotice/Index.jsx b/src/forge/SecuritySetting/notice/myNotice/Index.jsx
index 3324baaa0..6977d94a2 100644
--- a/src/forge/SecuritySetting/notice/myNotice/Index.jsx
+++ b/src/forge/SecuritySetting/notice/myNotice/Index.jsx
@@ -9,14 +9,12 @@ import './Index.scss';
 import '../manager/Index.scss'
 
 function MyNotice(props) {
-  // console.log(props.location.state);
   let current_user = props.current_user;
   let resetUserInfo = props.resetUserInfo;
   //消息悬停框选择tab
   let popover = props.location.state && props.location.state.noticeType;
-  
   let pageSize = 15;
-  const [noticeType, setNoticeType] = useState(popover==="atme"?"2":"0");//消息类别tab栏选择
+  const [noticeType, setNoticeType] = useState(popover?popover==="atme"?"2":"0":"0");//消息类别tab栏选择
   const [selectedNum, setSelectedNum] = useState(0);//@我批量删除选择消息条数
   const [isBatchDelete, setIsBatchDelete] = useState(false);//@我是否批量删除
   const [batchDeleteCheckedAll, setBatchDeleteCheckAll] = useState(false);//@我批量删除--全选
@@ -30,7 +28,7 @@ function MyNotice(props) {
   const [onlyUnread, setOnlyUnread] = useState();
 
   useEffect(()=>{
-    popover==="notification" ? setNoticeType("0"):setNoticeType("2");
+    popover?popover==="notification" ? setNoticeType("0"):setNoticeType("2"):"0";
   },[popover])
 
   useEffect(()=>{
@@ -136,8 +134,6 @@ function MyNotice(props) {
             //删除当前页码最后一条数据时跳转到前一页
             let totlaPage = Math.ceil((messTotalCount-1)/pageSize);
             setCurrentPage(currentPage>=totlaPage? totlaPage : currentPage);
-            console.log(totlaPage);
-            console.log(currentPage);
             setSelectedNum(0);
             setBatchDeleteCheckAll(false);
           }