diff --git a/bs-ui/src/views/broker/broker/components/BrokerUser.vue b/bs-ui/src/views/broker/broker/components/BrokerUser.vue
index 8f1ade4..ceac208 100644
--- a/bs-ui/src/views/broker/broker/components/BrokerUser.vue
+++ b/bs-ui/src/views/broker/broker/components/BrokerUser.vue
@@ -1,10 +1,10 @@
 <template>
   <div ref="list">
     <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="登陆账号" prop="userName">
+      <el-form-item label="登录账号" prop="userName">
         <el-input
             v-model="queryParams.userName"
-            placeholder="请输入登陆账号"
+            placeholder="请输入登录账号"
             clearable
             @keyup.enter.native="handleQuery"
         />
@@ -90,7 +90,7 @@
             :disabled="multiple"
             @click="handleDelete"
             v-hasPermi="['system:user:remove']"
-        >删除
+        >移出
         </el-button>
       </el-col>
       <!--      <el-col :span="1.5">-->
@@ -119,7 +119,7 @@
     <el-table v-loading="loading" :data="userList" @sort-change="handleSortChange" :height="tableHeight - 150"
               @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="50" align="center"/>
-      <el-table-column label="登陆账号" key="userName" width="100" prop="userName" v-if="columns[1].visible"
+      <el-table-column label="登录账号" key="userName" width="100" prop="userName" v-if="columns[1].visible"
                        :show-overflow-tooltip="true" fixed="left"/>
       <el-table-column label="所属代理商" prop="deptName" :show-overflow-tooltip="true" width="120"/>
 <!--      <el-table-column label="用户编号"  key="userId" prop="userId" v-if="columns[0].visible"/>-->
@@ -185,20 +185,8 @@
               icon="el-icon-delete"
               @click="handleDelete(scope.row)"
               v-hasPermi="['system:user:remove']"
-          >删除
+          >移出
           </el-button>
-          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
-                       v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
-            <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
-                                v-hasPermi="['system:user:resetPwd']">重置密码
-              </el-dropdown-item>
-              <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
-                                v-hasPermi="['system:user:edit']">分配角色
-              </el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
         </template>
       </el-table-column>
     </el-table>
@@ -211,30 +199,31 @@
 
     <!-- 添加或修改代理商经纪对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="70%" append-to-body :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="12">
             <el-form-item label="登录账号" prop="userName">
-              <el-input v-model="form.userName" placeholder="请输入登陆账号" maxlength="20" minlength="2" />
+              <el-input v-model="form.userName" disabled placeholder="请输入登录账号" maxlength="20" minlength="2" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item label="用户昵称" prop="nickName">
-              <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" :disabled="readonly"/>
+              <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" disabled />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="归属部门" prop="deptId">
+          
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="归属代理商" prop="deptId" >
               <treeselect v-model="form.deptId" :options="brokerList" props="lable" :show-count="true"
-                          :disabled="readonly"
-                          :defaultExpandLevel="Infinity"
-                          placeholder="请选择归属部门" :normalizer="tenantIdnormalizer"/>
+                          :defaultExpandLevel="Infinity" :disabled="readonly"
+                          placeholder="请选择归属代理商" :normalizer="tenantIdnormalizer"/>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+        <template v-if="readonly">
+          <el-row>
           <el-col :span="12">
             <el-form-item label="真实姓名" prop="realName">
               <el-input v-model="form.realName" placeholder="请输入真实姓名"  maxlength="30" :disabled="readonly"/>
