issue-part 2

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);
     })

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}

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 &&  
-        {user && user.login &&  <CommonLists userType="watch_users" login={user.login} current_user={current_user} fetchUser={fetchUser}/>}
+      <CommonLists 
-      </div>
+        userType="watch_users" 
+        login={user.login} 
+        current_user={current_user} 
+        fetchUser={fetchUser}
+      />
     );
   }
 }