From aaaaa84e1ee44fb54dacd017b3261b5bce705397 Mon Sep 17 00:00:00 2001
From: dute7liang <383200134@qq.com>
Date: Sun, 31 Dec 2023 13:54:20 +0800
Subject: [PATCH] init

---
 src/api/cai/userCount.js                      |   8 +
 src/constant/statusMap.js                     |  10 +
 src/router/index.js                           |  14 +
 src/views/cai/account/index.vue               | 341 +++-------------
 src/views/cai/accountCash/index.vue           |   9 +-
 src/views/cai/unionUser/index.vue             | 196 ++++++++++
 .../unionUser/union-user-update-dialog.vue    | 103 +++++
 src/views/cai/user/index.vue                  |  73 ++--
 src/views/cai/user/user-add-update-dialog.vue |  21 +-
 src/views/cai/userCount/index.vue             | 370 +++---------------
 src/views/cai/userUnion/index.vue             | 231 ++++-------
 .../cai/userUnion/union-update-dialog.vue     |  96 +++++
 12 files changed, 663 insertions(+), 809 deletions(-)
 create mode 100644 src/views/cai/unionUser/index.vue
 create mode 100644 src/views/cai/unionUser/union-user-update-dialog.vue
 create mode 100644 src/views/cai/userUnion/union-update-dialog.vue

diff --git a/src/api/cai/userCount.js b/src/api/cai/userCount.js
index dd768f7..c581f6d 100644
--- a/src/api/cai/userCount.js
+++ b/src/api/cai/userCount.js
@@ -17,6 +17,14 @@ export function getUserCount(userId) {
   })
 }
 
