From f4f843a7b949d7f1189b240dd96d8830599d1cc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Fri, 17 Sep 2021 10:27:20 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Main/Index.js                   |  6 ++++--
 src/military/notice/noticeList/index.scss | 19 +++++++++++--------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/forge/Main/Index.js b/src/forge/Main/Index.js
index 080907f2..7b4747bb 100644
--- a/src/forge/Main/Index.js
+++ b/src/forge/Main/Index.js
@@ -165,6 +165,8 @@ class Index extends Component {
     });
     this.setCategoryList(list, id)
     const { sort,languageId } = this.state;
+    console.log(languageId);
+    console.log(id);
     this.getListData(1,undefined, sort,id , languageId);
   }
 
@@ -276,13 +278,13 @@ class Index extends Component {
         <div className="ProjectListIndex">
           <div className="list-left">
             <ul className="list-l-Menu">
-              <li className="MenuTitle" onClick={() => {this.getType();this.getListData(1,this.state.search, this.state.sort,this.state.category_id);}}>
+              <li className="MenuTitle" onClick={() => {this.getType();this.changeType(undefined, this.state.typeList);}}>
                 <span><i className="iconfont icon-bianchengyuyan color-grey-9 font-15 mr5"></i>
                 语言</span></li>
               <div className="list-affix">{typeList}</div>
             </ul>
             <ul className="list-l-Menu">
-              <li className="MenuTitle" onClick={() => {this.getCategory();this.getListData(1,this.state.search, this.state.sort,undefined , this.state.languageId)}}>
+              <li className="MenuTitle" onClick={() => {this.getCategory();this.changeCategory(undefined, this.state.categoryList);}}>
               <span><i className="iconfont icon-xiangmuleibie color-grey-9 font-15 mr5"></i>项目类别</span></li>
               <div className="list-affix">{categoryList}</div>
             </ul>
diff --git a/src/military/notice/noticeList/index.scss b/src/military/notice/noticeList/index.scss
index c942d00e..d4b58f5f 100644
--- a/src/military/notice/noticeList/index.scss
+++ b/src/military/notice/noticeList/index.scss
@@ -165,14 +165,17 @@
     background: #fafafa;
   }
 
-  .active::before{
-    position: absolute;
-    left: 0px;
-    top: 15px;
-    width: 6px;
-    content: '';
-    height: 30px;
-    background: #1484EF;
+  .active{
+    background-color: #fafafa;
+    & ::before{
+      position: absolute;
+      left: 0px;
+      top: 15px;
+      width: 6px;
+      content: '';
+      height: 30px;
+      background: #1484EF;
+    }
   }
 
   & i{

From 032127bef6c1843df002bf47272e9811594ebbbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Fri, 17 Sep 2021 13:26:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=AC=E5=91=8A=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Main/Index.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/forge/Main/Index.js b/src/forge/Main/Index.js
index 7b4747bb..25419402 100644
--- a/src/forge/Main/Index.js
+++ b/src/forge/Main/Index.js
@@ -165,8 +165,6 @@ class Index extends Component {
     });
     this.setCategoryList(list, id)
     const { sort,languageId } = this.state;
-    console.log(languageId);
-    console.log(id);
     this.getListData(1,undefined, sort,id , languageId);
   }