Browse Source

优惠券和bug修复

yuhongqi 3 weeks ago
parent
commit
2c3752edb1

+ 70 - 0
src/api/live/liveCoupon.js

@@ -0,0 +1,70 @@
+import request from '@/utils/request'
+
+// 查询优惠券列表
+export function listStoreCoupon(query) {
+  return request({
+    url: '/live/coupon/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询优惠券详细
+export function getStoreCoupon(couponId) {
+  return request({
+    url: '/live/coupon/' + couponId,
+    method: 'get'
+  })
+}
+
+// 新增优惠券
+export function addStoreCoupon(data) {
+  return request({
+    url: '/live/coupon',
+    method: 'post',
+    data: data
+  })
+}
+export function publishCoupon(data) {
+  return request({
+    url: '/live/coupon/publish',
+    method: 'post',
+    data: data
+  })
+}
+
+export function batchPublishCoupon(data) {
+  return request({
+    url: '/live/coupon/batchPublish',
+    method: 'post',
+    data: data
+  })
+}
+
+
+
+// 修改优惠券
+export function updateStoreCoupon(data) {
+  return request({
+    url: '/live/coupon',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除优惠券
+export function delStoreCoupon(couponId) {
+  return request({
+    url: '/live/coupon/' + couponId,
+    method: 'delete'
+  })
+}
+
+// 导出优惠券
+export function exportStoreCoupon(query) {
+  return request({
+    url: '/live/coupon/export',
+    method: 'get',
+    params: query
+  })
+}

+ 63 - 0
src/api/live/liveCouponIssue.js

@@ -0,0 +1,63 @@
+import request from '@/utils/request'
+
+
+// 查询可用套餐优惠券列表
+export function listAllAvailable(query) {
+  return request({
+    url: '/live/coupon/issue/listAllAvailable',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询优惠券领取列表
+export function listStoreCouponIssue(query) {
+  return request({
+    url: '/live/coupon/issue/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询优惠券领取详细
+export function getStoreCouponIssue(id) {
+  return request({
+    url: '/live/coupon/issue/' + id,
+    method: 'get'
+  })
+}
+
+// 新增优惠券领取
+export function addStoreCouponIssue(data) {
+  return request({
+    url: '/live/coupon/issue',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改优惠券领取
+export function updateStoreCouponIssue(data) {
+  return request({
+    url: '/live/coupon/issue',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除优惠券领取
+export function delStoreCouponIssue(id) {
+  return request({
+    url: '/live/coupon/issue/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出优惠券领取
+export function exportStoreCouponIssue(query) {
+  return request({
+    url: '/live/coupon/issue/export',
+    method: 'get',
+    params: query
+  })
+}

+ 53 - 0
src/api/live/liveCouponIssueUser.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询优惠券用户领取记录列表
+export function listStoreCouponIssueUser(query) {
+  return request({
+    url: '/live/coupon/issue/user/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询优惠券用户领取记录详细
+export function getStoreCouponIssueUser(id) {
+  return request({
+    url: '/live/coupon/issue/user/' + id,
+    method: 'get'
+  })
+}
+
+// 新增优惠券用户领取记录
+export function addStoreCouponIssueUser(data) {
+  return request({
+    url: '/live/coupon/issue/user',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改优惠券用户领取记录
+export function updateStoreCouponIssueUser(data) {
+  return request({
+    url: '/live/coupon/issue/user',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除优惠券用户领取记录
+export function delStoreCouponIssueUser(id) {
+  return request({
+    url: '/live/coupon/issue/user/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出优惠券用户领取记录
+export function exportStoreCouponIssueUser(query) {
+  return request({
+    url: '/live/coupon/issue/user/export',
+    method: 'get',
+    params: query
+  })
+}

+ 53 - 0
src/api/live/liveCouponUser.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询优惠券发放记录列表
+export function listStoreCouponUser(query) {
+  return request({
+    url: '/live/coupon/user/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询优惠券发放记录详细
+export function getStoreCouponUser(id) {
+  return request({
+    url: '/live/coupon/user/' + id,
+    method: 'get'
+  })
+}
+
+// 新增优惠券发放记录
+export function addStoreCouponUser(data) {
+  return request({
+    url: '/live/coupon/user',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改优惠券发放记录
+export function updateStoreCouponUser(data) {
+  return request({
+    url: '/live/coupon/user',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除优惠券发放记录
+export function delStoreCouponUser(id) {
+  return request({
+    url: '/live/coupon/user/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出优惠券发放记录
+export function exportStoreCouponUser(query) {
+  return request({
+    url: '/live/coupon/user/export',
+    method: 'get',
+    params: query
+  })
+}

+ 109 - 0
src/views/live/components/addBatchPublish.vue

@@ -0,0 +1,109 @@
+<template>
+    <div>
+            <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+                <el-form-item label="优惠券数量" >
+                    {{ids.length}}个
+                </el-form-item>
+                <el-form-item label="优惠券开始时间" prop="startTime">
+                <el-date-picker clearable size="small" style="width: 200px"
+                    v-model="form.startTime"
+                    type="date"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择开始时间">
+                </el-date-picker>
+                </el-form-item>
+                <el-form-item label="优惠券结束时间" prop="limitTime">
+                <el-date-picker clearable size="small" style="width: 200px"
+                    v-model="form.limitTime"
+                    type="date"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择结束时间">
+                </el-date-picker>
+                </el-form-item>
+                <el-form-item label="优惠券领取数量" prop="totalCount">
+                <el-input-number v-model="form.totalCount" :min="0" placeholder="请输入优惠券领取数量" />
+                </el-form-item>
+            </el-form>
+             <div   class="footer">
+            <el-button type="primary" @click="submitForm">确 定</el-button>
+            <el-button @click="cancel">取 消</el-button>
+        </div>
+    </div>
+</template>
+
+<script>
+    import { batchPublishCoupon  } from "@/api/live/liveCoupon";
+export default {
+        name: "batchPublish",
+        data() {
+            return {
+                statusOptions:[],
+                ids:[],
+                // 表单参数
+                form: {},
+                // 表单校验
+                rules: {
+                    totalCount: [
+                    { required: true, message: "数量不能为空", trigger: "blur" }
+                    ],
+                    startTime: [
+                    { required: true, message: "开始时间不能为空", trigger: "blur" }
+                    ],
+                    limitTime: [
+                    { required: true, message: "结束时间不能为空", trigger: "blur" }
+                    ],
+                }
+            };
+        },
+        created() {
+
+        },
+        methods: {
+            cancel(){
+                this.$emit('close');
+            },
+            handleBatch(ids) {
+                console.log(ids)
+                this.ids=ids;
+
+            },
+            /** 提交按钮 */
+            submitForm() {
+                this.$refs["form"].validate(valid => {
+                    if (valid) {
+                        this.myloading = this.$loading({
+                            lock: true,
+                            text: '处理中...',
+                            spinner: 'el-icon-loading',
+                            background: 'rgba(0, 0, 0, 0.7)'
+                        });
+                        this.form.ids=this.ids.toString();
+                        batchPublishCoupon(this.form).then(response => {
+                            this.myloading.close()
+                            if (response.code === 200) {
+                                this.msgSuccess("发布成功");
+                                this.$emit('close');
+                            }
+                        });
+                    }
+                });
+            },
+        }
+    };
+</script>
+<style lang="scss" scoped>
+.contents{
+    height: 100%;
+    background-color: #fff;
+    padding: 20px;
+
+}
+.footer{
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+}
+</style>
+
+
+

+ 6 - 1
src/views/live/live/index.vue

@@ -90,7 +90,12 @@
           <el-tag v-if="scope.row.status == 4">直播回放中</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="主播ID" align="center" prop="talentId" />
+      <el-table-column label="公司名称" align="center" prop="companyName" >
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.companyName">{{ scope.row.companyName }}</el-tag>
+          <el-tag v-else>总台</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="直播类型" align="center" prop="liveType">
         <template slot-scope="scope">
           <el-tag type="danger" v-if="scope.row.liveType == 1">直播</el-tag>

+ 1 - 0
src/views/live/liveConfig/liveLotteryConf.vue

@@ -688,6 +688,7 @@ export default {
       }
       getLiveLotteryConf(lotteryId).then(response => {
         this.form = response.data;
+        this.form.require = this.form.require + ""
         this.open = true;
         this.title = "修改直播抽奖配置";
       });

+ 11 - 1
src/views/live/liveConfig/preview.vue

@@ -156,10 +156,10 @@ export default {
       addLiveVideo(doParam).then(response => {
         if (response.code == 200) {
           this.$message.success("上传成功");
-          this.getLiveVideo()
         } else {
           this.$message.warning(response.msg);
         }
+        this.getLiveVideo()
         this.$refs.form.resetFields();
       })
     },
@@ -253,6 +253,16 @@ export default {
     },
     // 上传视频处理
     handleUploadVideo() {
+      this.videoList = [];
+      this.form = {
+        uploadType: 1,
+        isTranscode:0,
+        transcodeFileKey:null,
+        videoUrl: null,
+      };
+      setTimeout(() => {
+        this.$refs.videoUpload.reset();
+      }, 100);
       // 模拟上传视频逻辑,实际需调用上传组件或接口
       this.open = true;
     },

+ 514 - 0
src/views/live/liveCoupon/index.vue

@@ -0,0 +1,514 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="优惠券名称" prop="title">
+        <el-input
+          v-model="queryParams.title"
+          placeholder="请输入优惠券名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="优惠券面值" prop="couponPrice">
+        <el-input
+          v-model="queryParams.couponPrice"
+          placeholder="请输入优惠券面值"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="优惠券类型" prop="type">
+        <el-select   v-model="queryParams.type" placeholder="请选择优惠券类型" clearable size="small" >
+         <el-option
+                v-for="item in couponTypeOptions"
+                :key="item.dictValue"
+                :label="item.dictLabel"
+                :value="item.dictValue"
+              />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="套餐分类" v-if="queryParams.type==1" prop="packageCateIds">
+          <el-select v-model="queryParams.packageCateIds" clearable placeholder="请选择套餐分类" size="small">
+            <el-option
+              v-for="item in cateOptions"
+              :key="item.dictValue"
+              :label="item.dictLabel"
+              :value="item.dictValue">
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="创建时间">
+            <el-date-picker v-model="dateRange" size="small" style="width: 220px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+        </el-form-item>
+      <el-form-item>
+        <el-button type="cyan" 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="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['store:storeCoupon:add']"
+        >新增</el-button>
+      </el-col>
+
+      <el-col :span="1.5">
+        <el-button
+        type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['store:storeCoupon:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          size="mini"
+          :disabled="multiple"
+          @click="handleBatchPublish"
+          v-hasPermi="['store:storeCoupon:batchPublish']"
+        >批量发布</el-button>
+      </el-col>
+
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table height="500" border v-loading="loading" :data="storeCouponList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="优惠券表ID" align="center" prop="couponId" />
+      <el-table-column label="优惠券名称" align="center" prop="title" />
+      <el-table-column label="优惠券面值" align="center" prop="couponPrice" />
+      <el-table-column label="最低消费" align="center" prop="useMinPrice" />
+      <el-table-column label="优惠券有效期限(天)" align="center" prop="couponTime" />
+      <el-table-column label="排序" align="center" prop="sort" />
+      <el-table-column label="类型" align="center" prop="type" >
+          <template slot-scope="scope">
+              <el-tag prop="type" v-for="(item, index) in couponTypeOptions"    v-if="scope.row.type==item.dictValue">{{item.dictLabel}}</el-tag>
+          </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="status" >
+          <template slot-scope="scope">
+              <el-tag prop="status" v-for="(item, index) in statusOptions"    v-if="scope.row.status==item.dictValue">{{item.dictLabel}}</el-tag>
+          </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+           <el-button
+            v-if="scope.row.status==1"
+            size="mini"
+            type="text"
+            @click="handlePublish(scope.row)"
+            v-hasPermi="['store:storeCoupon:publish']"
+          >发布</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['store:storeCoupon:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['store:storeCoupon: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"
+    />
+
+    <!-- 添加或修改优惠券对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="150px">
+        <el-form-item label="优惠券名称" prop="title">
+          <el-input v-model="form.title" placeholder="请输入优惠券名称" />
+        </el-form-item>
+        <el-form-item label="面值" prop="couponPrice">
+          <el-input-number v-model="form.couponPrice" :min="0" placeholder="请输入优惠券面值" />
+        </el-form-item>
+        <el-form-item label="最低消费金额" prop="useMinPrice">
+          <el-input-number v-model="form.useMinPrice" :min="0" placeholder="请输入最低消费金额" />
+        </el-form-item>
+        <el-form-item label="优惠券有效期限(天)" prop="couponTime">
+          <el-input-number v-model="form.couponTime" :min="0" placeholder="请输入优惠券有效期限" />
+        </el-form-item>
+        <el-form-item label="排序" prop="sort">
+          <el-input-number v-model="form.sort"  :min="0" placeholder="请输入排序" />
+        </el-form-item>
+        <el-form-item label="类型" prop="type">
+            <el-radio-group v-model="form.type">
+              <el-radio :label="item.dictValue" v-for="item in couponTypeOptions" >{{item.dictLabel}}</el-radio>
+            </el-radio-group>
+        </el-form-item>
+        <el-form-item label="套餐分类" v-if="form.type=='1'" prop="packageCateIds">
+          <el-select v-model="form.packageCateIds" multiple placeholder="请选择">
+            <el-option
+              v-for="item in cateOptions"
+              :key="item.dictValue"
+              :label="item.dictLabel"
+              :value="item.dictValue">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="状态">
+            <el-radio-group v-model="form.status">
+              <el-radio :label="item.dictValue" v-for="item in statusOptions" >{{item.dictLabel}}</el-radio>
+            </el-radio-group>
+        </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>
+     <el-dialog :title="publish.title" :visible.sync="publish.open" width="500px" append-to-body>
+      <el-form ref="publishForm" :model="publishForm" :rules="publishRules" label-width="150px">
+        <el-form-item label="优惠券名称" prop="title">
+          <el-input v-model="publishForm.title" disabled   />
+        </el-form-item>
+         <el-form-item label="优惠券开始时间" prop="startTime">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="publishForm.startTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择开始时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="优惠券结束时间" prop="limitTime">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="publishForm.limitTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择结束时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="优惠券领取数量" prop="totalCount">
+          <el-input-number v-model="publishForm.totalCount" :min="0" placeholder="请输入优惠券领取数量" />
+        </el-form-item>
+
+        <el-form-item label="状态">
+            <el-radio-group v-model="publishForm.status">
+              <el-radio :label="item.dictValue" v-for="item in statusOptions" >{{item.dictLabel}}</el-radio>
+            </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitPublishForm">确 定</el-button>
+        <el-button @click="cancelPublish">取 消</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog :title="batchPublish.title" :visible.sync="batchPublish.open" width="500px" append-to-body>
+       <add-batch-publish ref="batchPublish" @close="closeBatchPublish()"></add-batch-publish>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { publishCoupon,listStoreCoupon, getStoreCoupon, delStoreCoupon, addStoreCoupon, updateStoreCoupon, exportStoreCoupon } from "@/api/live/liveCoupon";
+import addBatchPublish from "../components/addBatchPublish.vue";
+export default {
+  name: "StoreCoupon",
+  components:{addBatchPublish},
+  data() {
+    return {
+      cateOptions:[],
+      couponTypeOptions:[],
+      publish:{
+        title:"发布",
+        open:false,
+      },
+      batchPublish:{
+        title:"批量发布",
+        open:false,
+      },
+      dateRange:[],
+      statusOptions:[],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 优惠券表格数据
+      storeCouponList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        title: null,
+        integral: null,
+        couponPrice: null,
+        useMinPrice: null,
+        couponTime: null,
+        sort: null,
+        status: null,
+        productIds: null,
+        type: null,
+        isDel: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        title: [
+          { required: true, message: "优惠券名称不能为空", trigger: "blur" }
+        ],
+        integral: [
+          { required: true, message: "兑换消耗积分值不能为空", trigger: "blur" }
+        ],
+        couponPrice: [
+          { required: true, message: "兑换的优惠券面值不能为空", trigger: "blur" }
+        ],
+        useMinPrice: [
+          { required: true, message: "最低消费多少金额可用优惠券不能为空", trigger: "blur" }
+        ],
+        couponTime: [
+          { required: true, message: "优惠券有效期限不能为空", trigger: "blur" }
+        ],
+        sort: [
+          { required: true, message: "排序不能为空", trigger: "blur" }
+        ],
+        status: [
+          { required: true, message: "状态不能为空", trigger: "blur" }
+        ],
+        createTime: [
+          { required: true, message: "兑换项目添加时间不能为空", trigger: "blur" }
+        ],
+        type: [
+          { required: true, message: "类型不能为空", trigger: "blur" }
+        ],
+        packageCateIds: [
+          { required: true, message: "套餐分类不能为空", trigger: "blur" }
+        ],
+        isDel: [
+          { required: true, message: "是否删除不能为空", trigger: "blur" }
+        ]
+
+
+      },
+      publishForm: {
+        totalCount:0,
+        status:"0"
+      },
+      // 表单校验
+      publishRules: {
+        totalCount: [
+          { required: true, message: "数量不能为空", trigger: "blur" }
+        ],
+        startTime: [
+          { required: true, message: "开始时间不能为空", trigger: "blur" }
+        ],
+        limitTime: [
+          { required: true, message: "结束时间不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getDicts("store_product_package_cate").then((response) => {
+      var item={dictValue:'0',dictLabel:"全部"};
+      this.cateOptions.push(item)
+      this.cateOptions = this.cateOptions.concat(response.data);
+    });
+    this.getDicts("common_status").then((response) => {
+      this.statusOptions = response.data;
+    });
+    this.getDicts("store_coupon_type").then((response) => {
+      this.couponTypeOptions = response.data;
+    });
+
+    this.getList();
+  },
+  methods: {
+    /** 查询优惠券列表 */
+    getList() {
+      this.loading = true;
+      listStoreCoupon(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+        this.storeCouponList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        couponId: null,
+        title: null,
+        integral: null,
+        couponPrice: null,
+        useMinPrice: null,
+        couponTime: null,
+        sort: null,
+        status: "0",
+        type: "0",
+        productIds: null,
+        packageCateIds:[],
+        createTime: null,
+        updateTime: null,
+        isDel: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.couponId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加优惠券";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const couponId = row.couponId || this.ids
+      getStoreCoupon(couponId).then(response => {
+        this.form = response.data;
+        this.form.status = response.data.status.toString();
+        this.form.type = response.data.type.toString();
+        if(this.form.packageCateIds!=null){
+            this.form.packageCateIds=this.form.packageCateIds.split(',')
+          }
+        this.open = true;
+        this.title = "修改优惠券";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if(this.form.packageCateIds!=null){
+            this.form.packageCateIds=this.form.packageCateIds.toString();
+          }
+          if (this.form.couponId != null) {
+            updateStoreCoupon(this.form).then(response => {
+              if (response.code === 200) {
+                this.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              }
+            });
+          } else {
+            addStoreCoupon(this.form).then(response => {
+              if (response.code === 200) {
+                this.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              }
+            });
+          }
+        }
+      });
+    },
+    handleBatchPublish(){
+      this.batchPublish.open = true;
+      var that = this;
+      setTimeout(() => {
+        that.$refs.batchPublish.handleBatch(that.ids);
+      }, 200);
+    },
+    closeBatchPublish(){
+      this.batchPublish.open = false;
+      this.getList();
+    },
+    handlePublish(row){
+      this.publish.open=true;
+      this.publishForm.title=row.title;
+      this.publishForm.couponId=row.couponId;
+    },
+    cancelPublish() {
+      this.publish.open = false;
+      this.reset();
+    },
+    submitPublishForm() {
+      this.$refs["publishForm"].validate(valid => {
+        if (valid) {
+           publishCoupon(this.publishForm).then(response => {
+              if (response.code === 200) {
+                this.msgSuccess("发布成功");
+                this.publish.open = false;
+              }
+            });
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const couponIds = row.couponId || this.ids;
+      this.$confirm('是否确认删除优惠券编号为"' + couponIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delStoreCoupon(couponIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(function() {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有优惠券数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportStoreCoupon(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        }).catch(function() {});
+    },
+
+  }
+};
+</script>

+ 316 - 0
src/views/live/liveCouponIssue/index.vue

@@ -0,0 +1,316 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="优惠券名称" prop="couponName">
+        <el-input
+          v-model="queryParams.couponName"
+          placeholder="请输入优惠券名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="优惠券面值" prop="couponPrice">
+        <el-input
+          v-model="queryParams.couponPrice"
+          placeholder="请输入优惠券面值"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="优惠券类型" prop="couponType">
+        <el-select   v-model="queryParams.couponType" placeholder="请选择优惠券类型" clearable size="small" >
+         <el-option
+                v-for="item in couponTypeOptions"
+                :key="item.dictValue"
+                :label="item.dictLabel"
+                :value="item.dictValue"
+              />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="发布时间">
+            <el-date-picker v-model="dateRange" size="small" style="width: 220px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+        </el-form-item>
+      <el-form-item>
+        <el-button type="cyan" 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="warning"
+          size="mini"
+          @click="handleRefresh"
+        >刷新</el-button>
+      </el-col>
+    </el-row>
+
+    <el-table  height="500" border v-loading="loading" :data="storeCouponIssueList" @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="couponName" />
+      <el-table-column label="优惠券领取开始时间" align="center" prop="startTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="优惠券领取结束时间" align="center" prop="limitTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.limitTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="优惠券面值" align="center" prop="couponPrice" />
+      <el-table-column label="最低消费" align="center" prop="useMinPrice" />
+      <el-table-column label="优惠券有效期限(天)" align="center" prop="couponTime" />
+      <el-table-column label="总数量" align="center" prop="totalCount" />
+      <el-table-column label="已领取数量" align="center" prop="remainCount" />
+      <el-table-column label="类型" align="center" prop="couponType" >
+          <template slot-scope="scope">
+              <el-tag prop="couponType" v-for="(item, index) in couponTypeOptions"    v-if="scope.row.couponType==item.dictValue">{{item.dictLabel}}</el-tag>
+          </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="status" >
+          <template slot-scope="scope">
+              <el-tag prop="status" v-for="(item, index) in statusOptions"    v-if="scope.row.status==item.dictValue">{{item.dictLabel}}</el-tag>
+          </template>
+      </el-table-column>
+      <el-table-column label="发布时间" align="center" prop="createTime" />
+      <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="['store:storeCouponIssue:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['store:storeCouponIssue: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"
+    />
+
+    <!-- 添加或修改优惠券领取对话框 -->
+    <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="状态">
+            <el-radio-group v-model="form.status">
+              <el-radio :label="item.dictValue" v-for="item in statusOptions" >{{item.dictLabel}}</el-radio>
+            </el-radio-group>
+        </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 { listStoreCouponIssue, getStoreCouponIssue, delStoreCouponIssue, addStoreCouponIssue, updateStoreCouponIssue, exportStoreCouponIssue } from "@/api/live/liveCouponIssue";
+
+export default {
+  name: "StoreCouponIssue",
+  data() {
+    return {
+      couponTypeOptions:[],
+      statusOptions:[],
+      dateRange:[],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 优惠券领取表格数据
+      storeCouponIssueList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        couponName: null,
+        couponId: null,
+        couponType: null,
+        startTime: null,
+        endTime: null,
+        totalCount: null,
+        remainCount: null,
+        isPermanent: null,
+        status: null,
+        isDel: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        isPermanent: [
+          { required: true, message: "是否无限张数不能为空", trigger: "blur" }
+        ],
+        status: [
+          { required: true, message: "1 正常 0 未开启 -1 已无效不能为空", trigger: "blur" }
+        ],
+        isDel: [
+          { required: true, message: "1 正常 0 未开启 -1 已无效不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+     this.getDicts("common_status").then((response) => {
+      this.statusOptions = response.data;
+    });
+     this.getDicts("store_coupon_type").then((response) => {
+      this.couponTypeOptions = response.data;
+    });
+    this.getList();
+  },
+  methods: {
+    handleRefresh(){
+      this.getList();
+    },
+    /** 查询优惠券领取列表 */
+    getList() {
+      this.loading = true;
+      listStoreCouponIssue(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+        this.storeCouponIssueList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        couponName: null,
+        couponId: null,
+        couponType: null,
+        startTime: null,
+        endTime: null,
+        totalCount: null,
+        remainCount: null,
+        isPermanent: null,
+        status: 0,
+        isDel: null,
+        createTime: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    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
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加优惠券领取";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getStoreCouponIssue(id).then(response => {
+        this.form = response.data;
+        this.form.status = response.data.status.toString();
+        this.open = true;
+        this.title = "修改优惠券领取";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateStoreCouponIssue(this.form).then(response => {
+              if (response.code === 200) {
+                this.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              }
+            });
+          } else {
+            addStoreCouponIssue(this.form).then(response => {
+              if (response.code === 200) {
+                this.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              }
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除优惠券领取编号为"' + ids + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delStoreCouponIssue(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(function() {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有优惠券领取数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportStoreCouponIssue(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        }).catch(function() {});
+    }
+  }
+};
+</script>

+ 289 - 0
src/views/live/liveCouponIssueUser/index.vue

@@ -0,0 +1,289 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="领取优惠券用户ID" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入领取优惠券用户ID"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="优惠券领取ID" prop="issueId">
+        <el-input
+          v-model="queryParams.issueId"
+          placeholder="请输入优惠券领取ID"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="优惠券领取ID" prop="isDel">
+        <el-input
+          v-model="queryParams.isDel"
+          placeholder="请输入优惠券领取ID"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="cyan" 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="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['store:storeCouponIssueUser:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['store:storeCouponIssueUser:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['store:storeCouponIssueUser:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['store:storeCouponIssueUser:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table  height="500" border v-loading="loading" :data="storeCouponIssueUserList" @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="领取优惠券用户ID" align="center" prop="userId" />
+      <el-table-column label="优惠券领取ID" align="center" prop="issueId" />
+      <el-table-column label="领取时间" align="center" prop="isDel" />
+      <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="['store:storeCouponIssueUser:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['store:storeCouponIssueUser: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"
+    />
+
+    <!-- 添加或修改优惠券用户领取记录对话框 -->
+    <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="优惠券领取ID" prop="issueId">
+          <el-input v-model="form.issueId" placeholder="请输入优惠券领取ID" />
+        </el-form-item>
+        <el-form-item label="优惠券领取ID" prop="isDel">
+          <el-input v-model="form.isDel" placeholder="请输入优惠券领取ID" />
+        </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 { listStoreCouponIssueUser, getStoreCouponIssueUser, delStoreCouponIssueUser, addStoreCouponIssueUser, updateStoreCouponIssueUser, exportStoreCouponIssueUser } from "@/api/live/liveCouponIssueUser";
+
+export default {
+  name: "StoreCouponIssueUser",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 优惠券用户领取记录表格数据
+      storeCouponIssueUserList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userId: null,
+        issueId: null,
+        isDel: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询优惠券用户领取记录列表 */
+    getList() {
+      this.loading = true;
+      listStoreCouponIssueUser(this.queryParams).then(response => {
+        this.storeCouponIssueUserList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        userId: null,
+        issueId: null,
+        createTime: null,
+        updateTime: null,
+        isDel: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    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
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加优惠券用户领取记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getStoreCouponIssueUser(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改优惠券用户领取记录";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateStoreCouponIssueUser(this.form).then(response => {
+              if (response.code === 200) {
+                this.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              }
+            });
+          } else {
+            addStoreCouponIssueUser(this.form).then(response => {
+              if (response.code === 200) {
+                this.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              }
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除优惠券用户领取记录编号为"' + ids + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delStoreCouponIssueUser(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(function() {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有优惠券用户领取记录数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportStoreCouponIssueUser(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        }).catch(function() {});
+    }
+  }
+};
+</script>

+ 293 - 0
src/views/live/liveCouponUser/index.vue

@@ -0,0 +1,293 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
+
+      <el-form-item label="优惠券名称" prop="couponTitle">
+        <el-input
+          v-model="queryParams.couponTitle"
+          placeholder="请输入优惠券名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+       <el-form-item label="状态" prop="status">
+         <el-select   v-model="queryParams.status" placeholder="请选择状态" clearable size="small" >
+         <el-option
+                v-for="item in statusOptions"
+                :key="item.dictValue"
+                :label="item.dictLabel"
+                :value="item.dictValue"
+              />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="领取时间">
+            <el-date-picker v-model="dateRange" size="small" style="width: 220px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="cyan" 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="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['company:companySmsLogs:remove']"
+        >删除</el-button>
+      </el-col> -->
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['store:storeCouponUser:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table   height="500" border   v-loading="loading" :data="storeCouponUserList" @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="nickname" />
+      <el-table-column label="会员手机号" align="center" prop="phone" />
+      <el-table-column label="优惠券名称" align="center" prop="couponTitle" />
+      <el-table-column label="优惠券的面值" align="center" prop="couponPrice" />
+      <el-table-column label="最低消费" align="center" prop="useMinPrice" />
+      <el-table-column label="优惠券结束时间" align="center" prop="limitTime" width="180">
+      </el-table-column>
+      <el-table-column label="领取时间" align="center" prop="createTime" width="180"></el-table-column>
+      <el-table-column label="使用时间" align="center" prop="useTime" width="180">
+      </el-table-column>
+      <!-- <el-table-column label="获取方式" align="center" prop="type" /> -->
+      <el-table-column label="状态" align="center" prop="status" >
+          <template slot-scope="scope">
+              <el-tag prop="status" v-for="(item, index) in statusOptions"    v-if="scope.row.status==item.dictValue">{{item.dictLabel}}</el-tag>
+          </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 { listStoreCouponUser, getStoreCouponUser, delStoreCouponUser, addStoreCouponUser, updateStoreCouponUser, exportStoreCouponUser } from "@/api/live/liveCouponUser";
+
+export default {
+  name: "StoreCouponUser",
+  data() {
+    return {
+      statusOptions:[],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      dateRange:[],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 优惠券发放记录表格数据
+      storeCouponUserList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        couponId: null,
+        userId: null,
+        couponTitle: null,
+        couponPrice: null,
+        useMinPrice: null,
+        endTime: null,
+        useTime: null,
+        type: null,
+        status: null,
+        isFail: null,
+        isDel: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        couponId: [
+          { required: true, message: "兑换的项目id不能为空", trigger: "blur" }
+        ],
+        userId: [
+          { required: true, message: "优惠券所属用户不能为空", trigger: "blur" }
+        ],
+        couponTitle: [
+          { required: true, message: "优惠券名称不能为空", trigger: "blur" }
+        ],
+        couponPrice: [
+          { required: true, message: "优惠券的面值不能为空", trigger: "blur" }
+        ],
+        useMinPrice: [
+          { required: true, message: "最低消费多少金额可用优惠券不能为空", trigger: "blur" }
+        ],
+        createTime: [
+          { required: true, message: "优惠券创建时间不能为空", trigger: "blur" }
+        ],
+        endTime: [
+          { required: true, message: "优惠券结束时间不能为空", trigger: "blur" }
+        ],
+        type: [
+          { required: true, message: "获取方式不能为空", trigger: "change" }
+        ],
+        status: [
+          { required: true, message: "状态不能为空", trigger: "blur" }
+        ],
+        isFail: [
+          { required: true, message: "是否有效不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getDicts("store_coupon_user_status").then((response) => {
+      this.statusOptions = response.data;
+    });
+    this.getList();
+  },
+  methods: {
+    /** 查询优惠券发放记录列表 */
+    getList() {
+      this.loading = true;
+      listStoreCouponUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+        this.storeCouponUserList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        couponId: null,
+        userId: null,
+        couponTitle: null,
+        couponPrice: null,
+        useMinPrice: null,
+        createTime: null,
+        updateTime: null,
+        endTime: null,
+        useTime: null,
+        type: null,
+        status: 0,
+        isFail: null,
+        isDel: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    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
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加优惠券发放记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getStoreCouponUser(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改优惠券发放记录";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateStoreCouponUser(this.form).then(response => {
+              if (response.code === 200) {
+                this.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              }
+            });
+          } else {
+            addStoreCouponUser(this.form).then(response => {
+              if (response.code === 200) {
+                this.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              }
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除优惠券发放记录编号为"' + ids + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delStoreCouponUser(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(function() {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有优惠券发放记录数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportStoreCouponUser(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        }).catch(function() {});
+    }
+  }
+};
+</script>