+export function resetUserCount(params) {
+  return request({
+    url: '/cai/userCount/reset',
+    method: 'get',
+    params: params
+  })
+}
+
 // 新增用户信息数量统计
 export function addUserCount(data) {
   return request({
diff --git a/src/constant/statusMap.js b/src/constant/statusMap.js
index 178d75a..48a066f 100644
--- a/src/constant/statusMap.js
+++ b/src/constant/statusMap.js
@@ -73,6 +73,16 @@ export const yesOrNoList = [
   { value: 0, label: '否',listClass: listClass.info},
 ]
 
+export const isAnchorList = [
+  { value: 1, label: '是',listClass: listClass.primary},
+  { value: 0, label: '否',listClass: listClass.info},
+]
+
+export const booleanList = [
+  { value: true, label: '是',listClass: listClass.danger},
+  { value: false, label: '否',listClass: listClass.info},
+]
+
 export const userRiskLowList = [
   { value: 1, label: '低风险',listClass: listClass.info},
   { value: 2, label: '高风险',listClass: listClass.danger},
diff --git a/src/router/index.js b/src/router/index.js
index 883ea2d..96d7225 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -161,6 +161,20 @@ export const dynamicRoutes = [
         meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
       }
     ]
+  },
+  {
+    path: '/tool/union-user',
+    component: Layout,
+    permissions: ['cai:userUnion:list'],
+    hidden: true,
+    children: [
+      {
+        path: 'index',
+        component: () => import('@/views/cai/unionUser/index'),
+        name: 'UnionUser',
+        meta: { title: '工会成员信息', activeMenu: '/cai/unionUser' }
+      }
+    ]
   }
 ]
 
diff --git a/src/views/cai/account/index.vue b/src/views/cai/account/index.vue
index d51263a..83e57ed 100644
--- a/src/views/cai/account/index.vue
+++ b/src/views/cai/account/index.vue
@@ -1,60 +1,20 @@
 <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="money">
+      <el-form-item label="蜜瓜号" prop="usercode">
         <el-input
-          v-model="queryParams.money"
-          placeholder="请输入充值的可用余额"
-          clearable
-          @keyup.enter.native="handleQuery"
+            v-model="queryParams.usercode"
+            placeholder="请输入蜜瓜号"
+            clearable
+            @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="收益的金额" prop="incomeMoney">
+      <el-form-item label="手机号" prop="mobile">
         <el-input
-          v-model="queryParams.incomeMoney"
-          placeholder="请输入收益的金额"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="当前彩币数量" prop="coin">
-        <el-input
-          v-model="queryParams.coin"
-          placeholder="请输入当前彩币数量"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="收益的彩币数量" prop="incomeCoin">
-        <el-input
-          v-model="queryParams.incomeCoin"
-          placeholder="请输入收益的彩币数量"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="当前魅力值" prop="loveValue">
-        <el-input
-          v-model="queryParams.loveValue"
-          placeholder="请输入当前魅力值"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="充值总额" prop="totalBuyMoney">
-        <el-input
-          v-model="queryParams.totalBuyMoney"
-          placeholder="请输入充值总额"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="充值彩贝总额" prop="totalBuyCoin">
-        <el-input
-          v-model="queryParams.totalBuyCoin"
-          placeholder="请输入充值彩贝总额"
-          clearable
-          @keyup.enter.native="handleQuery"
+            v-model="queryParams.mobile"
+            placeholder="请输入手机号"
+            clearable
+            @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item>
@@ -64,133 +24,60 @@
     </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:account: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:account: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:account: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:account:export']"
-        >导出</el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="accountList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="子账户ID" align="center" prop="id" v-if="true"/>
-      <el-table-column label="用户ID" align="center" prop="userId" v-if="true"/>
-      <el-table-column label="充值的可用余额" align="center" prop="money" />
-      <el-table-column label="收益的金额" align="center" prop="incomeMoney" />
-      <el-table-column label="当前彩币数量" align="center" prop="coin" />
-      <el-table-column label="收益的彩币数量" align="center" prop="incomeCoin" />
-      <el-table-column label="当前魅力值" align="center" prop="loveValue" />
-      <el-table-column label="充值总额" align="center" prop="totalBuyMoney" />
-      <el-table-column label="充值彩贝总额" align="center" prop="totalBuyCoin" />
-      <el-table-column label="账户锁定 0 正常 1 锁定" align="center" prop="status" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['cai:account:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['cai:account:remove']"
-          >删除</el-button>
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="蜜瓜号" align="center" prop="usercode"/>
+      <el-table-column label="手机号" align="center" prop="mobile"/>
+      <el-table-column label="昵称" align="center" prop="nickname"/>
+      <el-table-column label="头像" align="center" prop="avatar">
+        <template v-slot="scope">
+          <image-preview :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="coin"/>
+      <el-table-column label="收益" align="center" prop="incomeCoin"/>
+      <el-table-column label="充值总额" align="center" prop="totalBuyMoney"/>
+      <el-table-column label="充值总紫贝" align="center" prop="totalBuyCoin"/>
+      <el-table-column label="状态" align="center" prop="status">
+        <template v-slot="scope">
+          <cai-dict-tag :options="userStatusList" :value="scope.row.status"/>
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :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="money">
-          <el-input v-model="form.money" placeholder="请输入充值的可用余额" />
-        </el-form-item>
-        <el-form-item label="收益的金额" prop="incomeMoney">
-          <el-input v-model="form.incomeMoney" placeholder="请输入收益的金额" />
-        </el-form-item>
-        <el-form-item label="当前彩币数量" prop="coin">
-          <el-input v-model="form.coin" placeholder="请输入当前彩币数量" />
-        </el-form-item>
-        <el-form-item label="收益的彩币数量" prop="incomeCoin">
-          <el-input v-model="form.incomeCoin" placeholder="请输入收益的彩币数量" />
-        </el-form-item>
-        <el-form-item label="当前魅力值" prop="loveValue">
-          <el-input v-model="form.loveValue" placeholder="请输入当前魅力值" />
-        </el-form-item>
-        <el-form-item label="充值总额" prop="totalBuyMoney">
-          <el-input v-model="form.totalBuyMoney" placeholder="请输入充值总额" />
-        </el-form-item>
-        <el-form-item label="充值彩贝总额" prop="totalBuyCoin">
-          <el-input v-model="form.totalBuyCoin" 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>
   </div>
 </template>
 
 <script>
-import { listAccount, getAccount, delAccount, addAccount, updateAccount } from "@/api/cai/account";
+import {listAccount} from "@/api/cai/account";
+import {genderList, isAnchorList, userStatusList, yesOrNoList} from "@/constant/statusMap";
 
 export default {
   name: "Account",
   data() {
     return {
-      // 按钮loading
-      buttonLoading: false,
+      genderList, userStatusList, yesOrNoList, isAnchorList,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -205,61 +92,13 @@ export default {
       total: 0,
       // 用户账户表格数据
       accountList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        money: undefined,
-        incomeMoney: undefined,
-        coin: undefined,
-        incomeCoin: undefined,
-        loveValue: undefined,
-        totalBuyMoney: undefined,
-        totalBuyCoin: undefined,
-        status: undefined,
+        usercode: undefined,
+        mobile: undefined
       },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "子账户ID不能为空", trigger: "blur" }
-        ],
-        userId: [
-          { required: true, message: "用户ID不能为空", trigger: "blur" }
-        ],
-        money: [
-          { required: true, message: "充值的可用余额不能为空", trigger: "blur" }
-        ],
-        incomeMoney: [
-          { required: true, message: "收益的金额不能为空", trigger: "blur" }
-        ],
-        coin: [
-          { required: true, message: "当前彩币数量不能为空", trigger: "blur" }
-        ],
-        incomeCoin: [
-          { required: true, message: "收益的彩币数量不能为空", trigger: "blur" }
-        ],
-        loveValue: [
-          { required: true, message: "当前魅力值不能为空", trigger: "blur" }
-        ],
-        totalBuyMoney: [
-          { required: true, message: "充值总额不能为空", trigger: "blur" }
-        ],
-        totalBuyCoin: [
-          { required: true, message: "充值彩贝总额不能为空", trigger: "blur" }
-        ],
-        status: [
-          { required: true, message: "账户锁定 0 正常 1 锁定不能为空", trigger: "change" }
-        ],
-        createTime: [
-          { required: true, message: "账户创建时间不能为空", trigger: "blur" }
-        ]
-      }
     };
   },
   created() {
@@ -275,28 +114,6 @@ export default {
         this.loading = false;
       });
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: undefined,
-        userId: undefined,
-        money: undefined,
-        incomeMoney: undefined,
-        coin: undefined,
-        incomeCoin: undefined,
-        loveValue: undefined,
-        totalBuyMoney: undefined,
-        totalBuyCoin: undefined,
-        status: undefined,
-        createTime: undefined
-      };
-      this.resetForm("form");
-    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -310,73 +127,9 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加用户账户";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.loading = true;
-      this.reset();
-      const id = row.id || this.ids
-      getAccount(id).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.id != null) {
-            updateAccount(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          } else {
-            addAccount(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除用户账户编号为"' + ids + '"的数据项？').then(() => {
-        this.loading = true;
-        return delAccount(ids);
-      }).then(() => {
-        this.loading = false;
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {
-      }).finally(() => {
-        this.loading = false;
-      });
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('cai/account/export', {
-        ...this.queryParams
-      }, `account_${new Date().getTime()}.xlsx`)
-    }
   }
 };
 </script>