@@ -253,8 +242,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item v-if="title == '添加用户'" label="登陆账号" prop="userName">
-              <el-input v-model="form.userName" placeholder="请输入登陆账号" maxlength="30" :disabled="readonly"/>
+            <el-form-item v-if="title == '添加用户'" label="登录账号" prop="userName">
+              <el-input v-model="form.userName" placeholder="请输入登录账号" maxlength="30" :disabled="readonly"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -319,41 +308,43 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="地址" prop="address">
-              <el-input v-model="form.address" placeholder="请输入地址" :disabled="readonly"/>
+            <el-form-item label="审核状态">
+              <el-radio-group v-model="form.reviewStatus" :disabled="readonly">
+                <el-radio
+                  v-for="dict in dict.type.review_status"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{ dict.label }}
+                </el-radio>
+              </el-radio-group>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="公司" prop="company">
-              <el-input v-model="form.company" placeholder="请输入公司" :disabled="readonly"/>
+          <el-col :span="24">
+            <el-form-item label="名片标签" prop="label">
+              <el-input v-model="form.label" placeholder="请输入名片标签" :disabled="readonly"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="地址" prop="address">
-              <el-input v-model="form.address" placeholder="请输入地址" :disabled="readonly"/>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="名片简介" prop="userDesc">
+              <el-input v-model="form.userDesc" type="textarea" placeholder="请输入内容" :disabled="readonly"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="审核状态">
-              <el-radio-group v-model="form.reviewStatus" :disabled="readonly">
-                <el-radio
-                  v-for="dict in dict.type.review_status"
-                  :key="dict.value"
-                  :label="dict.value"
-                >{{ dict.label }}
-                </el-radio>
-              </el-radio-group>
+          <el-col :span="24">
+            <el-form-item label="公司" prop="company">
+              <el-input v-model="form.company" placeholder="请输入公司" :disabled="readonly" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item label="简介" prop="userDesc">
-              <editor v-model="form.userDesc" :min-height="192"/>
+            <el-form-item label="地址" prop="address">
+              <el-input v-model="form.address" placeholder="请输入地址" :disabled="readonly"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -364,12 +355,14 @@
             </el-form-item>
           </el-col>
         </el-row>
+        </template>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" v-if="!readonly">确 定</el-button>
+        <el-button type="primary" @click="submitForm" v-if="!readonly" >确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <NoBrokerUser ref="noBrokerUser" @success="handleQuery"></NoBrokerUser>
   </div>
 </template>
 <script>
