From 9c4bd37ea2da0c67e8fb94495e32d25dc815fe09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 10 Jan 2020 17:38:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/tpm/shixuns/ShixunCardList.js | 9 +++++----
 public/react/src/modules/tpm/shixuns/ShixunsIndex.js   | 8 +++++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/public/react/src/modules/tpm/shixuns/ShixunCardList.js b/public/react/src/modules/tpm/shixuns/ShixunCardList.js
index 948bbed48..46abc5bf0 100644
--- a/public/react/src/modules/tpm/shixuns/ShixunCardList.js
+++ b/public/react/src/modules/tpm/shixuns/ShixunCardList.js
@@ -75,17 +75,18 @@ class ShixunCardList extends Component {
 			type="new";
 
 		}
+
 		if(typekeyid===key){
       if(upcircle===true){
         this.setState({
           upcircle:false,
         })
-        this.props.Shixunsupcircles("desc")
+        // this.props.Shixunsupcircles("desc")
       }else if(upcircle===false){
         this.setState({
           upcircle:true,
         })
-        this.props.Shixunsupcircles("asc")
+		  // this.props.Shixunsupcircles("desc")
       }
     }else{
 		  this.setState({
@@ -93,8 +94,8 @@ class ShixunCardList extends Component {
       })
     }
 
-		//allevent
-		this.props.ShixunsState(false,type);
+
+		this.props.ShixunsState(false,type,"desc");
 	}
 
 
diff --git a/public/react/src/modules/tpm/shixuns/ShixunsIndex.js b/public/react/src/modules/tpm/shixuns/ShixunsIndex.js
index f14afb0ac..82fa6a3f9 100644
--- a/public/react/src/modules/tpm/shixuns/ShixunsIndex.js
+++ b/public/react/src/modules/tpm/shixuns/ShixunsIndex.js
@@ -296,21 +296,23 @@ class ShixunsIndex extends Component {
             console.log(error)
         });
     }
-    ShixunsState=(val,type)=>{
+    ShixunsState=(val,type,sorts)=>{
         // sort,
         let {tag_level, tag_id, page, limit, keyword, status, diff,sort} = this.state;
-        let newsort=sort;
+        let newsort=sorts?sorts:sort;
         this.setState({
             order_by:type,
             typepvisible:true,
             pages:1,
-            // sort:sort
+            sort:sorts?sorts:sort
         })
 
         let params
         // let vals=false
           if(newsort===undefined){
               newsort="desc"
+          }else{
+              newsort=sorts?sorts:sort
           }
         params= {
             order_by:type,