diff --git a/src/views/cai/accountCash/index.vue b/src/views/cai/accountCash/index.vue
index 1be9672..5207df2 100644
--- a/src/views/cai/accountCash/index.vue
+++ b/src/views/cai/accountCash/index.vue
@@ -1,10 +1,10 @@
 <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="orderNo">
+      <el-form-item label="蜜瓜号" prop="usercode">
         <el-input
-          v-model="queryParams.orderNo"
-          placeholder="请输入订单号"
+          v-model="queryParams.usercode"
+          placeholder="请输入蜜瓜号"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -59,6 +59,8 @@
     <el-table v-loading="loading" :data="accountCashList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="订单号" align="center" prop="orderNo" />
+      <el-table-column label="蜜瓜号" align="center" prop="usercode" />
+      <el-table-column label="提现紫贝" align="center" prop="withdrawCoin" />
       <el-table-column label="提现金额" align="center" prop="cashMoney" />
       <el-table-column label="银行名称" align="center" prop="bank" />
       <el-table-column label="账户名称" align="center" prop="cardName" />
@@ -122,6 +124,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        usercode: undefined,
         orderNo: undefined,
         cardName: undefined,
         cardAccount: undefined,
diff --git a/src/views/cai/unionUser/index.vue b/src/views/cai/unionUser/index.vue
new file mode 100644
index 0000000..fea7c33
--- /dev/null
+++ b/src/views/cai/unionUser/index.vue
@@ -0,0 +1,196 @@
+<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="usercode">
+        <el-input
+            v-model="queryParams.usercode"
+            placeholder="请输入蜜瓜号"
+            clearable
+            @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="手机号" prop="mobile">
+        <el-input
+            v-model="queryParams.mobile"
+            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-row :gutter="10" class="mb8">
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="unionUserList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="工会名" align="center" prop="unionName"/>
+      <el-table-column label="蜜瓜号" align="center" prop="usercode"/>
+      <el-table-column label="手机号" align="center" prop="mobile"/>
+      <el-table-column label="昵称" align="center" prop="nickname"/>
+      <el-table-column label="头像" align="center" prop="avatar">
+        <template v-slot="scope">
+          <image-preview :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="videoDivide"/>
+      <el-table-column label="礼物分成比例" align="center" prop="giftDivide"/>
+      <el-table-column label="开启提成" align="center" prop="enableRate" width="80">
+        <template v-slot="scope">
+          <cai-dict-tag :options="booleanList" :value="scope.row.enableRate"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="入会时间" align="center" prop="createTime" width="150"/>
+      <!--      <el-table-column label="vip分成" align="center" prop="vipDivide" />-->
+      <!--      <el-table-column label="收益" align="center" prop="unionEarning" />-->
+      <el-table-column label="状态" align="center" prop="status">
+        <template v-slot="scope">
+          <cai-dict-tag :options="userStatusList" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template v-slot="scope">
+          <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdate(scope.row)"
+              v-hasPermi="['cai:unionUser:edit']"
+          >修改
+          </el-button>
+          <!--          <el-button
+                      size="mini"
+                      type="text"
+                      icon="el-icon-delete"
+                      @click="handleDelete(scope.row)"
+                      v-hasPermi="['cai:unionUser:remove']"
+                    >删除</el-button>-->
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+    />
+    <union-user-update-dialog v-if="unionUserUpdateDialogVisible" ref="unionUserUpdateDialog" @refreshDataList="getList"/>
+  </div>
+
+</template>
+
+<script>
+import {delUnionUser, listUnionUser} from "@/api/cai/unionUser";
+import {booleanList, genderList, isAnchorList, userStatusList, yesOrNoList} from "@/constant/statusMap";
+import UnionUserUpdateDialog from "@/views/cai/unionUser/union-user-update-dialog";
+
+export default {
+  name: "UnionUser",
+  components: {
+    UnionUserUpdateDialog
+  },
+  data() {
+    return {
+      genderList, booleanList, userStatusList, yesOrNoList,isAnchorList,
+      unionUserUpdateDialogVisible: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 工会成员表格数据
+      unionUserList: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        unionId: undefined,
+        userId: undefined,
+        videoDivide: undefined,
+        giftDivide: undefined,
+        vipDivide: undefined,
+        type: undefined,
+        unionEarning: undefined,
+        isInitiative: undefined
+      },
+    };
+  },
+  created() {
+    this.queryParams.unionId = this.$route.query.unionId
+    this.getList();
+  },
+  methods: {
+    /** 查询工会成员列表 */
+    getList() {
+      this.loading = true;
+      listUnionUser(this.queryParams).then(response => {
+        this.unionUserList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.unionUserUpdateDialogVisible = true
+      this.$nextTick(() => {
+        this.$refs.unionUserUpdateDialog.init(row)
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除工会成员编号为"' + ids + '"的数据项？').then(() => {
+        this.loading = true;
+        return delUnionUser(ids);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+  }
+};
+</script>
diff --git a/src/views/cai/unionUser/union-user-update-dialog.vue b/src/views/cai/unionUser/union-user-update-dialog.vue
new file mode 100644
index 0000000..26d1e55
--- /dev/null
+++ b/src/views/cai/unionUser/union-user-update-dialog.vue
@@ -0,0 +1,103 @@
+<template>
+  <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="700px" append-to-body>
+    <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-form-item label="昵称" prop="nickname">
+        <el-input v-model="form.nickname" placeholder="" disabled />
+      </el-form-item>
+      <el-form-item label="手机号" prop="mobile">
+        <el-input v-model="form.mobile" placeholder="" disabled />
+      </el-form-item>
+      <el-form-item label="蜜瓜号" prop="usercode">
+        <el-input v-model="form.usercode" placeholder="" disabled />
+      </el-form-item>
+      <el-form-item label="开启提成" prop="enableRate">
+        <el-radio-group v-model="form.enableRate">
+          <el-radio :label="true">开启</el-radio>
+          <el-radio :label="false">关闭</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="视频提成" prop="videoDivide">
+        <el-input v-model="form.videoDivide" />
+      </el-form-item>
+      <el-form-item label="礼物提成" prop="giftDivide">
+        <el-input v-model="form.giftDivide" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="open = false">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import {getUnionUser, updateUnionUser} from "@/api/cai/unionUser";
+
+export default {
+  components: {
+  },
+  data () {
+    return {
+      open: false,
+      title: '',
+      form:{
+        id: undefined,
+        nickname: undefined,
+        mobile: undefined,
+        usercode: undefined,
+        videoDivide: undefined,
+        giftDivide: undefined,
+        enableRate: undefined,
+      },
+      // 表单校验
+      rules: {
+        enableRate: [
+          { required: true, message: "数据不能为空", trigger: "blur" }
+        ],
+        giftDivide: [
+          { required: true, message: "数据不能为空", trigger: "blur" }
+        ],
+        videoDivide: [
+          { required: true, message: "数据不能为空", trigger: "blur" }
+        ],
+      },
+      buttonLoading: false,
+    }
+  },
+  created() {
+  },
+  methods: {
+    init (row) {
+      let id = row.id;
+      this.form.id = id || undefined;
+      this.title = "修改工会成员配置";
+      this.open = true;
+      this.$nextTick(() => {
+        this.$refs['form'].resetFields();
+        getUnionUser(id).then(response => {
+          this.form = response.data;
+          this.form.nickname = row.nickname;
+          this.form.usercode = row.usercode;
+          this.form.mobile = row.mobile;
+        });
+      })
+    },
+    // 表单提交
+    submitForm () {
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          this.buttonLoading = true;
+          updateUnionUser(this.form).then(data => {
+            this.$modal.msgSuccess("修改成功");
+            this.buttonLoading = false;
+            this.open = false
+            this.$emit('refreshDataList')
+          }).finally(() => {
+            this.buttonLoading = false;
+          });
+        }
+      })
+    },
+  }
+}
+</script>
diff --git a/src/views/cai/user/index.vue b/src/views/cai/user/index.vue
index 4dd4667..517e960 100644
--- a/src/views/cai/user/index.vue
+++ b/src/views/cai/user/index.vue
@@ -1,10 +1,10 @@
 <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="用户ID号" prop="usercode">
+      <el-form-item label="蜜瓜号" prop="usercode">
         <el-input
           v-model="queryParams.usercode"
-          placeholder="请输入用户ID号"
+          placeholder="请输入蜜瓜号"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -62,23 +62,11 @@
           v-hasPermi="['cai:user: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:user:remove']"
-        >删除</el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-<!--      <el-table-column label="组" align="center" prop="groupId" />-->
       <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"/>
@@ -94,9 +82,14 @@
       </el-table-column>
       <el-table-column label="年龄" align="center" prop="age" />
       <el-table-column label="所在城市" align="center" prop="city" />
-      <el-table-column label="手机号认证" align="center" prop="mobileStatus">
+      <el-table-column label="主播" align="center" prop="isAnchor">
         <template v-slot="scope">
-          <cai-dict-tag :options="authList" :value="scope.row.mobileStatus" />
+          <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="cameraStatus">
@@ -104,27 +97,23 @@
           <cai-dict-tag :options="authList" :value="scope.row.cameraStatus" />
         </template>
       </el-table-column>
-      <el-table-column label="相册状态" align="center" prop="photoStatus">
-        <template v-slot="scope">
-          <cai-dict-tag :options="authList" :value="scope.row.photoStatus" />
-        </template>
-      </el-table-column>
-      <el-table-column label="资料是否完成" align="center" prop="finishStatus">
-        <template v-slot="scope">
-          <cai-dict-tag :options="authList" :value="scope.row.finishStatus" />
-        </template>
-      </el-table-column>
       <el-table-column label="最后登陆时间" align="center" prop="lastLoginTime" width="150"/>
       <el-table-column label="登陆IP" align="center" prop="lastLoginIp" width="125"/>
       <el-table-column label="注册时间" align="center" prop="regTime" width="150"/>
-      <el-table-column label="加入IP" align="center" prop="regIp" width="125"/>
+<!--      <el-table-column label="加入IP" align="center" prop="regIp" width="125"/>-->
       <el-table-column label="状态" align="center" prop="status">
         <template v-slot="scope">
           <cai-dict-tag :options="userStatusList" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120" fixed="right">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160" fixed="right">
         <template v-slot="scope">
+          <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-info"
+              @click="handleDelete(scope.row)"
+          >详情</el-button>
           <el-button
             size="mini"
             type="text"
@@ -132,13 +121,14 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['cai:user:edit']"
           >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['cai:user:remove']"
-          >删除</el-button>
+          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['cai:userUnion:remove']">
+            <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="handleDelete" icon="el-icon-delete" v-hasPermi="['cai:user:remove']">删除</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
         </template>
       </el-table-column>
     </el-table>
@@ -157,7 +147,7 @@
 
 <script>
 import { delUser, listUser } from '@/api/cai/user'
-import { authList, genderList, userStatusList } from '@/constant/statusMap'
+import { authList, genderList, userStatusList, isAnchorList } from '@/constant/statusMap'
 import UserAddUpdateDialog from '@/views/cai/user/user-add-update-dialog.vue'
 
 export default {
@@ -167,7 +157,7 @@ export default {
   },
   data() {
     return {
-      genderList,authList,userStatusList,
+      genderList,authList,userStatusList,isAnchorList,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -246,6 +236,15 @@ export default {
         this.loading = false;
       });
     },
+    handleCommand(command, row) {
+      switch (command) {
+        case "handleDelete":
+          this.handleDelete(row);
+          break;
+        default:
+          break;
+      }
+    },
   }
 };
 </script>
