diff --git a/fuintAdmin/src/views/member/manage.vue b/fuintAdmin/src/views/member/manage.vue
index dfcac771f..ebcdfd5d2 100644
--- a/fuintAdmin/src/views/member/manage.vue
+++ b/fuintAdmin/src/views/member/manage.vue
@@ -1,286 +1,385 @@
 <template>
   <div class="content">
     <div class="tab-box">
-      <div class="tab_" :class="{active:index== tabindex }" @click="getindex(index)" v-for="(item,index) in  tabs"  :key="index">
-        {{item.name}}
+      <div class="tab_" :class="{active:index== tabindex }" @click="getindex(index)" v-for="(item,index) in  tabs"
+           :key="index">
+        {{ item.name }}
       </div>
     </div>
 
-    <div class="cot-box" v-if="tabindex==0" >
-      <div class="d-s-b">
-        <div class="d-s">
-          <el-input v-model="input" placeholder="请输入内容" style="margin-right: 15px;width: 185px"></el-input>
-          <el-date-picker
-            v-model="value"
-            type="datetime"
-            placeholder="选择日期时间">
-          </el-date-picker>
-        </div>
-        <div class="d-s">
-          <el-button type="primary" icon="el-icon-search">搜索</el-button>
-          <el-button  icon="el-icon-refresh-right" >重置</el-button>
-          <el-button type="primary" >新增分组</el-button>
-        </div>
-      </div>
-<!--      -->
-      <el-table
-        :data="tableData"
-        border
-        style="width: 100%">
-        <el-table-column type="index" width="50" align="center" label="序号"/>
-        <el-table-column
-          prop="date"
-          label="分组名称"
-          width="180">
-        </el-table-column>
-        <el-table-column
-          prop="name"
-          label="备注"
-          width="180">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          label="会员数量">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          label="会员占比">
-        </el-table-column>
-        <el-table-column align="center" prop="status" label="状态">
-          <template slot-scope="scope">
-            <el-switch
-              v-model="scope.row.status"
-              active-value="qy"
-              inactive-value="jy"
-              active-color="#13ce66"
-              inactive-color="#ff4949">
-            </el-switch>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          label="创建人">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          label="创建时间">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          label="更新时间">
-        </el-table-column>
-        <el-table-column align="center" label="操作" width="120">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              @click="handleUpdate(scope.row)"
-            >修改</el-button>
-            <el-button
-              size="mini"
-              type="text"
-              @click="handleRecharge(scope.row)"
-            >删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <div class="cot-box" v-if="tabindex==1" >
-      <div class="d-s-b">
-        <div class="d-s">
-          <el-input v-model="input" placeholder="请输入内容" style="margin-right: 15px;width: 185px"></el-input>
-          <el-date-picker
-            v-model="value"
-            type="datetime"
-            placeholder="选择日期时间">
-          </el-date-picker>
-        </div>
-        <div class="d-s">
-          <el-button type="primary" icon="el-icon-search">搜索</el-button>
-          <el-button  icon="el-icon-refresh-right" >重置</el-button>
-          <el-button type="primary" >新增定时群发</el-button>
-        </div>
+    <div class="cot-box" v-if="tabindex==0">
+      <div>
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
+
+          <el-form-item label="" prop="groupName" style="width: 180px">
+            <el-input
+              v-model="queryParams.groupName"
+              placeholder="请输入分组名称"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="">
+            <el-date-picker
+              v-model="beginTime"
+              style="width: 160px"
+              type="date"
+              placeholder="开始日期">
+            </el-date-picker>
+            至
+            <el-date-picker
+              v-model="endTime"
+              style="width: 160px"
+              type="date"
+              placeholder="结束日期">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item style="float: right">
+            <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button type="primary" @click="handleAdd">新增分组</el-button>
+          </el-form-item>
+
+        </el-form>
       </div>
       <!--      -->