@@ -391,12 +384,13 @@ import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {getMoment} from "@/api/moment/moment";
+import NoBrokerUser from "./NoBrokerUser.vue";
 
 export default {
   name: "BrokerUser",
   // mixins: [AutoTableHeight],
   dicts: ['sys_normal_disable', 'sys_user_sex', 'review_status'],
-  components: {Treeselect},
+  components: {Treeselect, NoBrokerUser},
   props: {
     rowData: {
       type: Object,
@@ -405,7 +399,7 @@ export default {
   },
   data() {
     return {
-      readonly:false,
+      readonly: true,
       brokerList: [],
       deptId: "",
       rowDataNew: {},
@@ -474,7 +468,7 @@ export default {
       // 列信息
       columns: [
         {key: 0, label: `用户编号`, visible: true},
-        {key: 1, label: `登陆账号`, visible: true},
+        {key: 1, label: `登录账号`, visible: true},
         {key: 2, label: `用户昵称`, visible: true},
         {key: 3, label: `部门`, visible: true},
         {key: 4, label: `手机号码`, visible: true},
@@ -487,8 +481,8 @@ export default {
           {required: true, message: "角色不能为空", trigger: "blur"}
         ],
         userName: [
-          {required: true, message: "登陆账号不能为空", trigger: "blur"},
-          {min: 2, max: 20, message: '登陆账号长度必须介于 2 和 20 之间', trigger: 'blur'}
+          {required: true, message: "登录账号不能为空", trigger: "blur"},
+          {min: 2, max: 20, message: '登录账号长度必须介于 2 和 20 之间', trigger: 'blur'}
         ],
         nickName: [
           {required: true, message: "用户昵称不能为空", trigger: "blur"}
@@ -679,18 +673,18 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.getbrokerList();
-      this.reset();
-      getUser().then(response => {
-        this.postOptions = response.posts;
-        this.roleOptions = response.roles;
-        this.open = true;
-        this.readonly = false;
-        this.title = "添加用户";
-        this.form.deptId = this.deptId;
-        this.form.userType = "jj"
-        this.form.password = this.initPassword;
-      });
+      this.$refs.noBrokerUser.show(this.deptId);
+      // this.getbrokerList();
+      // this.reset();
+      // getUser().then(response => {
+      //   this.postOptions = response.posts;
+      //   this.roleOptions = response.roles;
+      //   this.open = true;
+      //   this.title = "添加用户";
+      //   this.form.deptId = this.deptId;
+      //   this.form.userType = "jj"
+      //   this.form.password = this.initPassword;
+      // });
     },
     handleRead(row) {
       this.getbrokerList();
@@ -719,8 +713,8 @@ export default {
         this.roleOptions = response.roles;
         this.$set(this.form, "postIds", response.postIds);
         this.$set(this.form, "roleIds", response.roleIds);
-        this.open = true;
         this.readonly = false;
+        this.open = true;
         this.title = "修改用户";
         this.form.password = "";
       });
@@ -768,11 +762,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const userIds = row.userId || this.ids;
-      this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function () {
+      this.$modal.confirm('是否确认从代理商移出这些用户？').then(function () {
         return delUser(userIds);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.$modal.msgSuccess("移出成功");
       }).catch(() => {
       });
     },
diff --git a/bs-ui/src/views/broker/broker/components/NoBrokerUser.vue b/bs-ui/src/views/broker/broker/components/NoBrokerUser.vue
new file mode 100644
index 0000000..faa7e99
--- /dev/null
+++ b/bs-ui/src/views/broker/broker/components/NoBrokerUser.vue
@@ -0,0 +1,119 @@
+<template>
+  <el-dialog title="选择用户进行添加" :visible.sync="open" width="70%" append-to-body :close-on-click-modal="false">
+    <div>
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true"  label-width="68px">
+          <el-form-item label="登录账号" prop="userName">
+            <el-input
+              v-model="queryParams.userName"
+              placeholder="请输入登录账号"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="真实姓名" prop="realName">
+            <el-input
+              v-model="queryParams.realName"
+              placeholder="请输入真实姓名"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="手机号码" prop="phonenumber">
+            <el-input
+              v-model="queryParams.phonenumber"
+              placeholder="请输入手机号码"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+      <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="50" align="center" />
+          <!-- <el-table-column type="index" width="50" align="center" :index="customIndex" /> -->
+          <el-table-column label="登录账号" align="center" key="userName" prop="userName" min-width="100" :show-overflow-tooltip="true" />
+          <el-table-column label="真实姓名" align="center" key="realName" prop="realName" min-width="100" :show-overflow-tooltip="true" />
+          <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" min-width="100" :show-overflow-tooltip="true" />
+          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" min-width="120" />
+        </el-table>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+    </div>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="submitForm" >确 定</el-button>
+      <el-button @click="cancel">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { listUser } from "@/api/system/user";
+export default {
+  name: 'NoBrokerUser',
+  data() {
+    return {
+      open: false,
+      loading: false,
+      list: [],
+      total: 0,
+      queryParams: { pageNum: 1, pageSize: 10, hasBroker: '0' },
+      currentBrokerId: null,
+    }
+  },
+  methods: {
+    show(brokerId) {
+      this.currentBrokerId = brokerId;
+      this.list = [];
+      this.open = true;
+      this.resetQuery();
+    },
+    cancel() {
+      this.open = false;
+    },
+    getList() {
+      this.loading = true;
+      listUser(this.queryParams).then(response => {
+        this.userList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      }).catch(e => {
+        this.loading = false;
+      });
+    },
+    handleSelectionChange(val) {
+      this.list = val;
+    },
+     /** 搜索按钮操作 */
+     handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.queryParams = { pageNum: 1, pageSize: 10, hasBroker: '0' };
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    submitForm() {
+      if (!this.brokerId || this.list.length === 0) {
+        return;
+      }
+
+    }
+  }
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/bs-ui/src/views/broker/user/components/BrokerChange.vue b/bs-ui/src/views/broker/user/components/BrokerChange.vue
index c8cae29..442a41d 100644
--- a/bs-ui/src/views/broker/user/components/BrokerChange.vue
+++ b/bs-ui/src/views/broker/user/components/BrokerChange.vue
@@ -7,10 +7,10 @@
     append-to-body
   >
   <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" label-width="100px">
-      <el-form-item label="登陆账号" prop="userName">
+      <el-form-item label="登录账号" prop="userName">
         <el-input
           v-model="queryParams.userName"
-          placeholder="请输入登陆账号"
+          placeholder="请输入登录账号"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -35,7 +35,7 @@
           <i v-if="scope.row.userId === selectionUserId" style="color: #1890ff;" class="el-icon-circle-check"></i>
         </template>
       </el-table-column>
-      <el-table-column label="登陆账号" key="userName" prop="userName"
+      <el-table-column label="登录账号" key="userName" prop="userName"
                        :show-overflow-tooltip="true" />
       <el-table-column label="所属代理商"  prop="deptName" :show-overflow-tooltip="true" width="120"/>
       <el-table-column label="用户昵称"  key="nickName" prop="nickName"
diff --git a/bs-ui/src/views/broker/user/components/BrokerUser.vue b/bs-ui/src/views/broker/user/components/BrokerUser.vue
index 2408636..84e1b58 100644
--- a/bs-ui/src/views/broker/user/components/BrokerUser.vue
+++ b/bs-ui/src/views/broker/user/components/BrokerUser.vue
@@ -1,10 +1,10 @@
 <template>
   <div ref="list">
     <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="登陆账号" prop="userName">
+      <el-form-item label="登录账号" prop="userName">
         <el-input
           v-model="queryParams.userName"
-          placeholder="请输入登陆账号"
+          placeholder="请输入登录账号"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -60,7 +60,7 @@
     <el-table v-loading="loading" :data="userList" @sort-change="handleSortChange" :height="tableHeight - 150"
               @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="50" align="center"/>
-      <el-table-column label="登陆账号" key="userName" prop="userName" v-if="columns[1].visible"
+      <el-table-column label="登录账号" key="userName" prop="userName" v-if="columns[1].visible"
                        :show-overflow-tooltip="true" fixed="left"/>
       <el-table-column label="所属代理商"  prop="deptName" :show-overflow-tooltip="true" width="120"/>
       <el-table-column label="用户编号" key="userId" prop="userId" v-if="columns[0].visible"/>
@@ -147,8 +147,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="登陆账号" prop="userName">
-              <el-input v-model="form.userName" placeholder="请输入登陆账号" maxlength="30" :disabled="readonly"/>
+            <el-form-item v-if="form.userId == undefined" label="登录账号" prop="userName">
+              <el-input v-model="form.userName" placeholder="请输入登录账号" maxlength="30" :disabled="readonly"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -365,7 +365,7 @@ export default {
       // 列信息
       columns: [
         {key: 0, label: `用户编号`, visible: true},
-        {key: 1, label: `登陆账号`, visible: true},
+        {key: 1, label: `登录账号`, visible: true},
         {key: 2, label: `用户昵称`, visible: true},
         {key: 3, label: `部门`, visible: true},
         {key: 4, label: `手机号码`, visible: true},
@@ -375,8 +375,8 @@ export default {
       // 表单校验
       rules: {
         userName: [
-          {required: true, message: "登陆账号不能为空", trigger: "blur"},
-          {min: 2, max: 20, message: '登陆账号长度必须介于 2 和 20 之间', trigger: 'blur'}
+          {required: true, message: "登录账号不能为空", trigger: "blur"},
+          {min: 2, max: 20, message: '登录账号长度必须介于 2 和 20 之间', trigger: 'blur'}
         ],
         nickName: [
           {required: true, message: "用户昵称不能为空", trigger: "blur"}
diff --git a/bs-ui/src/views/monitor/logininfor/index.vue b/bs-ui/src/views/monitor/logininfor/index.vue
index 91930c3..3601bc4 100644
--- a/bs-ui/src/views/monitor/logininfor/index.vue
+++ b/bs-ui/src/views/monitor/logininfor/index.vue
@@ -10,10 +10,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="登陆账号" prop="userName">
+      <el-form-item label="登录账号" prop="userName">
         <el-input
           v-model="queryParams.userName"
-          placeholder="请输入登陆账号"
+          placeholder="请输入登录账号"
           clearable
           style="width: 240px;"
           @keyup.enter.native="handleQuery"
@@ -101,7 +101,7 @@
     <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="访问编号" align="center" prop="infoId" />
-      <el-table-column label="登陆账号" align="center" prop="userName" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />
+      <el-table-column label="登录账号" align="center" prop="userName" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />
       <el-table-column label="登录地址" align="center" prop="ipaddr" width="130" :show-overflow-tooltip="true" />
       <el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
       <el-table-column label="浏览器" align="center" prop="browser" :show-overflow-tooltip="true" />
diff --git a/bs-ui/src/views/monitor/online/index.vue b/bs-ui/src/views/monitor/online/index.vue
index 41bff97..962e4c4 100644
--- a/bs-ui/src/views/monitor/online/index.vue
+++ b/bs-ui/src/views/monitor/online/index.vue
@@ -9,10 +9,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="登陆账号" prop="userName">
+      <el-form-item label="登录账号" prop="userName">
         <el-input
           v-model="queryParams.userName"
-          placeholder="请输入登陆账号"
+          placeholder="请输入登录账号"
           clearable
           @keyup.enter.native="handleQuery"
         />
diff --git a/bs-ui/src/views/order/order/components/OrderUser.vue b/bs-ui/src/views/order/order/components/OrderUser.vue
index e10a1a5..f535ac1 100644
--- a/bs-ui/src/views/order/order/components/OrderUser.vue
+++ b/bs-ui/src/views/order/order/components/OrderUser.vue
@@ -1,10 +1,10 @@
 <template>
   <div ref="list">
     <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="登陆账号" prop="userName">
+      <el-form-item label="登录账号" prop="userName">
         <el-input
           v-model="queryParams.userName"
-          placeholder="请输入登陆账号"
+          placeholder="请输入登录账号"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -112,7 +112,7 @@
               :highlight-current-row="true" @row-click="handleRowClick"
               @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="50" align="center"/>
-      <el-table-column label="登陆账号" align="center" key="userName" prop="userName" v-if="columns[1].visible"
+      <el-table-column label="登录账号" align="center" key="userName" prop="userName" v-if="columns[1].visible"
                        :show-overflow-tooltip="true" fixed="left"/>
       <el-table-column label="所属代理商" align="center"  prop="deptName" :show-overflow-tooltip="true" width="120"/>
       <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible"/>
@@ -212,8 +212,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="登陆账号" prop="userName">
-              <el-input v-model="form.userName" placeholder="请输入登陆账号" maxlength="30"/>
+            <el-form-item v-if="form.userId == undefined" label="登录账号" prop="userName">
+              <el-input v-model="form.userName" placeholder="请输入登录账号" maxlength="30"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -392,7 +392,7 @@ export default {
       // 列信息
       columns: [
         {key: 0, label: `用户编号`, visible: true},
-        {key: 1, label: `登陆账号`, visible: true},
+        {key: 1, label: `登录账号`, visible: true},
         {key: 2, label: `用户昵称`, visible: true},
         {key: 3, label: `部门`, visible: true},
         {key: 4, label: `手机号码`, visible: true},
@@ -405,8 +405,8 @@ export default {
         //   {required: true, message: "角色不能为空", trigger: "blur"}
         // ],
         userName: [
-          {required: true, message: "登陆账号不能为空", trigger: "blur"},
-          {min: 2, max: 20, message: '登陆账号长度必须介于 2 和 20 之间', trigger: 'blur'}
+          {required: true, message: "登录账号不能为空", trigger: "blur"},
+          {min: 2, max: 20, message: '登录账号长度必须介于 2 和 20 之间', trigger: 'blur'}
         ],
         nickName: [
           {required: true, message: "用户昵称不能为空", trigger: "blur"}
diff --git a/bs-ui/src/views/system/role/authUser.vue b/bs-ui/src/views/system/role/authUser.vue
index 07cfa47..5e3467f 100644
--- a/bs-ui/src/views/system/role/authUser.vue
+++ b/bs-ui/src/views/system/role/authUser.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-      <el-form-item label="登陆账号" prop="userName">
+      <el-form-item label="登录账号" prop="userName">
         <el-input
           v-model="queryParams.userName"
-          placeholder="请输入登陆账号"
+          placeholder="请输入登录账号"
           clearable
           style="width: 240px"
           @keyup.enter.native="handleQuery"
@@ -61,7 +61,7 @@
 
     <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="登陆账号" prop="userName" :show-overflow-tooltip="true" />
+      <el-table-column label="登录账号" prop="userName" :show-overflow-tooltip="true" />
       <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
       <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
       <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
diff --git a/bs-ui/src/views/system/role/selectUser.vue b/bs-ui/src/views/system/role/selectUser.vue
index fa013d0..ada3c71 100644
--- a/bs-ui/src/views/system/role/selectUser.vue
+++ b/bs-ui/src/views/system/role/selectUser.vue
@@ -2,10 +2,10 @@
   <!-- 授权用户 -->
   <el-dialog title="选择用户" :visible.sync="visible" width="800px" top="5vh" append-to-body>
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
-      <el-form-item label="登陆账号" prop="userName">
+      <el-form-item label="登录账号" prop="userName">
         <el-input
           v-model="queryParams.userName"
-          placeholder="请输入登陆账号"
+          placeholder="请输入登录账号"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -26,7 +26,7 @@
     <el-row>
       <el-table @row-click="clickRow" ref="table" :data="userList" @selection-change="handleSelectionChange" height="260px">
         <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column label="登陆账号" prop="userName" :show-overflow-tooltip="true" />
+        <el-table-column label="登录账号" prop="userName" :show-overflow-tooltip="true" />
         <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
         <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
         <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
diff --git a/bs-ui/src/views/system/user/index.vue b/bs-ui/src/views/system/user/index.vue
index 1a881e5..d696867 100644
--- a/bs-ui/src/views/system/user/index.vue
+++ b/bs-ui/src/views/system/user/index.vue
@@ -6,7 +6,7 @@
         <div class="head-container">
           <el-input
             v-model="deptName"
-            placeholder="请输入部门名称"
+            placeholder="请输入代理商名称"
             clearable
             size="small"
             prefix-icon="el-icon-search"
@@ -30,10 +30,10 @@
       <!--用户数据-->
       <el-col :span="20" :xs="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-          <el-form-item label="登陆账号" prop="userName">
+          <el-form-item label="登录账号" prop="userName">
             <el-input
               v-model="queryParams.userName"
-              placeholder="请输入登陆账号"
+              placeholder="请输入登录账号"
               clearable
               style="width: 240px"
               @keyup.enter.native="handleQuery"
@@ -149,10 +149,10 @@
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column type="index" width="50" align="center" :index="customIndex" />
           <!-- <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" /> -->
-          <el-table-column label="登陆账号" align="center" key="userName" prop="userName" v-if="columns[0].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="登录账号" align="center" key="userName" prop="userName" v-if="columns[0].visible" :show-overflow-tooltip="true" />
           <el-table-column label="真实姓名" align="center" key="realName" prop="realName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
           <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="代理商" align="center" key="deptName" prop="deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
           <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
           <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
             <template slot-scope="scope">
@@ -215,27 +215,28 @@
 
     <!-- 添加或修改用户配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-row>
+      <el-form ref="form" :model="form" :rules="rules" label-position="top">
+        <el-row :gutter="10">
           <el-col :span="12">
             <el-form-item label="登录账号" prop="userName">
-              <el-input v-model="form.userName" placeholder="请输入登陆账号" maxlength="20" minlength="2" />
+              <el-input v-model="form.userName" placeholder="请输入登录账号" maxlength="20" minlength="2" />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+        <el-row :gutter="10">
           <el-col :span="12">
             <el-form-item label="用户昵称" prop="nickName">
               <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+            <el-form-item label="归属代理商" prop="deptId">
+              <treeselect v-model="form.deptId" :options="deptOptions" props="lable" 
+                :defaultExpandLevel="Infinity" :show-count="true" placeholder="请选择归属代理商" :normalizer="tenantIdnormalizer"/>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+        <el-row :gutter="10">
           <el-col :span="12">
             <el-form-item label="手机号码" prop="phonenumber">
               <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
@@ -247,10 +248,10 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+        <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="登陆账号" prop="userName">
-              <el-input v-model="form.userName" placeholder="请输入登陆账号" maxlength="20" minlength="2" />
+            <el-form-item v-if="form.userId == undefined" label="登录账号" prop="userName">
+              <el-input v-model="form.userName" placeholder="请输入登录账号" maxlength="20" minlength="2" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -259,10 +260,10 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+        <el-row :gutter="10">
           <el-col :span="12">
             <el-form-item label="用户性别">
-              <el-select v-model="form.sex" placeholder="请选择性别">
+              <el-select v-model="form.sex" style="width: 100%;" placeholder="请选择性别">
                 <el-option
                   v-for="dict in dict.type.sys_user_sex"
                   :key="dict.value"
@@ -284,10 +285,10 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+        <el-row :gutter="10">
           <el-col :span="12">
             <el-form-item label="岗位">
-              <el-select v-model="form.postIds" multiple placeholder="请选择岗位">
+              <el-select v-model="form.postIds" style="width: 100%;" multiple placeholder="请选择岗位">
                 <el-option
                   v-for="item in postOptions"
                   :key="item.postId"
@@ -300,7 +301,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="角色" prop="roleIds">
-              <el-select v-model="form.roleIds" multiple placeholder="请选择角色">
+              <el-select v-model="form.roleIds" style="width: 100%;" multiple placeholder="请选择角色">
                 <el-option
                   v-for="item in roleOptions"
                   :key="item.roleId"
@@ -312,7 +313,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+        <el-row :gutter="10">
           <el-col :span="12">
             <el-form-item label="真实姓名" prop="realName">
               <el-input v-model="form.realName" placeholder="请输入真实姓名" maxlength="50" />
@@ -320,7 +321,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="审核状态">
-              <el-radio-group v-model="form.reviewStatus" :disabled="readonly">
+              <el-radio-group v-model="form.reviewStatus" >
                 <el-radio
                   v-for="dict in dict.type.review_status"
                   :key="dict.value"
@@ -331,6 +332,32 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="名片标签(多个用英文逗号隔开)" prop="label">
+              <el-input v-model="form.label" placeholder="请输入名片标签" ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="名片简介" prop="userDesc">
+              <el-input v-model="form.userDesc" type="textarea" placeholder="请输入内容" ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="公司" prop="company">
+              <el-input v-model="form.company" placeholder="请输入公司"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="地址" prop="address">
+              <el-input v-model="form.address" placeholder="请输入地址"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注">
@@ -382,6 +409,7 @@ import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUs
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import {listBrokerByTree} from "@/api/broker/broker";
 
 export default {
   name: "User",
@@ -406,11 +434,11 @@ export default {
       // 弹出层标题
       title: "",
       // 部门树选项
-      deptOptions: undefined,
+      deptOptions: [],
       // 是否显示弹出层
       open: false,
       // 部门名称
-      deptName: undefined,
+      deptName: null,
       // 默认密码
       initPassword: undefined,
       // 日期范围
@@ -423,7 +451,7 @@ export default {
       form: {},
       defaultProps: {
         children: "children",
-        label: "label"
+        label: "brokerName"
       },
       // 用户导入参数
       upload: {
@@ -453,7 +481,7 @@ export default {
       // 列信息
       columns: [
         // { key: 0, label: `用户编号`, visible: true },
-        { key: 0, label: `登陆账号`, visible: true },
+        { key: 0, label: `登录账号`, visible: true },
         { key: 1, label: `真实姓名`, visible: true },
         { key: 2, label: `用户昵称`, visible: true },
         { key: 3, label: `部门`, visible: true },
@@ -464,8 +492,8 @@ export default {
       // 表单校验
       rules: {
         userName: [
-          { required: true, message: "登陆账号不能为空", trigger: "blur" },
-          { min: 2, max: 20, message: '登陆账号长度必须介于 2 和 20 之间', trigger: 'blur' }
+          { required: true, message: "登录账号不能为空", trigger: "blur" },
+          { min: 2, max: 20, message: '登录账号长度必须介于 2 和 20 之间', trigger: 'blur' }
         ],
         nickName: [
           { required: true, message: "用户昵称不能为空", trigger: "blur" }
@@ -502,12 +530,27 @@ export default {
   },
   created() {
     this.getList();
-    this.getDeptTree();
+    this.getbrokerList();
     this.getConfigKey("sys.user.initPassword").then(response => {
       this.initPassword = response.msg;
     });
   },
   methods: {
+    tenantIdnormalizer(node, instanceId) {
+      if (node.children && !node.children.length) {
+        delete node.children
+      }
+      return {
+        id: node.id,
+        label: node.brokerName,
+        children: node.children
+      }
+    },
+    getbrokerList() {
+      listBrokerByTree().then(response => {
+        this.deptOptions = response.data || [];
+      });
+    },
     customIndex(index) {
       return index + 1 + (this.queryParams.pageNum - 1) * this.queryParams.pageSize;
     },
@@ -530,7 +573,7 @@ export default {
     // 筛选节点
     filterNode(value, data) {
       if (!value) return true;
-      return data.label.indexOf(value) !== -1;
+      return data.brokerName?.indexOf(value) !== -1;
     },
     // 节点单击事件
     handleNodeClick(data) {
diff --git a/bs-ui/src/views/system/user/profile/index.vue b/bs-ui/src/views/system/user/profile/index.vue
index 5073817..62517af 100644
--- a/bs-ui/src/views/system/user/profile/index.vue
+++ b/bs-ui/src/views/system/user/profile/index.vue
@@ -12,7 +12,7 @@
             </div>
             <ul class="list-group list-group-striped">
               <li class="list-group-item">
-                <svg-icon icon-class="user" />登陆账号
+                <svg-icon icon-class="user" />登录账号
                 <div class="pull-right">{{ user.userName }}</div>
               </li>
               <li class="list-group-item">