diff --git a/src/views/cai/user/user-add-update-dialog.vue b/src/views/cai/user/user-add-update-dialog.vue
index a35e3a9..066e0e5 100644
--- a/src/views/cai/user/user-add-update-dialog.vue
+++ b/src/views/cai/user/user-add-update-dialog.vue
@@ -7,10 +7,13 @@
       <el-form-item label="头像" prop="avatar">
         <image-upload v-model="form.avatar"/>
       </el-form-item>
-      <el-form-item label="工会管理员" prop="isUnion">
-        <el-radio-group v-model="form.isUnion">
-          <el-radio :label="1">是</el-radio>
-          <el-radio :label="0">否</el-radio>
+      <el-form-item label="手机号" prop="mobile">
+        <el-input v-model="form.mobile" placeholder="请输入手机号" />
+      </el-form-item>
+      <el-form-item label="性别" prop="gender">
+        <el-radio-group v-model="form.gender">
+          <el-radio :label="2">男</el-radio>
+          <el-radio :label="1">女</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="可发动态" prop="sendDynamic">
@@ -44,19 +47,23 @@ export default {
         id: undefined,
         nickname: undefined,
         avatar: undefined,
-        isUnion: undefined,
+        gender: undefined,
         sendDynamic: undefined,
+        mobile: undefined,
       },
       // 表单校验
       rules: {
+        mobile: [
+          { required: true, message: "数据不能为空", trigger: "blur" }
+        ],
         nickname: [
           { required: true, message: "数据不能为空", trigger: "blur" }
         ],
         avatar: [
           { required: true, message: "数据不能为空", trigger: "blur" }
         ],
-        isUnion: [
-          { required: true, message: "数据不能为空", trigger: "change" }
+        gender: [
+          { required: true, message: "数据不能为空", trigger: "blur" }
         ],
         sendDynamic: [
           { required: true, message: "数据不能为空", trigger: "blur" }
diff --git a/src/views/cai/userCount/index.vue b/src/views/cai/userCount/index.vue
index e03b75a..a43c07f 100644
--- a/src/views/cai/userCount/index.vue
+++ b/src/views/cai/userCount/index.vue
@@ -1,76 +1,20 @@
 <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="fansCount">
+      <el-form-item label="蜜瓜号" prop="usercode">
         <el-input
-          v-model="queryParams.fansCount"
-          placeholder="请输入粉丝总数"
-          clearable
-          @keyup.enter.native="handleQuery"
+            v-model="queryParams.usercode"
+            placeholder="请输入蜜瓜号"
+            clearable
+            @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="最新粉丝数" prop="newFansCount">
+      <el-form-item label="手机号" prop="mobile">
         <el-input
-          v-model="queryParams.newFansCount"
-          placeholder="请输入最新粉丝数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="关注数" prop="followCount">
-        <el-input
-          v-model="queryParams.followCount"
-          placeholder="请输入关注数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="访客数" prop="visitorCount">
-        <el-input
-          v-model="queryParams.visitorCount"
-          placeholder="请输入访客数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="最新访客数" prop="newVisitorCount">
-        <el-input
-          v-model="queryParams.newVisitorCount"
-          placeholder="请输入最新访客数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="相册数量" prop="photoCount">
-        <el-input
-          v-model="queryParams.photoCount"
-          placeholder="请输入相册数量"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="发帖数量" prop="dynamicCount">
-        <el-input
-          v-model="queryParams.dynamicCount"
-          placeholder="请输入发帖数量"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="收到的礼物数量" prop="receiveGiftCount">
-        <el-input
-          v-model="queryParams.receiveGiftCount"
-          placeholder="请输入收到的礼物数量"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="送礼总数量" prop="giveGiftCount">
-        <el-input
-          v-model="queryParams.giveGiftCount"
-          placeholder="请输入送礼总数量"
-          clearable
-          @keyup.enter.native="handleQuery"
+            v-model="queryParams.mobile"
+            placeholder="请输入手机号"
+            clearable
+            @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item>
@@ -80,139 +24,73 @@
     </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:userCount: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:userCount: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:userCount: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:userCount:export']"
-        >导出</el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="userCountList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="用户ID" align="center" prop="userId" v-if="true"/>
-      <el-table-column label="粉丝总数" align="center" prop="fansCount" />
-      <el-table-column label="最新粉丝数" align="center" prop="newFansCount" />
-      <el-table-column label="关注数" align="center" prop="followCount" />
-      <el-table-column label="访客数" align="center" prop="visitorCount" />
-      <el-table-column label="最新访客数" align="center" prop="newVisitorCount" />
-      <el-table-column label="相册数量" align="center" prop="photoCount" />
-      <el-table-column label="发帖数量" align="center" prop="dynamicCount" />
-      <el-table-column label="收到的礼物数量" align="center" prop="receiveGiftCount" />
-      <el-table-column label="送礼总数量" align="center" prop="giveGiftCount" />
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="蜜瓜号" align="center" prop="usercode"/>
+      <el-table-column label="手机号" align="center" prop="mobile"/>
+      <el-table-column label="昵称" align="center" prop="nickname"/>
+      <el-table-column label="头像" align="center" prop="avatar" >
+        <template v-slot="scope">
+          <image-preview :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="yesOrNoList" :value="scope.row.isAnchor" />
+        </template>
+      </el-table-column>
+      <el-table-column label="粉丝总数" align="center" prop="fansCount"/>
+      <el-table-column label="关注数" align="center" prop="followCount"/>
+      <el-table-column label="访客数" align="center" prop="visitorCount"/>
+      <el-table-column label="相册数量" align="center" prop="photoCount"/>
+      <el-table-column label="发帖数量" align="center" prop="dynamicCount"/>
+      <el-table-column label="收到礼物数" align="center" prop="receiveGiftCount"/>
+      <el-table-column label="送礼总数量" align="center" prop="giveGiftCount"/>
+      <el-table-column label="状态" align="center" prop="status">
+        <template v-slot="scope">
+          <cai-dict-tag :options="userStatusList" :value="scope.row.status" />
+        </template>
+      </el-table-column>
       <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:userCount:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['cai:userCount:remove']"
-          >删除</el-button>
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleReset(scope.row)"
+          >重新计算
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :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="fansCount">
-          <el-input v-model="form.fansCount" placeholder="请输入粉丝总数" />
-        </el-form-item>
-        <el-form-item label="最新粉丝数" prop="newFansCount">
-          <el-input v-model="form.newFansCount" placeholder="请输入最新粉丝数" />
-        </el-form-item>
-        <el-form-item label="关注数" prop="followCount">
-          <el-input v-model="form.followCount" placeholder="请输入关注数" />
-        </el-form-item>
-        <el-form-item label="访客数" prop="visitorCount">
-          <el-input v-model="form.visitorCount" placeholder="请输入访客数" />
-        </el-form-item>
-        <el-form-item label="最新访客数" prop="newVisitorCount">
-          <el-input v-model="form.newVisitorCount" placeholder="请输入最新访客数" />
-        </el-form-item>
-        <el-form-item label="相册数量" prop="photoCount">
-          <el-input v-model="form.photoCount" placeholder="请输入相册数量" />
-        </el-form-item>
-        <el-form-item label="发帖数量" prop="dynamicCount">
-          <el-input v-model="form.dynamicCount" placeholder="请输入发帖数量" />
-        </el-form-item>
-        <el-form-item label="收到的礼物数量" prop="receiveGiftCount">
-          <el-input v-model="form.receiveGiftCount" placeholder="请输入收到的礼物数量" />
-        </el-form-item>
-        <el-form-item label="送礼总数量" prop="giveGiftCount">
-          <el-input v-model="form.giveGiftCount" 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>
   </div>
 </template>
 
 <script>
-import { listUserCount, getUserCount, delUserCount, addUserCount, updateUserCount } from "@/api/cai/userCount";
+import {listUserCount, resetUserCount} from "@/api/cai/userCount";
+import {genderList, userStatusList, yesOrNoList} from "@/constant/statusMap";
 
 export default {
   name: "UserCount",
   data() {
     return {
-      // 按钮loading
-      buttonLoading: false,
+      genderList,userStatusList,yesOrNoList,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -227,62 +105,13 @@ export default {
       total: 0,
       // 用户信息数量统计表格数据
       userCountList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        fansCount: undefined,
-        newFansCount: undefined,
-        followCount: undefined,
-        visitorCount: undefined,
-        newVisitorCount: undefined,
-        photoCount: undefined,
-        dynamicCount: undefined,
-        receiveGiftCount: undefined,
-        giveGiftCount: undefined,
+        usercode: undefined,
+        mobile: undefined
       },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        userId: [
-          { required: true, message: "用户ID不能为空", trigger: "blur" }
-        ],
-        fansCount: [
-          { required: true, message: "粉丝总数不能为空", trigger: "blur" }
-        ],
-        newFansCount: [
-          { required: true, message: "最新粉丝数不能为空", trigger: "blur" }
-        ],
-        followCount: [
-          { required: true, message: "关注数不能为空", trigger: "blur" }
-        ],
-        visitorCount: [
-          { required: true, message: "访客数不能为空", trigger: "blur" }
-        ],
-        newVisitorCount: [
-          { required: true, message: "最新访客数不能为空", trigger: "blur" }
-        ],
-        photoCount: [
-          { required: true, message: "相册数量不能为空", trigger: "blur" }
-        ],
-        dynamicCount: [
-          { required: true, message: "发帖数量不能为空", trigger: "blur" }
-        ],
-        receiveGiftCount: [
-          { required: true, message: "收到的礼物数量不能为空", trigger: "blur" }
-        ],
-        giveGiftCount: [
-          { required: true, message: "送礼总数量不能为空", trigger: "blur" }
-        ],
-        createTime: [
-          { required: true, message: "不能为空", trigger: "blur" }
-        ]
-      }
     };
   },
   created() {
@@ -298,28 +127,6 @@ export default {
         this.loading = false;
       });
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        userId: undefined,
-        fansCount: undefined,
-        newFansCount: undefined,
-        followCount: undefined,
-        visitorCount: undefined,
-        newVisitorCount: undefined,
-        photoCount: undefined,
-        dynamicCount: undefined,
-        receiveGiftCount: undefined,
-        giveGiftCount: undefined,
-        createTime: undefined
-      };
-      this.resetForm("form");
-    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -333,73 +140,22 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.userId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加用户信息数量统计";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.loading = true;
-      this.reset();
-      const userId = row.userId || this.ids
-      getUserCount(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) {
-            updateUserCount(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          } else {
-            addUserCount(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(() => {
+    handleReset(row) {
+      this.$modal.confirm('是否确认重新统计用户"' + row.nickname + '"的数据项？').then(() => {
         this.loading = true;
-        return delUserCount(userIds);
+        return resetUserCount({userId:row.userId});
       }).then(() => {
         this.loading = false;
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.$modal.msgSuccess("操作成功");
       }).catch(() => {
       }).finally(() => {
         this.loading = false;
       });
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('cai/userCount/export', {
-        ...this.queryParams
-      }, `userCount_${new Date().getTime()}.xlsx`)
-    }
   }
 };
 </script>
diff --git a/src/views/cai/userUnion/index.vue b/src/views/cai/userUnion/index.vue
index 4617ae8..322a6eb 100644
--- a/src/views/cai/userUnion/index.vue
+++ b/src/views/cai/userUnion/index.vue
@@ -1,6 +1,22 @@
 <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="usercode">
+        <el-input
+            v-model="queryParams.usercode"
+            placeholder="请输入蜜瓜号"
+            clearable
+            @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="手机号" prop="mobile">
+        <el-input
+            v-model="queryParams.mobile"
+            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>
@@ -13,33 +29,44 @@
 
     <el-table v-loading="loading" :data="userUnionList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="蜜瓜号" align="center" prop="usercode"/>
-      <el-table-column label="昵称" align="center" prop="nickname"/>
-      <el-table-column label="手机" align="center" prop="mobile"/>
-      <el-table-column label="头像" align="center" prop="avatar">
+      <el-table-column label="蜜瓜号" align="center" prop="usercode" width="60"/>
+      <el-table-column label="工会名" align="center" prop="name" />
+      <el-table-column label="开启提成" align="center" prop="enableRate" width="80">
         <template v-slot="scope">
-          <image-preview :src="scope.row.avatar"/>
+          <cai-dict-tag :options="booleanList" :value="scope.row.enableRate"/>
         </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="unionTime"/>
+      <el-table-column label="默认提成" align="center" prop="defaultIncomeRate" width="80"/>
+      <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" class-name="small-padding fixed-width" fixed="right">
+      <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"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width" fixed="right">
         <template v-slot="scope">
           <el-button
               size="mini"
               type="text"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.row)"
+              @click="handleUpdate(scope.row)"
               v-hasPermi="['cai:userUnion:remove']"
-          >删除
+          >修改
           </el-button>
+          <el-button
+              size="mini"
+              type="text"
+              @click="handleDetail(scope.row)"
+          >详情
+          </el-button>
+          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['cai:userUnion:remove']">
+            <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-delete" v-hasPermi="['cai:userUnion:remove']">解散</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
         </template>
       </el-table-column>
     </el-table>
@@ -52,50 +79,24 @@
         @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="用户id" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入用户id"/>
-        </el-form-item>
-        <el-form-item label="工会名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入工会名称"/>
-        </el-form-item>
-        <el-form-item label="工会默认二级支付奖励比例" prop="unionPayRate">
-          <el-input v-model="form.unionPayRate" placeholder="请输入工会默认二级支付奖励比例"/>
-        </el-form-item>
-        <el-form-item label="工会默认二级收益奖励比例" prop="unionIncomeRate">
-          <el-input v-model="form.unionIncomeRate" placeholder="请输入工会默认二级收益奖励比例"/>
-        </el-form-item>
-        <el-form-item label="全部人数" prop="allNum">
-          <el-input v-model="form.allNum" placeholder="请输入全部人数"/>
-        </el-form-item>
-        <el-form-item label="在分成的人数" prop="inDivideNum">
-          <el-input v-model="form.inDivideNum" placeholder="请输入在分成的人数"/>
-        </el-form-item>
-        <el-form-item label="不分成人数" prop="notDivideNum">
-          <el-input v-model="form.notDivideNum" 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>
+    <union-update-dialog v-if="unionUpdateDialogVisible" ref="unionUpdateDialog" @refreshDataList="getList"/>
   </div>
 </template>
 
 <script>
-import { addUserUnion, delUserUnion, getUserUnion, listUserUnion, updateUserUnion } from '@/api/cai/userUnion'
-import { genderList } from '@/constant/statusMap'
+import {delUserUnion, listUserUnion} from '@/api/cai/userUnion'
+import {booleanList, genderList, userStatusList} from '@/constant/statusMap'
+import UnionUpdateDialog from "@/views/cai/userUnion/union-update-dialog";
 
 export default {
   name: 'UserUnion',
+  components: {
+    UnionUpdateDialog
+  },
   data() {
     return {
-      genderList,
-      // 按钮loading
-      buttonLoading: false,
+      genderList, booleanList, userStatusList,
+      unionUpdateDialogVisible: false,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -110,55 +111,13 @@ export default {
       total: 0,
       // 工会列表表格数据
       userUnionList: [],
-      // 弹出层标题
-      title: '',
-      // 是否显示弹出层
-      open: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        userId: undefined,
-        name: undefined,
-        status: undefined,
-        unionPayRate: undefined,
-        unionIncomeRate: undefined,
-        allNum: undefined,
-        inDivideNum: undefined,
-        notDivideNum: undefined
+        usercode: undefined,
+        mobile: undefined,
       },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: '工会id不能为空', trigger: 'blur' }
-        ],
-        userId: [
-          { required: true, message: '用户id不能为空', trigger: 'blur' }
-        ],
-        name: [
-          { required: true, message: '工会名称不能为空', trigger: 'blur' }
-        ],
-        status: [
-          { required: true, message: '0=禁用 1=启用不能为空', trigger: 'change' }
-        ],
-        unionPayRate: [
-          { required: true, message: '工会默认二级支付奖励比例不能为空', trigger: 'blur' }
-        ],
-        unionIncomeRate: [
-          { required: true, message: '工会默认二级收益奖励比例不能为空', trigger: 'blur' }
-        ],
-        allNum: [
-          { required: true, message: '全部人数不能为空', trigger: 'blur' }
-        ],
-        inDivideNum: [
-          { required: true, message: '在分成的人数不能为空', trigger: 'blur' }
-        ],
-        notDivideNum: [
-          { required: true, message: '不分成人数不能为空', trigger: 'blur' }
-        ]
-      }
     }
   },
   created() {
@@ -174,27 +133,6 @@ export default {
         this.loading = false
       })
     },
-    // 取消按钮
-    cancel() {
-      this.open = false
-      this.reset()
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: undefined,
-        userId: undefined,
-        name: undefined,
-        status: undefined,
-        unionPayRate: undefined,
-        unionIncomeRate: undefined,
-        createTime: undefined,
-        allNum: undefined,
-        inDivideNum: undefined,
-        notDivideNum: undefined
-      }
-      this.resetForm('form')
-    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1
@@ -211,48 +149,16 @@ export default {
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset()
-      this.open = true
-      this.title = '添加工会列表'
-    },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.loading = true
-      this.reset()
-      const id = row.id || this.ids
-      getUserUnion(id).then(response => {
-        this.loading = false
-        this.form = response.data
-        this.open = true
-        this.title = '修改工会列表'
+      this.unionUpdateDialogVisible = true
+      this.$nextTick(() => {
+        this.$refs.unionUpdateDialog.init(row)
       })
     },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs['form'].validate(valid => {
-        if (valid) {
-          this.buttonLoading = true
-          if (this.form.id != null) {
-            updateUserUnion(this.form).then(response => {
-              this.$modal.msgSuccess('修改成功')
-              this.open = false
-              this.getList()
-            }).finally(() => {
-              this.buttonLoading = false
-            })
-          } else {
-            addUserUnion(this.form).then(response => {
-              this.$modal.msgSuccess('新增成功')
-              this.open = false
-              this.getList()
-            }).finally(() => {
-              this.buttonLoading = false
-            })
-          }
-        }
-      })
+    handleDetail(row){
+      const params = { unionId: row.id };
+      this.$tab.openPage("["+row.name+"]工会详情", '/tool/union-user/index', params);
     },
     /** 删除按钮操作 */
     handleDelete(row) {
@@ -269,12 +175,15 @@ export default {
         this.loading = false
       })
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('cai/userUnion/export', {
-        ...this.queryParams
-      }, `userUnion_${new Date().getTime()}.xlsx`)
-    }
+    handleCommand(command, row) {
+      switch (command) {
+        case "handleDelete":
+          this.handleDelete(row);
+          break;
+        default:
+          break;
+      }
+    },
   }
 }
 </script>