-      <el-table
-        :data="tableData"
-        border
-        style="width: 100%">
-        <el-table-column type="index" width="50" align="center" label="序号"/>
-        <el-table-column
-          prop="date"
-          label="活动名称"
-          width="180">
-        </el-table-column>
-        <el-table-column
-          prop="name"
-          label="活动时间"
-          width="180">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          label="发送频次">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          label="群发会员">
-        </el-table-column>
-
-        <el-table-column
-          prop="address"
-          label="群发礼品">
-        </el-table-column>
-        <el-table-column
-          prop="status"
-          label="活动状态">
-          <template slot-scope="scope">
-           <div v-if="scope.row.status == 0" style="color: #FF7E00">未开始</div>
-            <div v-if="scope.row.status == 1" style="color: #00CAFF">进行中</div>
-            <div v-if="scope.row.status == 2" style="color: #0DC291">已结束</div>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          label="创建人">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          label="创建时间">
-        </el-table-column>
-        <el-table-column align="center" label="操作" width="120">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              @click="handleUpdate(scope.row)"
-            >修改</el-button>
-            <el-button
-              size="mini"
-              type="text"
-              @click="handleRecharge(scope.row)"
-            >删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
+      <div style="height: 70vh;overflow: auto">
+        <el-table
+          :data="userGroupList"
+          border
+          style="width: 100%">
+          <el-table-column type="index" width="50" align="center" label="序号"/>
+          <el-table-column prop="groupName" label="分组名称" width="180"></el-table-column>
+          <el-table-column prop="remark" label="备注" width="180"></el-table-column>
+          <el-table-column prop="address" label="会员数量"></el-table-column>
+          <el-table-column prop="address" label="会员占比"></el-table-column>
+          <el-table-column align="center" prop="status" label="状态">
+            <template slot-scope="scope">
+              <el-switch
+                v-model="scope.row.status"
+                active-value="qy"
+                inactive-value="jy"
+                active-color="#13ce66"
+                inactive-color="#ff4949">
+              </el-switch>
+            </template>
+          </el-table-column>
+          <el-table-column prop="accountName" label="创建人"></el-table-column>
+          <el-table-column prop="createTime" label="创建时间"></el-table-column>
+          <el-table-column prop="updateTime" label="更新时间"></el-table-column>
+          <el-table-column align="center" label="操作" width="120">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                @click="handleUpdate(scope.row)"
+              >修改
+              </el-button>
+              <el-button
+                size="mini"
+                type="text"
+                @click="handleDelete(scope.row)"
+              >删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.page"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
     </div>
-    <div class="cot-box" v-if="tabindex==2" >
-      <div class="d-s-b">
-        <div class="d-s">
-          <el-input v-model="input" placeholder="请输入内容" style="margin-right: 15px;width: 185px"></el-input>
-          <el-date-picker
-            v-model="value"
-            type="datetime"
-            placeholder="选择日期时间">
-          </el-date-picker>
-        </div>
-        <div class="d-s">
-          <el-button type="primary" icon="el-icon-search">搜索</el-button>
-          <el-button  icon="el-icon-refresh-right" >重置</el-button>
+    <div class="cot-box" v-if="tabindex==1">
+      <div>
+        <el-form :model="queryParams1" ref="queryForm" size="small" :inline="true" label-width="120px">
 
-        </div>
+          <el-form-item label="" prop="groupName" style="width: 180px">
+            <el-input
+              v-model="queryParams1.groupName"
+              placeholder="请输入活动名称"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="">
+            <el-date-picker
+              v-model="beginTime1"
+              style="width: 160px"
+              type="date"
+              placeholder="开始日期">
+            </el-date-picker>
+            至
+            <el-date-picker
+              v-model="endTime1"
+              style="width: 160px"
+              type="date"
+              placeholder="结束日期">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item style="float: right">
+            <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button type="primary" @click="handleAdd">新增定时群发</el-button>
+          </el-form-item>
+
+        </el-form>
       </div>
       <!--      -->
