修改集点活动

src/views/system/pointActivitiesConf/index.vue

@@ -9,31 +9,31 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="集点所需的消费次数" prop="pointsRequired">
+      <el-form-item label="优惠券名称" prop="couponName">
         <el-input
-          v-model="queryParams.pointsRequired"
+          v-model="queryParams.couponName"
           clearable
-          placeholder="请输入集点所需的消费次数"
+          placeholder="请输入已优惠券名称"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="每次消费的时间间隔(小时)" prop="timeInterval">
+      <el-form-item label="消费次数" prop="pointsRequired">
         <el-input
-          v-model="queryParams.timeInterval"
+          v-model="queryParams.pointsRequired"
           clearable
-          placeholder="请输入每次消费的时间间隔(小时)"
+          placeholder="请输入消费次数"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="优惠券Id" prop="couponId">
+      <el-form-item label="时间间隔" prop="timeInterval">
         <el-input
-          v-model="queryParams.couponId"
+          v-model="queryParams.timeInterval"
           clearable
-          placeholder="请输入优惠券Id"
+          placeholder="请输入每次消费的时间间隔(小时)"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="优惠券的领取期限 (天)" prop="collectionDeadline">
+      <el-form-item label="领取期限" prop="collectionDeadline">
         <el-input
           v-model="queryParams.collectionDeadline"
           clearable
@@ -41,7 +41,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="优惠券的使用期限 (天)" prop="couponDuration">
+      <el-form-item label="使用期限" prop="couponDuration">
         <el-input
           v-model="queryParams.couponDuration"
           clearable
@@ -49,7 +49,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="集点活动的重置周期 (月)" prop="collectionResetPeriod">
+      <el-form-item label="重置周期" prop="collectionResetPeriod">
         <el-input
           v-model="queryParams.collectionResetPeriod"
           clearable
@@ -67,14 +67,6 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="是否删除(0:否,1:是)" prop="isDelete">
-        <el-input
-          v-model="queryParams.isDelete"
-          clearable
-          placeholder="请输入是否删除(0:否,1:是)"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -133,20 +125,19 @@
 
     <el-table v-loading="loading" :data="pointActivitiesConfList" @selection-change="handleSelectionChange">
       <el-table-column align="center" type="selection" width="55"/>
-      <el-table-column align="center" label="主键" prop="id"/>
       <el-table-column align="center" label="配置名称" prop="name"/>
-      <el-table-column align="center" label="集点所需的消费次数" prop="pointsRequired"/>
-      <el-table-column align="center" label="每次消费的时间间隔(小时)" prop="timeInterval"/>
-      <el-table-column align="center" label="优惠券Id" prop="couponId"/>
-      <el-table-column align="center" label="优惠券的领取期限 (天)" prop="collectionDeadline"/>
-      <el-table-column align="center" label="优惠券的使用期限 (天)" prop="couponDuration"/>
-      <el-table-column align="center" label="集点活动的重置周期 (月)" prop="collectionResetPeriod"/>
+      <el-table-column align="center" label="消费次数" prop="pointsRequired"/>
+      <el-table-column align="center" label="消费间隔(小时)" prop="timeInterval"/>
+      <!--      <el-table-column align="center" label="优惠券Id" prop="couponId"/>-->
+      <el-table-column align="center" label="优惠券名称" prop="couponName"/>
+      <el-table-column align="center" label="领取期限 (天)" prop="collectionDeadline"/>
+      <el-table-column align="center" label="使用期限 (天)" prop="couponDuration"/>
+      <el-table-column align="center" label="重置周期 (月)" prop="collectionResetPeriod"/>
       <el-table-column align="center" label="是否开启" prop="isOpen">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.store_is_use_coupon" :value="scope.row.isOpen"/>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="是否删除(0:否,1:是)" prop="isDelete"/>
       <el-table-column align="center" label="备注" prop="remark"/>
       <el-table-column align="center" class-name="small-padding fixed-width" label="操作">
         <template slot-scope="scope">
@@ -264,6 +255,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         name: null,
+        couponName: null,
         pointsRequired: null,
         timeInterval: null,
         couponId: null,