diff --git a/src/views/cai/userUnion/union-update-dialog.vue b/src/views/cai/userUnion/union-update-dialog.vue
new file mode 100644
index 0000000..d085675
--- /dev/null
+++ b/src/views/cai/userUnion/union-update-dialog.vue
@@ -0,0 +1,96 @@
+<template>
+  <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="700px" append-to-body>
+    <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-form-item label="昵称" prop="nickname">
+        <el-input v-model="form.nickname" placeholder="" disabled />
+      </el-form-item>
+      <el-form-item label="手机号" prop="mobile">
+        <el-input v-model="form.mobile" placeholder="" disabled />
+      </el-form-item>
+      <el-form-item label="蜜瓜号" prop="usercode">
+        <el-input v-model="form.usercode" placeholder="" disabled />
+      </el-form-item>
+      <el-form-item label="开启提成" prop="enableRate">
+        <el-radio-group v-model="form.enableRate">
+          <el-radio :label="true">开启</el-radio>
+          <el-radio :label="false">关闭</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="默认提成" prop="defaultIncomeRate">
+        <el-input v-model="form.defaultIncomeRate" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="open = false">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import {getUserUnion, updateUserUnion} from "@/api/cai/userUnion";
+
+export default {
+  components: {
+  },
+  data () {
+    return {
+      open: false,
+      title: '',
+      form:{
+        id: undefined,
+        nickname: undefined,
+        mobile: undefined,
+        usercode: undefined,
+        defaultIncomeRate: undefined,
+        enableRate: undefined,
+      },
+      // 表单校验
+      rules: {
+        enableRate: [
+          { required: true, message: "数据不能为空", trigger: "blur" }
+        ],
+        defaultIncomeRate: [
+          { required: true, message: "数据不能为空", trigger: "blur" }
+        ],
+      },
+      buttonLoading: false,
+    }
+  },
+  created() {
+  },
+  methods: {
+    init (row) {
+      let id = row.id;
+      this.form.id = id || undefined;
+      this.title = "修改工会配置";
+      this.open = true;
+      this.$nextTick(() => {
+        this.$refs['form'].resetFields();
+        getUserUnion(id).then(response => {
+          this.form = response.data;
+          this.form.nickname = row.nickname;
+          this.form.usercode = row.usercode;
+          this.form.mobile = row.mobile;
+        });
+      })
+    },
+    // 表单提交
+    submitForm () {
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          this.buttonLoading = true;
+          updateUserUnion(this.form).then(data => {
+            this.$modal.msgSuccess("修改成功");
+            this.buttonLoading = false;
+            this.open = false
+            this.$emit('refreshDataList')
+          }).finally(() => {
+            this.buttonLoading = false;
+          });
+        }
+      })
+    },
+  }
+}
+</script>