-      <el-table
-        :data="tableData"
-        border
-        style="width: 100%">
-        <el-table-column type="index" width="50" align="center" label="序号"/>
-        <el-table-column
-          prop="date"
-          label="活动名称"
-          width="180">
-        </el-table-column>
-        <el-table-column
-          prop="name"
-          label="群发礼品"
-          width="180">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          label="群发方式">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          label="群发内容">
-        </el-table-column>
+      <div style="height: 70vh;overflow: auto">
+        <el-table
+          :data="massSendList"
+          border
+          style="width: 100%">
+          <el-table-column type="index" width="50" align="center" label="序号"/>
+          <el-table-column prop="name" label="活动名称" width="180"></el-table-column>
+          <el-table-column prop="activityTime" label="活动时间" width="180"></el-table-column>
+          <el-table-column prop="sendFrequency" label="发送频次"></el-table-column>
+          <el-table-column prop="address" label="群发会员"></el-table-column>
 
-        <el-table-column
-          prop="address"
-          label="群发会员数量">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          label="成功数量">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          label="失败数量">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          label="状态">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          label="已领取数量">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          label="已核销数量">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          label="未核销数量">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          label="操作人员">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          label="群发时间">
-        </el-table-column>
-        <el-table-column align="center" label="操作" width="120">
-          <template slot-scope="scope">
-
-            <el-button
-              size="mini"
-              type="text"
-              @click="handleRecharge(scope.row)"
-            >删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
+          <el-table-column prop="senfGift" label="群发礼品"></el-table-column>
+          <el-table-column prop="status" label="活动状态">
+            <template slot-scope="scope">
+              <div v-if="scope.row.status == 0" style="color: #FF7E00">未开始</div>
+              <div v-if="scope.row.status == 1" style="color: #00CAFF">进行中</div>
+              <div v-if="scope.row.status == 2" style="color: #0DC291">已结束</div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="accountName" label="创建人"></el-table-column>
+          <el-table-column prop="createTime" label="创建时间"></el-table-column>
+          <el-table-column align="center" label="操作" width="120">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                v-if="scope.row.status == 0"
+                @click="handleUpdate(scope.row)"
+              >修改
+              </el-button>
+              <el-button
+                size="mini"
+                type="text"
+                @click="handleDelete(scope.row)"
+              >删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <pagination
+        v-show="total1>0"
+        :total="total1"
+        :page.sync="queryParams1.page"
+        :limit.sync="queryParams1.pageSize"
+        @pagination="getList1"
+      />
     </div>
