From 19f66b0bcc3ddb93067cb8a407c70708cff6e622 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Thu, 25 Feb 2021 14:08:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E6=B3=A8=E5=92=8C=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E5=85=B3=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Team/Group/Setting/GroupMemberSetting.jsx | 8 ++++----
 src/forge/UsersList/common_users.js                 | 2 +-
 src/forge/UsersList/user_list.js                    | 8 ++++----
 src/forge/users/common_lists.js                     | 4 ++--
 src/forge/users/watch_users.js                      | 4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/forge/Team/Group/Setting/GroupMemberSetting.jsx b/src/forge/Team/Group/Setting/GroupMemberSetting.jsx
index cfa2c5e8..c23ca14e 100644
--- a/src/forge/Team/Group/Setting/GroupMemberSetting.jsx
+++ b/src/forge/Team/Group/Setting/GroupMemberSetting.jsx
@@ -16,7 +16,7 @@ const Img = styled.img`{
   height:30px;
   border-radius:50%;
 }`
-const limit = 15
+const limit = 15;
 export default ((props) => {
   const [page, setPage] = useState(1);
   const [total, setTotal] = useState(0);
@@ -58,9 +58,9 @@ export default ((props) => {
       axios.delete(url)
         .then((result) => {
           if (result && result.data) {
-            setPage(1)
-            setQuery(undefined)
-            setIdentify(undefined)
+            setPage(1);
+            setQuery(undefined);
+            setIdentify(undefined);
             getMember();
           }
         })
diff --git a/src/forge/UsersList/common_users.js b/src/forge/UsersList/common_users.js
index 407411b7..78655108 100644
--- a/src/forge/UsersList/common_users.js
+++ b/src/forge/UsersList/common_users.js
@@ -93,7 +93,7 @@ class CommonUsers extends Component {
                 {count === 0 ? (
                   <NoneData _html="暂时还没有相关数据!" />
                 ) : (
-                  <UserList users={users} userClass={'w-25'} {...this.props}></UserList>
+                  <UserList users={users} userClass={'w-25'} successFunc={this.getUsersList} {...this.props}></UserList>
                 )}
               </div>
             </Spin>
diff --git a/src/forge/UsersList/user_list.js b/src/forge/UsersList/user_list.js
index c6a67313..4c1aeda5 100644
--- a/src/forge/UsersList/user_list.js
+++ b/src/forge/UsersList/user_list.js
@@ -5,7 +5,7 @@ import { Button } from "antd";
 import "./list.css";
 class UserList extends Component {
 
-  renderList = (users, userClass, current_user, type_title) => {
+  renderList = (users, userClass, current_user, type_title , successFunc) => {
     if (users && users.length > 0) {
       return users.map((item, key) => {
         return (
@@ -40,7 +40,7 @@ class UserList extends Component {
                   current_user && current_user.login === item.login ?
                   <Button type="default">当前用户</Button>
                   :
-                  <FocusButton is_watch={item.is_watch} id={item.login} />
+                  <FocusButton is_watch={item.is_watch} id={item.login} successFunc={successFunc}/>
                 }
               </div>
             </div>
@@ -50,9 +50,9 @@ class UserList extends Component {
     }
   }
   render() {
-    const { users, userClass, current_user , type_title } = this.props;
+    const { users, userClass, current_user , type_title , successFunc } = this.props;
     return (
-      this.renderList(users, userClass, current_user, type_title)
+      this.renderList(users, userClass, current_user, type_title , successFunc)
     );
   }
 }
diff --git a/src/forge/users/common_lists.js b/src/forge/users/common_lists.js
index 39e0b00d..5e238333 100644
--- a/src/forge/users/common_lists.js
+++ b/src/forge/users/common_lists.js
@@ -87,7 +87,7 @@ class CommonList extends Component {
       <Spin spinning={isSpin}>
         <div className="pd20 minH-670">
           <div className="grid-item pb20 bbt">
-            <h3>{userType === "watchers" ? `${title_type}关注的` : `关注${title_type}的`}</h3>
+            <h3 style={{marginBottom:"0px"}}>{userType === "watchers" ? `${title_type}关注的` : `关注${title_type}的`}</h3>
             <div className="text-right">
               <Search
                 placeholder="输入名称进行搜索"
@@ -103,7 +103,7 @@ class CommonList extends Component {
 
           {users && users.length > 0 ? (
             <div className="w-100 inline-block">
-              <UserList users={users} userClass={"w-33"} current_user={current_user}></UserList>
+              <UserList users={users} userClass={"w-33"} current_user={current_user} successFunc={this.get_watchers}></UserList>
             </div>
           ) : (
             <Nodata _html={`暂时没有数据～`} />
diff --git a/src/forge/users/watch_users.js b/src/forge/users/watch_users.js
index 02c38058..965cec6d 100644
--- a/src/forge/users/watch_users.js
+++ b/src/forge/users/watch_users.js
@@ -5,8 +5,8 @@ class WatcherUsers extends Component {
     const {user, current_user} = this.props
     return (
       <div className="minH-650">
-      {user && user.login &&  <CommonLists userType="watchers" login={user.login} current_user={current_user} />}
-    </div>
+        {user && user.login &&  <CommonLists userType="watchers" login={user.login} current_user={current_user} />}
+      </div>
     );
   }
 }