diff --git a/src/views/cai/user/index.vue b/src/views/cai/user/index.vue
index cf62fdf..646fb93 100644
--- a/src/views/cai/user/index.vue
+++ b/src/views/cai/user/index.vue
@@ -125,7 +125,6 @@
             <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item command="handleDelete" icon="el-icon-info">完整信息</el-dropdown-item>
-              <el-dropdown-item command="handleDelete" icon="el-icon-edit">修改好友提成</el-dropdown-item>
               <el-dropdown-item command="handleResetPwd" icon="el-icon-key">重置密码</el-dropdown-item>
               <el-dropdown-item command="handleDelete" icon="el-icon-delete" v-hasPermi="['cai:user:remove']">删除</el-dropdown-item>
             </el-dropdown-menu>
diff --git a/src/views/cai/userInfo/index.vue b/src/views/cai/userInfo/index.vue
index 77b9281..9a5a8ce 100644
--- a/src/views/cai/userInfo/index.vue
+++ b/src/views/cai/userInfo/index.vue
@@ -1,101 +1,38 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="奖励好友收入视频提成比率" prop="videoIncomeRate">
+      <el-form-item label="蜜瓜号" prop="usercode">
         <el-input
-          v-model="queryParams.videoIncomeRate"
-          placeholder="请输入奖励好友收入视频提成比率"
-          clearable
-          @keyup.enter.native="handleQuery"
+            v-model="queryParams.usercode"
+            placeholder="请输入蜜瓜号"
+            clearable
+            @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="奖励好友守护的比例" prop="guardIncomeRate">
+      <el-form-item label="手机号" prop="mobile">
         <el-input
-          v-model="queryParams.guardIncomeRate"
-          placeholder="请输入奖励好友守护的比例"
-          clearable
-          @keyup.enter.native="handleQuery"
+            v-model="queryParams.mobile"
+            placeholder="请输入手机号"
+            clearable
+            @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="奖励好友礼物的比例" prop="giftIncomeRate">
-        <el-input
-          v-model="queryParams.giftIncomeRate"
-          placeholder="请输入奖励好友礼物的比例"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="性别" prop="gender">
+        <el-select v-model="queryParams.gender" placeholder="性别" clearable size="small">
+          <el-option
+              v-for="dict in genderList"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+              @keyup.enter.native="handleQuery"
+          />
+        </el-select>
       </el-form-item>