+    <div class="cot-box" v-if="tabindex==2">
+      <div >
+        <el-form :model="queryParams2" ref="queryForm" size="small" :inline="true" label-width="120px">
+
+          <el-form-item label="" prop="groupName" style="width: 180px">
+            <el-select v-model="queryParams2.status" placeholder="请选择">
+              <el-option label="已发送" value="0"></el-option>
+              <el-option label="发送失败" value="1"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="">
+            <el-date-picker
+              v-model="beginTime2"
+              style="width: 160px"
+              type="date"
+              placeholder="开始日期">
+            </el-date-picker>
+            至
+            <el-date-picker
+              v-model="endTime2"
+              style="width: 160px"
+              type="date"
+              placeholder="结束日期">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item style="float: right">
+            <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
+
+        </el-form>
+      </div>
+      <!--      -->
+      <div>
+        <el-table
+          :data="massSendRecordList"
+          border
+          style="width: 100%">
+          <el-table-column type="index" width="50" align="center" label="序号"/>
+          <el-table-column prop="activityName" label="活动名称" width="180"> </el-table-column>
+          <el-table-column prop="sendGift" label="群发礼品" width="180"> </el-table-column>
+          <el-table-column prop="sendWay" label="群发方式"> </el-table-column>
+          <el-table-column prop="address" label="群发内容"> </el-table-column>
+
+          <el-table-column prop="userNum" label="群发会员数量"> </el-table-column>
+          <el-table-column prop="successNum" label="成功数量"> </el-table-column>
+          <el-table-column prop="failNum" label="失败数量"> </el-table-column>
+          <el-table-column prop="status" label="状态"> </el-table-column>
+          <el-table-column prop="address" label="已领取数量"> </el-table-column>
+          <el-table-column prop="address" label="已核销数量"> </el-table-column>
+          <el-table-column prop="address" label="未核销数量"> </el-table-column>
+          <el-table-column prop="accountName" label="操作人员"> </el-table-column>
+          <el-table-column prop="createTime" label="群发时间"> </el-table-column>
+          <el-table-column align="center" label="操作" width="120">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                @click="handleDelete(scope.row)"
+              >删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <pagination
+        v-show="total2>0"
+        :total="total2"
+        :page.sync="queryParams2.page"
+        :limit.sync="queryParams2.pageSize"
+        @pagination="getList2"
+      />
+    </div>
+
+
+    <!-- 添加或修改对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="30%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+
+        <el-form-item label="分组名称" prop="labelName">
+          <el-input v-model="form.labelName" placeholder="请输入分组名称" maxlength="30"/>
+        </el-form-item>
+
+        <el-form-item label="会员等级" prop="paymentType">
+          <el-select v-model="form.paymentType" placeholder="请选择会员等级" style="width: 100%">
+            <el-option label="现金" value="CASH"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="会员标签" prop="paymentType">
+          <el-select v-model="form.paymentType" placeholder="请选择会员标签（多选）" style="width: 100%">
+            <el-option label="现金" value="CASH"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="会员性别" prop="paymentType">
+          <el-select v-model="form.paymentType" placeholder="请选择会员标签（多选）" style="width: 100%">
+            <el-option label="现金" value="CASH"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="会员年龄" prop="paymentType">
+          <el-input placeholder="请输入内容" v-model="form.age">
+            <template slot="append">.com</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="会员余额" prop="paymentType">
+          <el-input placeholder="请输入内容" v-model="form.age">
+            <template slot="append">.com</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="会员积分" prop="paymentType">
+          <el-input placeholder="请输入内容" v-model="form.age">
+            <template slot="append">.com</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="充值次数" prop="paymentType">
+          <el-input placeholder="请输入内容" v-model="form.age">
+            <template slot="append">.com</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="充值金额" prop="paymentType">
+          <el-input placeholder="请输入内容" v-model="form.age">
+            <template slot="append">.com</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="消费周期" prop="paymentType">
+          <el-select v-model="form.paymentType" placeholder="请选择会员标签（多选）" style="width: 100%">
+            <el-option label="现金" value="CASH"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="消费油品" prop="paymentType">
+          <el-select v-model="form.paymentType" placeholder="请选择会员标签（多选）" style="width: 100%">
+            <el-option label="现金" value="CASH"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="消费次数" prop="paymentType">
+          <el-input placeholder="请输入内容" v-model="form.age">
+            <template slot="append">.com</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="消费金额" prop="paymentType">
+          <el-input placeholder="请输入内容" v-model="form.age">
+            <template slot="append">.com</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="平均消费" prop="paymentType">
+          <el-input placeholder="请输入内容" v-model="form.age">
+            <template slot="append">.com</template>
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="状态" prop="status">
+          <el-switch
+            v-model="form.status"
+            active-value="qy"
+            inactive-value="jy"
+            active-color="#13ce66"
+            inactive-color="#ff4949">
+          </el-switch>
+        </el-form-item>
+
+        <el-form-item label="备注" >
+          <el-input v-model="form.remark" placeholder="请输入备注" type="textarea"/>
+        </el-form-item>
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 <script>
+import {addUserGroup, deleteUserGroup, editUserGroup, getUserGroup, listUserGroup} from "@/api/userGroup/usergroup";
+import {listUserMassSend} from "@/api/userGroup/userMassSend";
+import {listUserMassSendRecord} from "@/api/userGroup/userMassSendRecord";
+
 export default {
   data() {
     return {
-      tabindex:0,
+      tabindex: 0,
       tableData: [{
-        status:0,
+        status: 0,
         date: '2016-05-02',
         name: '王小虎',
         address: '上海市普陀区金沙江路 1518 弄'
       }, {
-        status:0,
+        status: 0,
         date: '2016-05-04',
         name: '王小虎',
         address: '上海市普陀区金沙江路 1517 弄'
       }, {
-        status:0,
+        status: 0,
         date: '2016-05-01',
         name: '王小虎',
         address: '上海市普陀区金沙江路 1519 弄'
       }, {
-        status:0,
+        status: 0,
         date: '2016-05-03',
         name: '王小虎',
         address: '上海市普陀区金沙江路 1516 弄'
       }],
-      input:'',
+      input: '',
       value: '',
       tabs: [
         {
@@ -292,24 +391,180 @@ export default {
         {
           name: "群发记录",
         }
-      ]
+      ],
+      total: 0,
+      queryParams: {
+        page: 1,
+        pageSize: 10
+      },
+      beginTime: "",
+      endTime: "",
+      userGroupList: [],
+      total1: 0,
+      queryParams1: {
+        page: 1,
+        pageSize: 10
+      },
+      beginTime1: "",
+      endTime1: "",
+      massSendList: [],
+      total2: 0,
+      queryParams2: {
+        page: 1,
+        pageSize: 10
+      },
+      beginTime2: "",
+      endTime2: "",
+      massSendRecordList: [],
+      title:'',
+      open:false,
+      form:{},
+      // 表单校验
+      rules: {
+        labelName: [
+          {required: true, message: "标签名称不能为空", trigger: "blur"},
+        ],
+        status: [
+          {required: true, message: "状态不能为空", trigger: "blur"}
+        ]
+      }
     };
   },
+  created() {
+    this.getList()
+  },
   methods: {
-    getindex(index){
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 提交按钮
+    submitForm: function () {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (!this.form.id) {
+            addUserGroup(this.form).then(res => {
+              this.$message.success("添加成功")
+              this.open = false
+              this.queryParams.page = 1;
+              this.getList()
+            })
+          } else {
+            editUserGroup(this.form).then(res => {
+              this.$message.success("修改成功")
+              this.open = false
+              this.queryParams.page = 1;
+              this.getList()
+            })
+          }
+        }
+      });
+    },
+    getList() {
+      let dateRange = []
+      if (this.beginTime && this.endTime) {
+        dateRange.push(this.beginTime.toLocaleDateString())
+        dateRange.push(this.endTime.toLocaleDateString())
+      }
+      listUserGroup(this.addDateRange(this.queryParams, dateRange)).then(res => {
+        this.userGroupList = res.data.records
+        this.total = res.data.total
+      })
+    },
+    getList1() {
+      let dateRange = []
+      if (this.beginTime1 && this.endTime1) {
+        dateRange.push(this.beginTime1.toLocaleDateString())
+        dateRange.push(this.endTime1.toLocaleDateString())
+      }
+      listUserMassSend(this.addDateRange(this.queryParams1, dateRange)).then(res => {
+        this.massSendList = res.data.records
+        this.total1 = res.data.total
+      })
+    },
+    getList2() {
+      let dateRange = []
+      if (this.beginTime2 && this.endTime2) {
+        dateRange.push(this.beginTime2.toLocaleDateString())
+        dateRange.push(this.endTime2.toLocaleDateString())
+      }
+      listUserMassSendRecord(this.addDateRange(this.queryParams2, dateRange)).then(res => {
+        this.massSendRecordList = res.data.records
+        this.total2 = res.data.total
+      })
+    },
+    // 修改按钮操作
+    handleUpdate(row) {
+      this.reset();
+      getUserGroup(row.id).then(res => {
+        this.open = true;
+        this.form = res.data;
+        this.title = "修改会员标签"
+      })
+    },
+    // 表单重置
+    reset() {
+      this.resetForm("form");
+    },
+    // 删除按钮操作
+    handleDelete(row) {
+      const name = row.labelName || this.id;
+      this.$modal.confirm('是否删除本条数据，删除后无法恢复！').then(function () {
+        return deleteUserGroup(row.id);
+      }).then(() => {
+        this.queryParams.page = 1
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      });
+    },
+    // 新增按钮操作
+    handleAdd() {
+      this.reset();
+      this.form = {
+        status: "qy"
+      }
+      this.open = true;
+      this.title = "新增会员标签";
+    },
+    // 搜索按钮操作
+    handleQuery() {
+      this.queryParams.page = 1;
+      this.getList();
+    },
+    // 重置按钮操作
+    resetQuery() {
+      this.dateRange = [];
+      this.queryParams = {
+        page: 1,
+        pageSize: 10,
+      }
+      this.beginTime = ''
+      this.endTime = ''
+      this.handleQuery();
+    },
+    getindex(index) {
       this.tabindex = index
+      if (index==0){
+        this.getList()
+      }else if (index==1){
+        this.getList1()
+      }else if (index==2){
+        this.getList2()
+      }
     }
   }
 }
 </script>
 <style scoped lang="scss">
