diff --git a/src/api/cai/user.js b/src/api/cai/user.js
index 9dfcb99..aa7bab3 100644
--- a/src/api/cai/user.js
+++ b/src/api/cai/user.js
@@ -9,6 +9,14 @@ export function listUser(query) {
   })
 }
 
+export function resetUserPassword(data) {
+  return request({
+    url: '/cai/user/resetPwd',
+    method: 'post',
+    data: data
+  })
+}
+
 // 查询用户详细
 export function getUser(id) {
   return request({
diff --git a/src/api/cai/userGreet.js b/src/api/cai/userGreet.js
new file mode 100644
index 0000000..f979a60
--- /dev/null
+++ b/src/api/cai/userGreet.js
@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 查询群发审核列表
+export function listUserGreet(query) {
+  return request({
+    url: '/cai/userGreet/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询群发审核详细
+export function getUserGreet(id) {
+  return request({
+    url: '/cai/userGreet/' + id,
+    method: 'get'
+  })
+}
+
+// 新增群发审核
+export function addUserGreet(data) {
+  return request({
+    url: '/cai/userGreet',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改群发审核
+export function updateUserGreet(data) {
+  return request({
+    url: '/cai/userGreet',
+    method: 'put',
+    data: data
+  })
+}
+
+export function batchAuditUserGreet(data) {
+  return request({
+    url: '/cai/userGreet/batch/audit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除群发审核
+export function delUserGreet(id) {
+  return request({
+    url: '/cai/userGreet/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/constant/statusMap.js b/src/constant/statusMap.js
index 0a95455..ad602ef 100644
--- a/src/constant/statusMap.js
+++ b/src/constant/statusMap.js
@@ -110,6 +110,12 @@ export const anchorApplyStatus = [
   { value: 3, label: '审核通过',listClass: listClass.primary},
 ]
 
+export const auditStatusList = [
+  { value: 1, label: '审核中',listClass: listClass.info},
+  { value: 2, label: '审核不通过',listClass: listClass.danger},
+  { value: 3, label: '审核通过',listClass: listClass.primary},
+]
+
 /**
  * 开启视频接听
  */
diff --git a/src/views/cai/smsVerify/index.vue b/src/views/cai/smsVerify/index.vue
index f27baa2..e65ae95 100644
--- a/src/views/cai/smsVerify/index.vue
+++ b/src/views/cai/smsVerify/index.vue
@@ -22,6 +22,7 @@
     <el-table v-loading="loading" :data="smsVerifyList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
 <!--      <el-table-column label="状态" align="center" prop="status" />-->
+      <el-table-column label="类型" align="center" prop="typeDesc" />
       <el-table-column label="接收号码" align="center" prop="receivePhone" />
       <el-table-column label="验证码" align="center" prop="verifyCode" />
       <el-table-column label="发送平台" align="center" prop="sendInterface" />
@@ -41,7 +42,7 @@
 </template>
 
 <script>
-import { listSmsVerify, getSmsVerify, delSmsVerify, addSmsVerify, updateSmsVerify } from "@/api/cai/smsVerify";
+import {listSmsVerify} from "@/api/cai/smsVerify";
 
 export default {
   name: "SmsVerify",
diff --git a/src/views/cai/user/index.vue b/src/views/cai/user/index.vue
index eb64c2d..7540c4e 100644
--- a/src/views/cai/user/index.vue
+++ b/src/views/cai/user/index.vue
@@ -126,6 +126,7 @@
             <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>
           </el-dropdown>
@@ -147,7 +148,7 @@
 </template>
 
 <script>
-import { delUser, listUser } from '@/api/cai/user'
+import {delUser, listUser, resetUserPassword} from '@/api/cai/user'
 import {authList, genderList, userStatusList, isAnchorList, videoStatusList} from '@/constant/statusMap'
 import UserAddUpdateDialog from '@/views/cai/user/user-add-update-dialog.vue'
 import UserInfoDialog from "@/views/cai/user/user-info-dialog";
@@ -246,11 +247,31 @@ export default {
         this.loading = false;
       });
     },
+    /** 重置密码按钮操作 */
+    handleResetPwd(row) {
+      this.$prompt('请输入"' + row.usercode + '"的新密码', "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        closeOnClickModal: false,
+        inputPattern: /^.{5,20}$/,
+        inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
+      }).then(({ value }) => {
+        resetUserPassword({
+          userId: row.id,
+          password: value,
+        }).then(response => {
+          this.$modal.msgSuccess("修改成功，新密码是：" + value);
+        });
+      }).catch(() => {});
+    },
     handleCommand(command, row) {
       switch (command) {
         case "handleDelete":
           this.handleDelete(row);
           break;
+        case "handleResetPwd":
+          this.handleResetPwd(row);
+          break;
         default:
           break;
       }
diff --git a/src/views/cai/userGreet/index.vue b/src/views/cai/userGreet/index.vue
new file mode 100644
index 0000000..c559498
--- /dev/null
+++ b/src/views/cai/userGreet/index.vue
@@ -0,0 +1,226 @@
+<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 label="审核状态" prop="auditStatus">
+        <el-select v-model="queryParams.auditStatus" placeholder="审核状态" clearable size="small">
+          <el-option
+              v-for="dict in auditStatusList"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+              @keyup.enter.native="handleQuery"
+          />
+        </el-select>
+      </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">
+      <el-col :span="1.5">
+        <el-button
+            type="success"
+            plain
+            icon="el-icon-edit"
+            size="mini"
+            :disabled="multiple"
+            @click="handleBatchAudit(3)"
+            v-hasPermi="['cai:userGreet:edit']"
+        >批量审核通过
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="userGreetList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="ID" align="center" prop="id"/>
+      <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="auditStatus">
+        <template v-slot="scope">
+          <cai-dict-tag :options="auditStatusList" :value="scope.row.auditStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="标题" align="center" prop="title" show-overflow-tooltip/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
+        <template v-slot="scope">
+          <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              v-if="scope.row.auditStatus === 1"
+              @click="handleAudit(scope.row,3)"
+              v-hasPermi="['cai:userGreet:edit']"
+          >通过
+          </el-button>
+          <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              v-if="scope.row.auditStatus === 1"
+              @click="handleAudit(scope.row,2)"
+              v-hasPermi="['cai:userGreet:edit']"
+          >不通过
+          </el-button>
+          <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+              v-hasPermi="['cai:userGreet: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"
+    />
+
+  </div>
+</template>
+
+<script>
+import {batchAuditUserGreet, delUserGreet, listUserGreet, updateUserGreet} from "@/api/cai/userGreet";
+import {auditStatusList} from "@/constant/statusMap";
+
+export default {
+  name: "UserGreet",
+  data() {
+    return {
+      auditStatusList,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 群发审核表格数据
+      userGreetList: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        auditStatus: 1,
+        mobile: undefined,
+        usercode: undefined,
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询群发审核列表 */
+    getList() {
+      this.loading = true;
+      listUserGreet(this.queryParams).then(response => {
+        this.userGreetList = 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
+    },
+    handleAudit(row,auditStatus){
+      let message = auditStatus === 3 ? "通过" : "不通过";
+      this.$modal.confirm('是否确认'+message+'群发审核编号为"' + row.id + '"的数据项？').then(() => {
+        this.loading = true;
+        return updateUserGreet({
+          id: row.id,
+          auditStatus: auditStatus
+        });
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("操作成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    handleBatchAudit(auditStatus){
+      const ids = this.ids;
+      this.$modal.confirm('是否确认批量审核通过群发审核编号为"' + ids + '"的数据项？').then(() => {
+        this.loading = true;
+        return batchAuditUserGreet({
+          "ids": ids,
+          auditStatus: auditStatus
+        });
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("操作成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除群发审核编号为"' + ids + '"的数据项？').then(() => {
+        this.loading = true;
+        return delUserGreet(ids);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+  }
+};
+</script>
diff --git a/src/views/cai/userUnion/index.vue b/src/views/cai/userUnion/index.vue
index 322a6eb..b219a62 100644
--- a/src/views/cai/userUnion/index.vue
+++ b/src/views/cai/userUnion/index.vue
@@ -36,7 +36,6 @@
           <cai-dict-tag :options="booleanList" :value="scope.row.enableRate"/>
         </template>
       </el-table-column>
-      <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"/>