-      <el-form-item label="奖励好友充值的比率" prop="payIncomeRate">
-        <el-input
-          v-model="queryParams.payIncomeRate"
-          placeholder="请输入奖励好友充值的比率"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="登录次数 " prop="loginCount">
-        <el-input
-          v-model="queryParams.loginCount"
-          placeholder="请输入登录次数 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="连续登录天数" prop="continueLoginCount">
-        <el-input
-          v-model="queryParams.continueLoginCount"
-          placeholder="请输入连续登录天数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="最大连续登录天数" prop="maxLoginCount">
-        <el-input
-          v-model="queryParams.maxLoginCount"
-          placeholder="请输入最大连续登录天数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="最后登录IP" prop="lastLoginIp">
-        <el-input
-          v-model="queryParams.lastLoginIp"
-          placeholder="请输入最后登录IP"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="最后登陆时间" prop="lastLoginTime">
-        <el-input
-          v-model="queryParams.lastLoginTime"
-          placeholder="请输入最后登陆时间"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="最后登录位置" prop="lastLocation">
-        <el-input
-          v-model="queryParams.lastLocation"
-          placeholder="请输入最后登录位置"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="注册IP" prop="regIp">
-        <el-input
-          v-model="queryParams.regIp"
-          placeholder="请输入注册IP"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="注册时间" prop="regTime">
-        <el-input
-          v-model="queryParams.regTime"
-          placeholder="请输入注册时间"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="主播" prop="isAnchor">
+        <el-select v-model="queryParams.isAnchor" placeholder="是否为主播" clearable size="small">
+          <el-option label="是" :value="1" />
+          <el-option label="否" :value="0" />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -104,82 +41,48 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['cai:userInfo:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['cai:userInfo:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['cai:userInfo:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['cai:userInfo:export']"
-        >导出</el-button>
-      </el-col>
+      <span style="color: red">提示：好友守护、礼物、视频分成，只有主播好友才有，非主播设置无效！！ 会长好友提成默认多一些</span>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="userInfoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="" align="center" prop="userId" v-if="true"/>
-      <el-table-column label="奖励好友收入视频提成比率" align="center" prop="videoIncomeRate" />
-      <el-table-column label="奖励好友守护的比例" align="center" prop="guardIncomeRate" />
-      <el-table-column label="奖励好友礼物的比例" align="center" prop="giftIncomeRate" />
-      <el-table-column label="奖励好友充值的比率" align="center" prop="payIncomeRate" />
-      <el-table-column label="登录次数 " align="center" prop="loginCount" />
-      <el-table-column label="连续登录天数" align="center" prop="continueLoginCount" />
-      <el-table-column label="最大连续登录天数" align="center" prop="maxLoginCount" />
-      <el-table-column label="最后登录IP" align="center" prop="lastLoginIp" />
-      <el-table-column label="最后登陆时间" align="center" prop="lastLoginTime" />
-      <el-table-column label="最后登录位置" align="center" prop="lastLocation" />
-      <el-table-column label="注册IP" align="center" prop="regIp" />
-      <el-table-column label="注册时间" align="center" prop="regTime" />
+      <el-table-column label="甜瓜号" align="center" prop="usercode" />
+      <el-table-column label="昵称" align="center" prop="nickname" />
+      <el-table-column label="手机号" align="center" prop="mobile" width="120"/>
+      <el-table-column label="头像" align="center" prop="avatar" >
+        <template v-slot="scope">
+          <image-avatar :src="scope.row.avatar"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="性别" align="center" prop="gender">
+        <template v-slot="scope">
+          <cai-dict-tag :options="genderList" :value="scope.row.gender" />
+        </template>
+      </el-table-column>
+      <el-table-column label="主播" align="center" prop="isAnchor">
+        <template v-slot="scope">
+          <cai-dict-tag :options="isAnchorList" :value="scope.row.isAnchor"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="会长" align="center" prop="isUnion">
+        <template v-slot="scope">
+          <cai-dict-tag :options="isAnchorList" :value="scope.row.isAnchor"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="好友守护分成" align="center" prop="guardIncomeRate" />
+      <el-table-column label="好友礼物分成" align="center" prop="giftIncomeRate" />
+      <el-table-column label="好友视频分成" align="center" prop="videoIncomeRate" />
+      <el-table-column label="好友充值分成" align="center" prop="payIncomeRate" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['cai:userInfo:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['cai:userInfo:remove']"
-          >删除</el-button>
+          >修改提成</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -191,64 +94,22 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
-    <!-- 添加或修改用户好友提成对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="奖励好友收入视频提成比率" prop="videoIncomeRate">
-          <el-input v-model="form.videoIncomeRate" placeholder="请输入奖励好友收入视频提成比率" />
-        </el-form-item>
-        <el-form-item label="奖励好友守护的比例" prop="guardIncomeRate">
-          <el-input v-model="form.guardIncomeRate" placeholder="请输入奖励好友守护的比例" />
-        </el-form-item>
-        <el-form-item label="奖励好友礼物的比例" prop="giftIncomeRate">
-          <el-input v-model="form.giftIncomeRate" placeholder="请输入奖励好友礼物的比例" />
-        </el-form-item>
-        <el-form-item label="奖励好友充值的比率" prop="payIncomeRate">
-          <el-input v-model="form.payIncomeRate" placeholder="请输入奖励好友充值的比率" />
-        </el-form-item>
-        <el-form-item label="登录次数 " prop="loginCount">
-          <el-input v-model="form.loginCount" placeholder="请输入登录次数 " />
-        </el-form-item>
-        <el-form-item label="连续登录天数" prop="continueLoginCount">
-          <el-input v-model="form.continueLoginCount" placeholder="请输入连续登录天数" />
-        </el-form-item>
-        <el-form-item label="最大连续登录天数" prop="maxLoginCount">
-          <el-input v-model="form.maxLoginCount" placeholder="请输入最大连续登录天数" />
-        </el-form-item>
-        <el-form-item label="最后登录IP" prop="lastLoginIp">
-          <el-input v-model="form.lastLoginIp" placeholder="请输入最后登录IP" />
-        </el-form-item>
-        <el-form-item label="最后登陆时间" prop="lastLoginTime">
-          <el-input v-model="form.lastLoginTime" placeholder="请输入最后登陆时间" />
-        </el-form-item>
-        <el-form-item label="最后登录位置" prop="lastLocation">
-          <el-input v-model="form.lastLocation" placeholder="请输入最后登录位置" />
-        </el-form-item>
-        <el-form-item label="注册IP" prop="regIp">
-          <el-input v-model="form.regIp" placeholder="请输入注册IP" />
-        </el-form-item>
-        <el-form-item label="注册时间" prop="regTime">
-          <el-input v-model="form.regTime" placeholder="请输入注册时间" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
+    <update-user-info-dialog v-if="updateUserInfoDialogVisible" ref="updateUserInfoDialog" @refreshDataList="getList" />
   </div>
 </template>
 
 <script>
-import { listUserInfo, getUserInfo, delUserInfo, addUserInfo, updateUserInfo } from "@/api/cai/userInfo";
+import {listUserInfo} from "@/api/cai/userInfo";
+import {genderList, isAnchorList} from "@/constant/statusMap";
+import UpdateUserInfoDialog from "@/views/cai/userInfo/update-user-info-dialog";
 
 export default {
   name: "UserInfo",
+  components: {UpdateUserInfoDialog},
   data() {
     return {
-      // 按钮loading
-      buttonLoading: false,
+      genderList,isAnchorList,
+      updateUserInfoDialogVisible: false,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -263,71 +124,15 @@ export default {
       total: 0,
       // 用户好友提成表格数据
       userInfoList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        videoIncomeRate: undefined,
-        guardIncomeRate: undefined,
-        giftIncomeRate: undefined,
-        payIncomeRate: undefined,
-        loginCount: undefined,
-        continueLoginCount: undefined,
-        maxLoginCount: undefined,
-        lastLoginIp: undefined,
-        lastLoginTime: undefined,
-        lastLocation: undefined,
-        regIp: undefined,
-        regTime: undefined
+        isAnchor: undefined,
+        gender: undefined,
+        mobile: undefined,
+        usercode: undefined,
       },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        userId: [
-          { required: true, message: "不能为空", trigger: "blur" }
-        ],
-        videoIncomeRate: [
-          { required: true, message: "奖励好友收入视频提成比率不能为空", trigger: "blur" }
-        ],
-        guardIncomeRate: [
-          { required: true, message: "奖励好友守护的比例不能为空", trigger: "blur" }
-        ],
-        giftIncomeRate: [
-          { required: true, message: "奖励好友礼物的比例不能为空", trigger: "blur" }
-        ],
-        payIncomeRate: [
-          { required: true, message: "奖励好友充值的比率不能为空", trigger: "blur" }
-        ],
-        loginCount: [
-          { required: true, message: "登录次数 不能为空", trigger: "blur" }
-        ],
-        continueLoginCount: [
-          { required: true, message: "连续登录天数不能为空", trigger: "blur" }
-        ],
-        maxLoginCount: [
-          { required: true, message: "最大连续登录天数不能为空", trigger: "blur" }
-        ],
-        lastLoginIp: [
-          { required: true, message: "最后登录IP不能为空", trigger: "blur" }
-        ],
-        lastLoginTime: [
-          { required: true, message: "最后登陆时间不能为空", trigger: "blur" }
-        ],
-        lastLocation: [
-          { required: true, message: "最后登录位置不能为空", trigger: "blur" }
-        ],
-        regIp: [
-          { required: true, message: "注册IP不能为空", trigger: "blur" }
-        ],
-        regTime: [
-          { required: true, message: "注册时间不能为空", trigger: "blur" }
-        ]
-      }
     };
   },
   created() {
@@ -343,30 +148,6 @@ export default {
         this.loading = false;
       });
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        userId: undefined,
-        videoIncomeRate: undefined,
-        guardIncomeRate: undefined,
-        giftIncomeRate: undefined,
-        payIncomeRate: undefined,
-        loginCount: undefined,
-        continueLoginCount: undefined,
-        maxLoginCount: undefined,
-        lastLoginIp: undefined,
-        lastLoginTime: undefined,
-        lastLocation: undefined,
-        regIp: undefined,
-        regTime: undefined
-      };
-      this.resetForm("form");
-    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -383,70 +164,12 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加用户好友提成";
+    handleUpdate(row){
+      this.updateUserInfoDialogVisible = true
+      this.$nextTick(() => {
+        this.$refs.updateUserInfoDialog.init(row)
+      })
     },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.loading = true;
-      this.reset();
-      const userId = row.userId || this.ids
-      getUserInfo(userId).then(response => {
-        this.loading = false;
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改用户好友提成";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          this.buttonLoading = true;
-          if (this.form.userId != null) {
-            updateUserInfo(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          } else {
-            addUserInfo(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const userIds = row.userId || this.ids;
-      this.$modal.confirm('是否确认删除用户好友提成编号为"' + userIds + '"的数据项？').then(() => {
-        this.loading = true;
-        return delUserInfo(userIds);
-      }).then(() => {
-        this.loading = false;
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {
-      }).finally(() => {
-        this.loading = false;
-      });
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('cai/userInfo/export', {
-        ...this.queryParams
-      }, `userInfo_${new Date().getTime()}.xlsx`)
-    }
   }
 };
 </script>
diff --git a/src/views/cai/userInvite/update-invite-dialog.vue b/src/views/cai/userInfo/update-user-info-dialog.vue
similarity index 92%
rename from src/views/cai/userInvite/update-invite-dialog.vue
rename to src/views/cai/userInfo/update-user-info-dialog.vue
index 316bc6c..2fe2c30 100644
--- a/src/views/cai/userInvite/update-invite-dialog.vue
+++ b/src/views/cai/userInfo/update-user-info-dialog.vue
@@ -25,8 +25,8 @@
 </template>
 
 <script>
-import ImageUpload from '@/components/ImageUpload/index'
-import {getUserInvite, updateUserInviteRate} from "@/api/cai/userInvite";
+import ImageUpload from '@/components/ImageUpload'
+import {getUserInfo, updateUserInfo} from "@/api/cai/userInfo";
 
 export default {
   components: {
@@ -72,7 +72,7 @@ export default {
       this.open = true;
       this.$nextTick(() => {
         this.$refs['form'].resetFields();
-        getUserInvite(id).then(response => {
+        getUserInfo(id).then(response => {
           this.form = response.data;
           this.form.usercode = row.usercode
         });
@@ -83,7 +83,7 @@ export default {
       this.$refs['form'].validate((valid) => {
         if (valid) {
           this.buttonLoading = true;
-          updateUserInviteRate(this.form).then(data => {
+          updateUserInfo(this.form).then(data => {
             this.$modal.msgSuccess("修改成功");
             this.buttonLoading = false;
             this.open = false
diff --git a/src/views/cai/userInvite/index.vue b/src/views/cai/userInvite/index.vue
index 0e20342..1404835 100644
--- a/src/views/cai/userInvite/index.vue
+++ b/src/views/cai/userInvite/index.vue
@@ -94,13 +94,6 @@
               @click="handleEnableRate(scope.row,false)"
               v-hasPermi="['cai:userInvite:edit']"
           >关闭</el-button>
-          <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="handleUpdate(scope.row)"
-              v-hasPermi="['cai:userInvite:edit']"
-          >修改</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -112,24 +105,20 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-    <update-invite-dialog v-if="updateInviteDialogVisible" ref="updateInviteDialog" @refreshDataList="getList" />
   </div>
 </template>
 
 <script>
 import {listUserInvite, updateUserInvite} from "@/api/cai/userInvite";
 import {booleanList, isAnchorList} from "@/constant/statusMap";
-import UpdateInviteDialog from "@/views/cai/userInvite/update-invite-dialog";
 
 export default {
   name: "UserInvite",
   components: {
-    UpdateInviteDialog
   },
   data() {
     return {
       isAnchorList,booleanList,
-      updateInviteDialogVisible: false,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -185,12 +174,6 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
-    handleUpdate(row){
-      this.updateInviteDialogVisible = true
-      this.$nextTick(() => {
-        this.$refs.updateInviteDialog.init(row)
-      })
-    },
     handleEnableRate(row,enableRate) {
       let message = enableRate ? '开启' : '关闭';
       this.$modal.confirm('是否确认'+message+'用户"' + row.usercode + '"的好友邀请奖励？').then(() => {
diff --git a/src/views/cai/userUnion/index.vue b/src/views/cai/userUnion/index.vue
index 9e91b39..bd36e79 100644
--- a/src/views/cai/userUnion/index.vue
+++ b/src/views/cai/userUnion/index.vue
@@ -48,8 +48,8 @@
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="unionTime" width="150"/>
       <el-table-column label="工会人数" align="center" prop="allNum"/>
-      <el-table-column label="分成人数" align="center" prop="inDivideNum"/>
-      <el-table-column label="不分成人数" align="center" prop="notDivideNum"/>
+<!--      <el-table-column label="分成人数" align="center" prop="inDivideNum"/>-->
+<!--      <el-table-column label="不分成人数" align="center" prop="notDivideNum"/>-->
       <el-table-column label="状态" align="center" prop="status">
         <template v-slot="scope">
           <cai-dict-tag :options="userStatusList" :value="scope.row.status"/>