-.content{
+.content {
   background: #f5f7f8;
   width: 100%;
   height: 100vh;
 }
 
-.tab-box{
+.tab-box {
   width: 100%;
   height: 40px;
   background: #fff;
@@ -318,7 +573,8 @@ export default {
   margin-bottom: 25px;
 
 }
-.tab_{
+
+.tab_ {
   width: 75px;
   height: 100%;
   //border-bottom: 2px solid #FF770F;
@@ -331,11 +587,13 @@ export default {
   margin-left: 50px;
   cursor: pointer;
 }
-.active{
+
+.active {
   border-bottom: 2px solid #FF770F !important;
   color: #FF770F !important;
 }
-.cot-box{
+
+.cot-box {
   width: 98%;
   border-radius: 8px;
   background: #fff;
@@ -343,14 +601,16 @@ export default {
   padding: 20px;
   margin: 0 auto;
 }
-.d-s-b{
+
+.d-s-b {
   width: 100%;
   display: flex;
   align-items: center;
   justify-content: space-between;
   margin-bottom: 25px;
 }
-.d-s{
+
+.d-s {
   display: flex;
   align-items: center;
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/entity/UserMassSendRecord.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/entity/UserMassSendRecord.java
index 021e0936b..3fda74a70 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/entity/UserMassSendRecord.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/entity/UserMassSendRecord.java
@@ -44,7 +44,7 @@ public class UserMassSendRecord extends BaseEntity implements Serializable {
     /**
      * 群发礼品：0、积分；1、优惠券；2、成长值
      */
-    private String senfGift;
+    private String sendGift;
     /**
      * 群发方式：0、短信消息
      */
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/mapper/xml/UserMassSendRecordMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/mapper/xml/UserMassSendRecordMapper.xml
index d0ae9cfb7..c1cef5066 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/mapper/xml/UserMassSendRecordMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userGroup/mapper/xml/UserMassSendRecordMapper.xml
@@ -16,8 +16,8 @@
             <if test="entity.status != null and entity.status != ''">
                 and umsr.status = #{entity.status}
             </if>
-            <if test="entity.name != null and entity.name != ''">
-                and ums.name like concat('%', #{entity.name}, '%')
+            <if test="entity.activityName != null and entity.activityName != ''">
+                and ums.name like concat('%', #{entity.activityName}, '%')
             </if>
             <if test="entity.params.beginTime != null and entity.params.beginTime != ''"><!-- 开始时间检索 -->
                 and date_format(ums.create_time,'%y%m%d') &gt;= date_format(#{entity.params.beginTime},'%y%m%d')