From 7fb7dbe6876fff422903b4f3600d352ae91af17d Mon Sep 17 00:00:00 2001
From: caishi <c_15243705227@sina.com>
Date: Fri, 3 Sep 2021 14:46:06 +0800
Subject: [PATCH] issue

---
 src/forge/UsersList/focus_button.js | 1 -
 src/forge/UsersList/user_list.js    | 5 ++---
 src/forge/users/Infos.js            | 1 +
 src/forge/users/Team.jsx            | 4 ++--
 src/forge/users/common_lists.js     | 3 ++-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/forge/UsersList/focus_button.js b/src/forge/UsersList/focus_button.js
index 4fb62cba3..a2e93bdec 100644
--- a/src/forge/UsersList/focus_button.js
+++ b/src/forge/UsersList/focus_button.js
@@ -19,7 +19,6 @@ function FocusButton({is_watch , fontClass, starText, is_block , id , successFun
     }).then((result) => {
       if (result && result.data.status === 0) {
         successFunc && successFunc();
-        console.log(notReset);
         if(notReset){
           setWatchFlag(!watchFlag);
         }
diff --git a/src/forge/UsersList/user_list.js b/src/forge/UsersList/user_list.js
index a0d25d6b9..64cc948dd 100644
--- a/src/forge/UsersList/user_list.js
+++ b/src/forge/UsersList/user_list.js
@@ -7,7 +7,6 @@ import "./list.css";
 class UserList extends Component {
 
   renderList = (users, userClass, current_user, type_title , successFunc , notReset) => {
-    console.log("user:",notReset)
     if (users && users.length > 0) {
       return users.map((item, key) => {
         return (
@@ -54,9 +53,9 @@ class UserList extends Component {
     }
   }
   render() {
-    const { users, userClass, current_user , type_title , successFunc , notReset } = this.props;
+    const { users, userClass, current_user , type_title , successFunc , notReset , title_type } = this.props;
     return (
-      this.renderList(users, userClass, current_user, type_title , successFunc , notReset)
+      this.renderList(users, userClass, current_user, type_title , successFunc , notReset , title_type)
     );
   }
 }
diff --git a/src/forge/users/Infos.js b/src/forge/users/Infos.js
index 0e56aaef2..11162c4ce 100644
--- a/src/forge/users/Infos.js
+++ b/src/forge/users/Infos.js
@@ -243,6 +243,7 @@ class Infos extends Component {
                           id={user.login}
                           fontClass={"font-14 ml5"}
                           starText={"关注TA"}
+                          notReset={true}
                         />
                       </div>
                     )}
diff --git a/src/forge/users/Team.jsx b/src/forge/users/Team.jsx
index 4cebde63f..2252d3efd 100644
--- a/src/forge/users/Team.jsx
+++ b/src/forge/users/Team.jsx
@@ -15,7 +15,7 @@ function Team(props){
   const [ sort_direction , setSort_direction ] = useState("asc");
   const [ sort_by ,setSort_by ] = useState("created_at");
   const [ search ,setSearch ] = useState(undefined);
-  const { checkIfLogin , showLoginDialog } = props;
+  const { checkIfLogin , showLoginDialog , current_user } = props;
   const { username } = props.match.params;
   useEffect(()=>{
     if(username){
@@ -57,7 +57,7 @@ function Team(props){
         </div>
         <p>
           {
-            checkIfLogin() &&
+            current_user && current_user.login === username &&
             <CheckProfile {...props} sureFunc={()=>{props.history.push('/organize/new')}}><i className="iconfont icon-xinjian1 mr3 font-14"></i>新建组织</CheckProfile>
           }
           <Dropdown overlay={menu}>
diff --git a/src/forge/users/common_lists.js b/src/forge/users/common_lists.js
index c9d78075c..5e77ddf55 100644
--- a/src/forge/users/common_lists.js
+++ b/src/forge/users/common_lists.js
@@ -116,7 +116,8 @@ class CommonList extends Component {
                 type_title={'关注列表'} 
                 current_user={current_user} 
                 successFunc={this.successFunc} 
-                notReset={userType === "watch_users"?false:true}
+                notReset={(userType === "watch_users" && title_type === "我") ? false : true}
+                title_type={title_type}
               />
             </div>
           ) : (