diff --git a/src/pages/home/branch/setting/user.js b/src/pages/home/branch/setting/user.js
index f079bc8..5c282cf 100644
--- a/src/pages/home/branch/setting/user.js
+++ b/src/pages/home/branch/setting/user.js
@@ -52,25 +52,26 @@ class UserSet extends Component {
         api.post("/admin/user/list_user", obj)
             .then(res => {
                 if (res.result.records.length !== 0) {
+                    res.result.records.forEach(item => {
+                        item['操作'] = item['状态'] === '正常' ? true : false
+                    })
                     const col = Object.keys(res.result.records[0]).map((item, key) => {
-                        return {
+                        return item !== '操作' ? {
                             title: item,
                             dataIndex: item,
                             key,
                             align: 'center',
                             sorter: item !== 'uid' ? (a, b, c) => { this.sort(c, item, search) } : null,
                             defaultSortOrder: 'descend',
+                        } : {
+                            title: "操作",
+                            dataIndex: "操作",
+                            key: key,
+                            align: 'center',
+                            render: (record) => { return <Space>{record ? <Button type="info" danger>停 用</Button> : <Button type="info">激 活</Button>}<Button type="primary" danger>删 除</Button></Space> },
                         }
                     })
-                    col.push(
-                        {
-                            title: "operation",
-                            dataIndex: "operation",
-                            key: res.result.records[0].length - 1,
-                            align: 'center',
-                            render: (record) => <Space><Button type="info" danger>停 用</Button><Button type="primary" danger>删 除</Button></Space>,
-                        }
-                    )
+
                     this.setState({
                         data: res.result.records,
                         total: res.result.total,
@@ -105,15 +106,21 @@ class UserSet extends Component {
     }
 
     callback = (e, value) => {
+        console.log(value)
         if (e === "停 用") {
-            api.get("/admin/user/disable_user", { UID: value.UID }).then(res => {
+            api.get(`/admin/user/disable_user?UID=${value.uid}`).then(res => {
                 message.success(res.info)
-                this.onSearch()
+                this.submit("")
             })
         } else if (e === "删 除") {
-            api.get("/admin/user/delete_user", { UID: value.UID }).then(res => {
+            api.get(`/admin/user/delete_user?UID=${value.uid}`).then(res => {
                 message.success(res.info)
-                this.onSearch()
+                this.submit("")
+            })
+        } else if (e === "激 活") {
+            api.get(`/admin/user/active_user?UID=${value.uid}`).then(res => {
+                message.success(res.info)
+                this.submit("")
             })
         } else {
             return false