From dbb5efdcd5d711e0613c089706fc794e1d8a47c2 Mon Sep 17 00:00:00 2001
From: caishi <c_15243705227@sina.com>
Date: Thu, 2 Sep 2021 15:04:26 +0800
Subject: [PATCH] issue-part 2

---
 src/forge/UsersList/focus_button.js |  4 +++-
 src/forge/users/InfosUser.js        |  3 ++-
 src/forge/users/watch_users.js      | 10 +++++++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/forge/UsersList/focus_button.js b/src/forge/UsersList/focus_button.js
index 0d099fd6..3a04207a 100644
--- a/src/forge/UsersList/focus_button.js
+++ b/src/forge/UsersList/focus_button.js
@@ -19,7 +19,9 @@ function FocusButton({is_watch , fontClass, starText, is_block , id , successFun
     }).then((result) => {
       if (result && result.data.status === 0) {
         successFunc && successFunc();
-        setWatchFlag(!watchFlag);
+        if(!flag){
+          setWatchFlag(!watchFlag);
+        }
       }
       setIsSpin(false);
     })
diff --git a/src/forge/users/InfosUser.js b/src/forge/users/InfosUser.js
index dbe42e81..276a0b1f 100644
--- a/src/forge/users/InfosUser.js
+++ b/src/forge/users/InfosUser.js
@@ -74,6 +74,7 @@ class InfosUser extends Component {
 
   //切换种类
   changeCategory = (cate) => {
+    this.state.page = 1;
     this.state.category = cate.target.value;
     this.get_projects();
   };
@@ -236,7 +237,7 @@ class InfosUser extends Component {
           <div className="edu-txt-center pt30 mb30 border-top-grey">
             <Pagination
               simple
-              defaultCurrent={page}
+              current={page}
               total={total}
               pageSize={limit}
               onChange={this.changePage}
diff --git a/src/forge/users/watch_users.js b/src/forge/users/watch_users.js
index fe8a7926..76a6e8e6 100644
--- a/src/forge/users/watch_users.js
+++ b/src/forge/users/watch_users.js
@@ -4,9 +4,13 @@ class WatcherUsers extends Component {
   render() {
     const {user, current_user , fetchUser } = this.props;
     return (
-      <div className="minH-650">
-        {user && user.login &&  <CommonLists userType="watch_users" login={user.login} current_user={current_user} fetchUser={fetchUser}/>}
-      </div>
+      user && user.login &&  
+      <CommonLists 
+        userType="watch_users" 
+        login={user.login} 
+        current_user={current_user} 
+        fetchUser={fetchUser}
+      />
     );
   }
 }