From 33575a8e95d79b08213b2e3f8b7890d28a07cdd6 Mon Sep 17 00:00:00 2001
From: "@QQNZX" <cccccc420590@163.com>
Date: Tue, 6 Feb 2024 09:10:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fuintAdmin/.env.development                   |    2 +-
 .../src/api/EventMarketing/SaveBlock.js       |    4 +-
 .../views/EventMarketing/CardHolder/index.vue |   14 +-
 .../ManageCard/SaveBlock/index.vue            | 1005 +++++++++++++++++
 .../views/EventMarketing/SaveBlock/index.vue  |  222 ++--
 .../EventMarketing/cardFavorable/index.vue    |    2 +
 .../EventMarketing/yijiancoupon/index.vue     |    1 -
 .../src/main/resources/application.properties |    2 +-
 8 files changed, 1176 insertions(+), 76 deletions(-)
 create mode 100644 fuintAdmin/src/views/EventMarketing/ManageCard/SaveBlock/index.vue

diff --git a/fuintAdmin/.env.development b/fuintAdmin/.env.development
index 53ce3f580..f707cfc86 100644
--- a/fuintAdmin/.env.development
+++ b/fuintAdmin/.env.development
@@ -11,7 +11,7 @@ VUE_APP_BASE_API = '/dev-api'
 VUE_APP_PUBLIC_PATH = '/'
 
 # 后端接口地址
-VUE_APP_SERVER_URL = 'http://192.168.0.178:8008/'
+VUE_APP_SERVER_URL = 'http://192.168.0.196:8081/'
 
 
 
diff --git a/fuintAdmin/src/api/EventMarketing/SaveBlock.js b/fuintAdmin/src/api/EventMarketing/SaveBlock.js
index c3d7c201d..64e972c7c 100644
--- a/fuintAdmin/src/api/EventMarketing/SaveBlock.js
+++ b/fuintAdmin/src/api/EventMarketing/SaveBlock.js
@@ -42,9 +42,9 @@ export function eitList(data) {
   })
 }
 //删除列表
-export function deleteList(id) {
+export function deletedelById(id) {
   return request({
-    url: 'business/marketingActivity/cardValue?idList='+id,
+    url: 'business/marketingActivity/cardValue/delById?id='+id,
     method: 'delete',
 
   })
diff --git a/fuintAdmin/src/views/EventMarketing/CardHolder/index.vue b/fuintAdmin/src/views/EventMarketing/CardHolder/index.vue
index 02db4a9c1..9c41356cf 100644
--- a/fuintAdmin/src/views/EventMarketing/CardHolder/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/CardHolder/index.vue
@@ -2,48 +2,48 @@
   <div class="app-container">
 <!--    <el-card  style="margin-bottom: 20px">-->
 <!--    </el-card>-->
-    <div class="title">油卡</div>
+    <div class="title">电子油卡中心</div>
     <div class="warp-box">
       <div class="k-box" @click="goDetail(1)" >
         <div class="img-box" id="img1">
           <img src="https://club.liantuobank.com/assets/images/market/32.png" >
         </div>
         <div class="size-box">
-          <div class="box-title">储值卡</div>
+          <div class="box-title">电子储值卡</div>
           <div class="js">因为为客户提供更优质的服务取得了突破性进展，“刷卡加油”引领成品油零售市场新潮流</div>
         </div>
       </div>
       <div class="k-box" @click="goDetail(2)">
         <div class="img-box" id="img2"> <img src="https://club.liantuobank.com/assets/images/market/12.png" > </div>
         <div class="size-box">
-          <div class="box-title">礼品卡</div>
+          <div class="box-title">电子礼品卡</div>
           <div class="js">顾客沉淀，充值可获指定奖励,满减提升商品销量和店铺流量 </div>
         </div>
       </div>
       <div class="k-box" @click="goDetail(3)">
         <div class="img-box" id="img3"> <img src="https://club.liantuobank.com/assets/images/market/11.png" >  </div>
         <div class="size-box">
-          <div class="box-title">囤油卡</div>
+          <div class="box-title">电子囤油卡</div>
           <div class="js"> 使用便捷 交易安全 易于管理 节约费用 各地加油 积分增值服务 插卡加油 自动结算 </div>
         </div>
       </div>
     </div>
 <!--    券-->
-    <div class="title">油券</div>
+    <div class="title">电子油券中心</div>
     <div class="warp-box">
       <div class="k-box" @click="goDetail(4)" >
         <div class="img-box" id="img4">
           <img src="https://club.liantuobank.com/assets/images/market/02.png" >
         </div>
         <div class="size-box">
-          <div class="box-title">优惠券</div>
+          <div class="box-title">电子优惠券</div>
           <div class="js">因为为客户提供更优质的服务取得了突破性进展，“刷卡加油”引领成品油零售市场新潮流</div>
         </div>
       </div>
       <div class="k-box" @click="goDetail(5)">
         <div class="img-box" id="img5"> <img src="https://club.liantuobank.com/assets/images/market/26.png" > </div>
         <div class="size-box">
-          <div class="box-title">兑换券</div>
+          <div class="box-title">电子兑换券</div>
           <div class="js">顾客沉淀，充值可获指定奖励,满减提升商品销量和店铺流量 </div>
         </div>
       </div>
diff --git a/fuintAdmin/src/views/EventMarketing/ManageCard/SaveBlock/index.vue b/fuintAdmin/src/views/EventMarketing/ManageCard/SaveBlock/index.vue
new file mode 100644
index 000000000..2a6028a71
--- /dev/null
+++ b/fuintAdmin/src/views/EventMarketing/ManageCard/SaveBlock/index.vue
@@ -0,0 +1,1005 @@
+<template>
+    <div class="app-container">
+<!--      储值卡-->
+          <el-card  style="margin-bottom: 20px">
+            <el-radio-group v-model="isonline" @input="getlist()">
+              <el-radio-button label="0">可用</el-radio-button>
+              <el-radio-button label="1">已下线</el-radio-button>
+            </el-radio-group>
+          </el-card>
+          <el-card  style="margin-bottom: 20px">
+            <div style="margin-bottom: 10px">
+              <el-alert
+                title="当前配置为储值卡活动、按照升数锁价充值活动请在锁价活动列表配置,每个卡类型最多可创建50个充值活动
+                      关于支付即储值功能说明: 功能按照档次大于等于用户实付金额的可充值档次进行处理,不符合规则的档次则无法进行充值"
+                type="info">
+              </el-alert>
+            </div>
+            <div style="margin: 10px 0px">
+              <el-button type="primary" icon="el-icon-plus" @click="addblock()">新增储值卡</el-button>
+            </div>
+            <el-table
+              :data="tableData"
+              align="center"
+              style="width: 100%">
+              <el-table-column
+                prop="groupOriented"
+                label="面向群体"
+                width="140">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.groupOriented == 1">普通群体</span>
+                  <span v-if="scope.row.groupOriented == 2">等级会员</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="活动信息">
+                <el-table-column
+                  prop="rechargeBalance"
+                  label="充值金额"
+                  width="120">
+                </el-table-column>
+                <el-table-column
+                  prop="giftBalance"
+                  label="赠送金额"
+                  width="120">
+                </el-table-column>
+                <el-table-column
+                  prop="points"
+                  label="赠送积分"
+                  width="120">
+                </el-table-column>
+                <el-table-column
+                  prop="growthValue"
+                  label="赠送成长值"
+                  width="120">
+                </el-table-column>
+              </el-table-column>
+              <el-table-column
+                prop="activeTime"
+                label="活动时间"
+                width="200">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.activeTime == 1">不限时间</span>
+                  <span v-if="scope.row.activeTime == 2">自定义时间</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="activityProgress"
+                label="活动进度"
+                width="100">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.activityProgress == 0"> <el-tag>未开始</el-tag></span>
+                  <span v-if="scope.row.activityProgress == 1"> <el-tag>进行中</el-tag></span>
+                  <span v-if="scope.row.activityProgress == 2"> <el-tag type="danger">已结束</el-tag></span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="paymentValue"
+                label="支付即充值"
+                width="100">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.paymentValue == 1"><el-tag>启用</el-tag></span>
+                  <span v-if="scope.row.paymentValue == 2"><el-tag type="danger">禁用</el-tag></span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="activeStatus"
+                label="状态"
+                width="80">
+                <template slot-scope="scope">
+<!--                  <span v-if="scope.row.activeStatus == 1"> <el-tag>在用</el-tag> </span>-->
+<!--                  <span v-if="scope.row.activeStatus == 2"> <el-tag type="success">挂失</el-tag> </span>-->
+<!--                  <span v-if="scope.row.activeStatus == 3"> <el-tag type="danger">停用</el-tag> </span>-->
+                  <el-switch
+                    v-model="scope.row.activeStatus"
+                    :active-value="'1'"
+                    :inactive-value="'2'"
+                    active-color="#409EFF"
+                    inactive-color="#909399"
+                    @change="posteid(scope.row)"
+                  >
+                  </el-switch>
+                </template>
+
+              </el-table-column>
+              <el-table-column
+                prop="participationNo"
+                label="参与次数"
+                width="110">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.participationNo == 0">不限制次数</span>
+                  <span v-if="scope.row.participationNo != 0">{{scope.row.participationNo}} 次</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="sort"
+                label="排序"
+                width="110">
+              </el-table-column>
+              <el-table-column
+                prop="updateTime"
+                label="更新时间"
+                width="150">
+              </el-table-column>
+              <el-table-column
+                prop="date"
+                label="操作"
+                width="150">
+                <template slot-scope="scope">
+                  <el-button
+                    size="mini"
+                    type="text"
+                    icon="el-icon-edit"
+                    @click="handleUpdate(scope.row)"
+                  >修改</el-button>
+
+                  <el-popconfirm
+                    style="margin-left: 5px"
+                    @confirm="handleDelete(scope.row)"
+                    v-if="scope.row.isonline == '0'" title="这是一段内容确定下线吗？">
+                    <el-button
+                      size="mini"
+                      type="text"
+                      icon="el-icon-delete"
+                      slot="reference"
+                    >下线</el-button>
+                  </el-popconfirm>
+
+                </template>
+
+              </el-table-column>
+            </el-table>
+            <pagination
+              v-show="total>0"
+              :total="total"
+              :page.sync="pageNo"
+              :limit.sync="pageSize"
+              @pagination="getlist"
+            />
+          </el-card>
+      <el-drawer
+        title="添加-储值卡"
+        :visible.sync="dialog"
+        size="50%"
+        ref="drawer"
+      >
+        <div class="demo-drawer__content">
+          <el-form :model="form"  :rules="rules" :inline="true" :label-position="labelPosition"  >
+            <el-form-item label="面向群体" prop="groupOriented" :label-width="formLabelWidth" >
+              <el-radio-group v-model="form.groupOriented">
+                <el-radio label="1">不限群体</el-radio>
+                <el-radio label="2">会员等级</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-row :gutter="20">
+              <el-col :span="12"> <el-form-item label="会员等级"  prop="region"  :label-width="formLabelWidth"  v-if="form.groupOriented == '2' " >
+                <el-select v-model="form.membershipLevel"  multiple  placeholder="会员等级"   >
+                  <el-option v-for="(item,index) in vipname" :key="index" :label="item.name" :value="item.id.toString()"></el-option>
+                </el-select>
+              </el-form-item></el-col>
+
+
+            </el-row>
+            <el-row :gutter="20">
+            <el-col :span="14">
+              <el-form-item   label="充值金额" :label-width="formLabelWidth" prop="rechargeBalance">
+                <el-input type="number" v-model="form.rechargeBalance" autocomplete="off">
+                  <template slot="append">元</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+              <el-col :span="14">
+                <el-form-item label="赠送金额" :label-width="formLabelWidth" prop="giftBalance">
+                  <el-input type="number" v-model="form.giftBalance" autocomplete="off">
+                    <template slot="append">元</template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="14">
+                <el-form-item label="赠送积分" :label-width="formLabelWidth" prop="points">
+                  <el-input type="number" v-model="form.points" autocomplete="off">
+                    <template slot="append">分</template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="14">
+                <el-form-item  label="赠送成长值" :label-width="formLabelWidth" prop="growthValue">
+                  <el-input type="number" v-model="form.growthValue" autocomplete="off">
+                    <template slot="append">成长值</template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+<!--              <el-col :span="14">
+                <el-form-item label="赠送加油金" :label-width="formLabelWidth" prop="refuelMoney">
+                  <el-input type="number" v-model="form.refuelMoney" autocomplete="off">
+                    <template slot="append">元</template>
+                  </el-input>
+                </el-form-item>
+              </el-col>-->
+            </el-row>
+
+<!--            <el-form-item label="赠送特权" :label-width="formLabelWidth" prop="resource">
+              <el-radio-group v-model="form.resource">
+                <el-radio label="1">显示</el-radio>
+                <el-radio label="2">隐藏</el-radio>
+              </el-radio-group>
+            </el-form-item>-->
+
+<!--            <el-form-item label="参与次数" :label-width="formLabelWidth">
+              <el-input-number v-model="form.participationNo" controls-position="right" :min="1" :max="10"></el-input-number>
+            </el-form-item>-->
+            <div>
+              <el-form-item label="员工提成" :label-width="formLabelWidth" prop="employeeCommission">
+                <el-radio-group v-model="form.employeeCommission">
+                  <el-radio label="1">仅会员首次充值提成</el-radio>
+                  <el-radio label="2">会员每次充值提成</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </div>
+            <div>
+            <el-form-item label="提成类型" :label-width="formLabelWidth" prop="royaltyType">
+              <el-radio-group v-model="form.royaltyType">
+                <el-radio label="1">无</el-radio>
+                <el-radio label="2">按提成金额</el-radio>
+                <el-radio label="3">按充值金额*提成比例</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            </div>
+            <el-form-item label="提成金额" v-if="form.royaltyType == 2" :label-width="formLabelWidth" prop="amountCommission">
+              <el-input v-model="form.amountCommission" autocomplete="off">
+                <template slot="append">元</template>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="提成比例" v-if="form.royaltyType == 3" :label-width="formLabelWidth" prop="percentageCommissions">
+              <el-input v-model="form.percentageCommissions" autocomplete="off">
+                <template slot="append">%</template>
+              </el-input>
+            </el-form-item>
+            <div>
+            <el-form-item label="活动时间" :label-width="formLabelWidth" prop="activeTime">
+              <el-radio-group v-model="form.activeTime">
+                <el-radio label="1">不限时间</el-radio>
+                <el-radio label="2">自定义时间</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            </div>
+            <el-form-item label="时间范围" v-if="form.activeTime == 2" :label-width="formLabelWidth" prop="startTime">
+                <el-date-picker
+                  v-model="form.startTime"
+                  type="datetime"
+                  placeholder="开始日期">
+                </el-date-picker>
+              -
+              <el-date-picker
+                v-model="form.endTime"
+                type="datetime"
+                placeholder="结束日期">
+              </el-date-picker>
+            </el-form-item>
+            <div>
+            <el-form-item label="活动状态" :label-width="formLabelWidth" prop="activeStatus">
+              <el-radio-group v-model="form.activeStatus">
+                <el-radio label="1">启用</el-radio>
+                <el-radio label="2">禁用</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            </div>
+<!--            <el-form-item label="支付储值" :label-width="formLabelWidth" prop="paymentValue">
+              <el-radio-group v-model="form.paymentValue">
+                <el-radio label="1">启用</el-radio>
+                <el-radio label="2">禁用</el-radio>
+              </el-radio-group>
+            </el-form-item>-->
+<!--            <el-form-item label="排序" :label-width="formLabelWidth" prop="sort">
+              <el-input-number v-model="form.sort" controls-position="right"  :min="1" :max="10"></el-input-number>
+            </el-form-item>-->
+          </el-form>
+<!--          赠送卡券-->
+          <!--        选择优惠券-->
+          <div class="xh-box"   >
+            <div class="box-bt"> <div >选择优惠券</div>  <el-button type="primary" icon="el-icon-plus" @click="getlistFavorable()" >新增</el-button>  </div>
+            <div style="margin: 10px 0px">
+              <el-table
+                :data="youhuiquanlist"
+                border
+                style="width: 100%">
+                <el-table-column
+                  prop="giftCardName"
+                  label="卡券名称"
+                  width="0">
+                </el-table-column>
+                <el-table-column
+                  prop="giftCardType"
+                  label="券类型"
+                  width="80">
+                  <template slot-scope="scope">
+                    <span v-if="scope.row.giftCardType == 0" >油品券</span>
+                    <span v-if="scope.row.giftCardType == 1"  >商品券</span>
+                    <span v-if="scope.row.giftCardType == 2"  >通用券</span>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="date"
+                  label="券详情"
+                  width="80">
+                  <template slot-scope="scope">
+                    <span>{{scope.row.giftCardDetail}}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="date"
+                  label="有效期（天）"
+                  width="240">
+                  <template slot-scope="scope">
+                    <span v-if="scope.row.timeType == 0" >    <el-input-number v-model="scope.row.validityZero" controls-position="right"  :min="1" :max="9999"></el-input-number>天 </span>
+                    <span v-if="scope.row.timeType == 1" >   <el-input-number v-model="scope.row.validityOne" controls-position="right"  :min="1" :max="9999"></el-input-number>天 </span>
+                    <span v-if="scope.row.timeType == 2" >     <el-input-number v-model="scope.row.validityTwo" controls-position="right"  :min="1" :max="9999"></el-input-number>天 </span>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="date"
+                  label="数量"
+                  width="240">
+                  <template slot-scope="scope">
+                    <el-input-number v-model="scope.row.giftCardTotal" controls-position="right"  :min="1" :max="9999"></el-input-number>
+                  </template>
+                </el-table-column>
+
+                <el-table-column
+                  prop="address"
+                  label="操作">
+                  <template slot-scope="scope">
+                    <el-button
+                      size="mini"
+                      type="text"
+                      @click="deletedata(scope.row)"
+                    >删除</el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+
+            </div>
+          </div>
+          <!--        选择兑换券-->
+          <div class="xh-box"    >
+            <div class="box-bt"> <div >选择兑换券</div>  <el-button type="primary" icon="el-icon-plus" @click="getlistExchange()" >新增</el-button>  </div>
+            <div style="margin: 10px 0px">
+              <el-table
+                :data="duihuanquanlist"
+                border
+                style="width: 100%">
+                <el-table-column
+                  prop="giftCardName"
+                  label="卡券名称"
+                  width="80">
+                </el-table-column>
+                <el-table-column
+                  prop="date"
+                  label="券类型"
+                  width="80">
+                  <template slot-scope="scope">
+                    <span v-if="scope.row.giftCardType == 0" >油品券</span>
+                    <span v-if="scope.row.giftCardType == 1"  >商品券</span>
+                    <span v-if="scope.row.giftCardType == 2"  >通用券</span>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="date"
+                  label="券详情"
+                  width="80">
+                  <template slot-scope="scope">
+                    <span>{{scope.row.giftCardDetail}}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="date"
+                  label="有效期（天）"
+                  width="240">
+                  <template slot-scope="scope">
+                    <span  >    <el-input-number v-model="scope.row.giftCardTime" controls-position="right"  :min="1" :max="9999"></el-input-number>天 </span>
+
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="date"
+                  label="数量"
+                  width="240">
+                  <template slot-scope="scope">
+                    <el-input-number v-model="scope.row.giftCardTotal" controls-position="right"  :min="1" :max="9999"></el-input-number>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="address"
+                  label="操作"
+
+                >
+                  <template slot-scope="scope">
+                    <el-button
+                      size="mini"
+                      type="text"
+                      @click="deletedhdata(scope.row)"
+                    >删除</el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+
+            </div>
+          </div>
+<!--          附加特权-->
+          <div class="box-popup">
+            <div class="dis-bit">附加特权</div>
+            <el-input
+              type="textarea"
+              placeholder="请输入内容"
+              maxlength="225"
+              v-model="form.fringeBenefit"
+              show-word-limit
+            >
+            </el-input>
+          </div>
+          <div class="demo-drawer__footer">
+            <el-button @click="cancelForm">取 消</el-button>
+            <el-button type="primary" @click="submitForm('ruleForm')"
+                       v-if="form.isonline == '0'" >
+              确定</el-button>
+          </div>
+        </div>
+      </el-drawer>
+<!--      弹窗-->
+      <el-dialog title="优惠券列表" :visible.sync="dialogTableVisible">
+        <div style="display: flex;align-items: center; margin-bottom: 20px ">
+          <el-input v-model="youhuiquan.name" placeholder="优惠券名称"></el-input>
+          <el-button type="primary" icon="el-icon-search" @click="getlistFavorable" >搜索</el-button>
+        </div>
+        <el-table
+          :data="tableDatayh"
+          border
+          style="width: 100%">
+          <el-table-column
+            prop="name"
+            label="卡券名称"
+            width="100">
+          </el-table-column>
+          <el-table-column
+            prop="date"
+            label="券类型"
+            width="100">
+            <template slot-scope="scope">
+              <span v-if="scope.row.type == 0" >油品券</span>
+              <span v-if="scope.row.type == 1"  >商品券</span>
+              <span v-if="scope.row.type == 2"  >通用券</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="date"
+            label="券详情"
+            width="100">
+            <template slot-scope="scope">
+              <span>满{{scope.row.satisfiedAmount}}减 {{scope.row.discountAmount}}元 </span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="date"
+            label="有效期（天）"
+            width="180">
+            <template slot-scope="scope">
+              <span v-if="scope.row.timeType == 0" >{{scope.row.validityZero}}天 </span>
+              <span v-if="scope.row.timeType == 1" >{{scope.row.validityOne}}天 </span>
+              <span v-if="scope.row.timeType == 2" >{{scope.row.validityTwo}}天 </span>
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            prop="address"
+            label="操作">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                @click="chosedata(scope.row)"
+              >选择</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div><pagination
+          v-show="ytotal>0"
+          :total="ytotal"
+          :page.sync="youhuiquan.pageNum"
+          :limit.sync="youhuiquan.pageSize"
+          @pagination="getlistFavorable"
+        /></div>
+      </el-dialog>
+      <!--    兑换券列表-->
+      <el-dialog title="兑换券列表" :visible.sync="dialogTableVisibledh">
+        <div style="display: flex;align-items: center; margin-bottom: 20px ">
+          <el-input v-model="duihuanquan.name" placeholder="兑换券名称"></el-input>
+          <el-button type="primary" icon="el-icon-search" @click="getlistExchange" >搜索</el-button>
+        </div>
+
+        <el-table
+          :data="tableDatadh"
+          border
+          style="width: 100%">
+          <el-table-column
+            prop="name"
+            label="卡券名称"
+            width="100">
+          </el-table-column>
+          <el-table-column
+            prop="date"
+            label="券类型"
+            width="100">
+            <template slot-scope="scope">
+              <span v-if="scope.row.type == 0" >油品券</span>
+              <span v-if="scope.row.type == 1"  >商品券</span>
+              <span v-if="scope.row.type == 2"  >通用券</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="date"
+            label="使用说明"
+            width="100">
+            <template slot-scope="scope">
+              <span>{{scope.row.useInstructions}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="date"
+            label="有效期（天）"
+            width="180">
+            <template slot-scope="scope">
+              <span  >{{scope.row.validity}}天 </span>
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            prop="address"
+            label="操作">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                @click="Favorabledata(scope.row)"
+              >选择</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div><pagination
+          v-show="dtotal>0"
+          :total="dtotal"
+          :page.sync="duihuanquan.pageNum"
+          :limit.sync="duihuanquan.pageSize"
+          @pagination="getlistExchange"
+        /></div>
+      </el-dialog>
+
+    </div>
+</template>
+
+<script>
+  import { getList,addList,eitList,deleteList,listUserGrade,mmc } from "@/api/EventMarketing/SaveBlock";
+  import {getActiveConsumption, listExchange, listFavorable} from "@/api/EventMarketing/activeConsumption";
+  export default {
+    name: 'index',
+    data(){
+      return{
+        labelPosition:'left',
+        pdidlist:[],//判断优惠券id
+        pddhidlist:[],//判断兑换券id
+        youhuiquanlist:[],
+        duihuanquanlist:[],
+        dialogTableVisible:false,//优惠券
+        dialogTableVisibledh:false,//兑换券
+        tableDatadh:[],//兑换券
+        tableDatayh:[],//优惠券
+        //请求优惠券列表时的参数
+        youhuiquan:{
+          name:'',
+          pageNum: 1,
+          pageSize: 10,
+        },
+        ytotal:0,
+        //请求兑换券列表时的参数
+        duihuanquan:{
+          name:'',
+          pageNum: 1,
+          pageSize: 10,
+          total:0
+        },
+        dtotal:0,
+        isonline: '0',
+        dialog: false,
+        rules: {
+          participationNo: [
+            { required: true, message: '不能为空', trigger: 'blur' },
+          ],
+          name: [
+            { required: true, message: '不能为空', trigger: 'blur' },
+          ],
+
+          refuelMoney: [
+            { required: true, message: '不能为空', trigger: 'blur' },
+          ],
+          growthValue: [
+            { required: true, message: '不能为空', trigger: 'blur' },
+          ],
+          points: [
+            { required: true, message: '不能为空', trigger: 'blur' },
+          ],
+          giftBalance: [
+            { required: true, message: '不能为空', trigger: 'blur' },
+          ],
+          rechargeBalance: [
+            { required: true, message: '不能为空', trigger: 'blur' },
+          ],
+          groupOriented: [
+            { required: true, message: '不能为空', trigger: 'blur' },
+          ],
+          sort: [
+            { required: true, message: '不能为空', trigger: 'blur' },
+          ],
+          employeeCommission: [
+            { required: true, message: '不能为空', trigger: 'blur' },
+          ],
+          royaltyType: [
+            { required: true, message: '不能为空', trigger: 'blur' },
+          ],
+          resource: [
+            { required: true, message: '不能为空', trigger: 'blur' },
+          ],
+          activeTime: [
+            { required: true, message: '不能为空', trigger: 'blur' },
+          ],
+          activeStatus: [
+            { required: true, message: '不能为空', trigger: 'blur' },
+          ],
+          paymentValue: [
+            { required: true, message: '不能为空', trigger: 'blur' },
+          ],
+          amountCommission: [
+            { required: true, message: '不能为空', trigger: 'blur' },
+          ],
+          percentageCommissions: [
+            { required: true, message: '不能为空', trigger: 'blur' },
+          ],
+
+        },
+        form: {
+          sort:1,
+          groupOriented:'1',
+          rechargeBalance:'',
+          giftBalance:'',
+          points:'',
+          growthValue:'',
+          refuelMoney:'',
+          participationNo:0,
+          employeeCommission:'1',
+          royaltyType:'1',
+          isonline:0,
+          resource:'1',
+          activeTime:'1',
+          activeStatus:'1',
+          paymentValue:'1',
+          amountCommission:'',
+          membershipLevel:[],
+          percentageCommissions:'',
+          fringeBenefit:'',
+          cardValueChildList:[],
+        },
+        tableDatas: [],
+        formLabelWidth: '100px',
+        timer: null,
+        options: [ ],
+        total:0,
+        pageNo:1,
+        pageSize:10,
+        value: '',
+        tableData: [ ],
+        vipname:[]
+
+      }
+    },
+    mounted() {
+      this.getlist()
+    },
+    methods:{
+      // 请求兑换券
+      getlistExchange(){
+        this.tableDatadh = []
+        listExchange(this.duihuanquan).then(res=>{
+          if(res.code==200){
+            this.dialogTableVisibledh = true
+            this.tableDatadh  = res.data.records
+            this.dtotal = res.data.total
+          }
+        })
+
+      },
+      // 请求优惠券
+      getlistFavorable(){
+        this.tableDatayh = []
+        listFavorable(this.youhuiquan).then(res=>{
+          if(res.code == 200){
+            this.dialogTableVisible = true
+            this.tableDatayh  = res.data.records
+            this.ytotal = res.data.total
+          }
+
+        })
+      },
+      // 兑换券券列表选择
+      Favorabledata(row){
+        this.dialogTableVisibledh = false
+        if(this.pddhidlist.indexOf(row.id)>-1 ){
+          this.$message.error("该兑换卡券已存在")
+          return
+        }
+        this.pddhidlist.push(row.id)
+        console.log(row)
+        let data ={
+          activeGift: 2, //活动奖品 0：赠送积分1：赠送优惠券 2. 赠送兑换券 3：赠送成长值 4. 赠送实物
+          goodsIds: "", //商品id
+          goodsName:"" , //商品名称
+          goodsTotal: "", //商品数量
+          vouchersId:row.id, //券id
+          giftCardName:row.name, //赠送卡券名称
+          giftCardType: row.type, //券类型
+          validityZero: null,
+          validityOne: null,
+          validityTwo:null,
+          validity:row.validity,
+          giftCardDetail: row.useInstructions , //券详情
+          giftCardTime: row.validity, //券有效期
+          giftCardTotal: 1 //券数量
+        }
+        this.duihuanquanlist.push(data)
+        this.$message.success("新增成功")
+      },
+      // 优惠券列表选择
+      chosedata(row){
+        this.dialogTableVisible = false
+        if(this.pdidlist.indexOf(row.id)>-1 ){
+          this.$message.error("该优惠卡券已存在")
+          return
+        }
+        this.pdidlist.push(row.id)
+        let data ={
+          activeGift: 1, //活动奖品 0：赠送积分1：赠送优惠券 2. 赠送兑换券 3：赠送成长值 4. 赠送实物
+
+          goodsIds: "", //商品id
+          goodsName:"" , //商品名称
+          goodsTotal: "", //商品数量
+          vouchersId:row.id, //券id
+          giftCardName:row.name, //赠送卡券名称
+          giftCardType: row.type, //券类型
+          timeType: row.timeType,
+          validityZero: row.validityZero,
+          validityOne: row.validityOne,
+          validityTwo:row.validityTwo,
+          giftCardDetail: "满"+ row.satisfiedAmount+"减 "+row.discountAmount+"元" , //券详情
+          giftCardTime: "", //券有效期
+          giftCardTotal: 1//券数量
+        }
+        this.youhuiquanlist.push(data)
+        this.$message.success("新增成功")
+      },
+      // 优惠券删除
+      deletedata(row){
+        if(this.youhuiquanlist&&this.youhuiquanlist.length>0){
+          let delIdx=-1;
+          for ( let item of this.youhuiquanlist) {
+            delIdx++;
+            if (item.id===row.id){
+              break
+            }
+          }
+          this.pdidlist.splice(delIdx,1);
+          this.youhuiquanlist.splice(delIdx,1);
+
+
+        }
+      },
+      // 兑换券删除
+      deletedhdata(row){
+        if(this.duihuanquanlist&&this.duihuanquanlist.length>0){
+          let delIdx=-1;
+          for ( let item of this.duihuanquanlist) {
+            delIdx++;
+            if (item.id===row.id){
+              break
+            }
+          }
+          this.pddhidlist.splice(delIdx,1);
+          this.duihuanquanlist.splice(delIdx,1);
+
+
+        }
+      },
+
+        getlist(){
+          let data = {
+            isonline:this.isonline,
+            pageNo:this.pageNo,
+            pageSize:this.pageSize,
+          }
+          getList(data).then(res=>{
+            this.tableData = res.data.records
+            this.total = res.data.total;
+          })
+        },
+      handleUpdate(row) {
+        let data = {
+          pageNo:1,
+          pageSize:30,
+        }
+        listUserGrade(data).then(res=>{
+          this.vipname = res.data.records
+        })
+        this.chongzhi();
+        const id = row.id || this.ids
+        mmc(id).then(response => {
+          this.form = response.data;
+          this.youhuiquanlist = response.data.cardValueChildList.filter(item => item.activeGift == '1')
+          this.duihuanquanlist = response.data.cardValueChildList.filter(item => item.activeGift == '2')
+
+          this.dialog = true
+
+        });
+      },
+
+      chongzhi(){
+        this.form = {
+          sort:1,
+          membershipLevel:[],
+          groupOriented: '1',
+          rechargeBalance:'',
+          giftBalance:'',
+          points:'',
+          growthValue:'',
+          refuelMoney:'',
+          participationNo:0,
+          employeeCommission:'1',
+          royaltyType:'1',
+          resource:'1',
+          activeTime:'1',
+          activeStatus:'1',
+          paymentValue:'1',
+          cardValueChildList:[],
+          fringeBenefit:'',
+          isonline:0
+        }
+        this.youhuiquanlist =[]
+        this.duihuanquanlist =[]
+      },
+      addblock(){
+        this.vipname = []
+        let data = {
+          pageNo:1,
+          pageSize:30,
+        }
+        listUserGrade(data).then(res=>{
+          this.vipname = res.data.records
+        })
+        this.chongzhi()
+        this.dialog = true
+      },
+      posteid(data){
+        eitList(data).then(res=>{
+          if (res.code === 200){
+            this.$message({
+              message: '修改成功',
+              type: 'success'
+            });
+            this.getlist()
+          }else {
+            this.$message.error('修改失败');
+          }
+        })
+      },
+      handleDelete(data){
+
+        let resData =  JSON.parse(JSON.stringify(data))
+
+        let ddata = {
+         isonline : "1",
+          id:resData.id
+
+        }
+        eitList(ddata).then(res=>{
+          if (res.code === 200){
+            this.$message({
+              message: '下线成功',
+              type: 'success'
+            });
+            this.getlist()
+          }else {
+            this.$message.error('修改失败');
+          }
+        })
+
+      },
+      // this.form.tableDatas = response.data.activeConsumptionChildList.filter(item => item.activeGift == '1')
+      // this.tableDatas = response.data.activeConsumptionChildList.filter(item => item.activeGift == '2')
+      submitForm(){
+        this.form.cardValueChildList = this.youhuiquanlist.concat(this.duihuanquanlist);
+
+        if(this.form.id){
+          eitList(this.form).then(res=>{
+            if (res.code == 200){
+              this.$message({
+                message: '修改成功',
+                type: 'success'
+              });
+              this.getlist()
+            }else {
+              this.$message.error('修改失败');
+            }
+          })
+        }else{
+          addList(this.form).then(res=>{
+            if (res.code == 200){
+              this.$message({
+                message: '新增成功',
+                type: 'success'
+              });
+              this.getlist()
+            }else {
+              this.$message.error('新增失败');
+            }
+          })
+
+        }
+
+
+        this.dialog = false
+        this.chongzhi()
+      },
+
+
+      cancelForm() {
+        this.loading = false;
+        this.dialog = false;
+        clearTimeout(this.timer);
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .demo-drawer__footer{
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    box-sizing: border-box;
+    padding: 15px;
+  }
+  .box-popup{
+    width: 90%;
+    margin: 10px auto;
+  }
+  .dis-bit{
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 15px;
+  }
+  .box-bt{
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 18px;
+  }
+  .xh-box{
+    width: 90%;
+    margin: 10px auto;
+
+
+  }
+  .demo-drawer__content{
+    width: 100%;
+    box-sizing: border-box;
+    padding: 0px 20px;
+  }
+</style>
diff --git a/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue b/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
index 18273b415..e2863c4ed 100644
--- a/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
@@ -7,6 +7,7 @@
               <el-radio-button label="1">已下线</el-radio-button>
             </el-radio-group>
           </el-card>
+
           <el-card  style="margin-bottom: 20px">
             <div style="margin-bottom: 10px">
               <el-alert
@@ -16,55 +17,71 @@
               </el-alert>
             </div>
             <div style="margin: 10px 0px">
-              <el-button type="primary" icon="el-icon-plus" @click="addblock()">新增储值卡</el-button>
+              <el-button type="primary" icon="el-icon-plus" @click="addblock()">电子储值卡活动配置</el-button>
+            </div>
+            <div class="title_">
+              电子储值卡活动列表
             </div>
             <el-table
               :data="tableData"
               align="center"
               style="width: 100%">
+              <el-table-column
+                prop="sort"
+                label="排序"
+                align="center"
+                width="110">
+              </el-table-column>
               <el-table-column
                 prop="groupOriented"
-                label="面向群体"
+                label="电子储值卡活动适配对象"
+                align="center"
                 width="140">
                 <template slot-scope="scope">
                   <span v-if="scope.row.groupOriented == 1">普通群体</span>
                   <span v-if="scope.row.groupOriented == 2">等级会员</span>
                 </template>
               </el-table-column>
-              <el-table-column label="活动信息">
+              <el-table-column label="活动信息"  align="center">
                 <el-table-column
                   prop="rechargeBalance"
                   label="充值金额"
+                  align="center"
                   width="120">
                 </el-table-column>
                 <el-table-column
                   prop="giftBalance"
                   label="赠送金额"
+                  align="center"
                   width="120">
                 </el-table-column>
                 <el-table-column
                   prop="points"
                   label="赠送积分"
+                  align="center"
                   width="120">
                 </el-table-column>
                 <el-table-column
                   prop="growthValue"
                   label="赠送成长值"
+                  align="center"
                   width="120">
                 </el-table-column>
               </el-table-column>
               <el-table-column
-                prop="activeTime"
+                prop="startTime"
                 label="活动时间"
+                align="center"
                 width="200">
                 <template slot-scope="scope">
                   <span v-if="scope.row.activeTime == 1">不限时间</span>
-                  <span v-if="scope.row.activeTime == 2">自定义时间</span>
+                  <span v-if="scope.row.activeTime == 2">{{scope.row.startTime }}-{{scope.row.endTime }}</span>
                 </template>
               </el-table-column>
               <el-table-column
                 prop="activityProgress"
                 label="活动进度"
+                align="center"
                 width="100">
                 <template slot-scope="scope">
                   <span v-if="scope.row.activityProgress == 0"> <el-tag>未开始</el-tag></span>
@@ -73,22 +90,23 @@
                 </template>
               </el-table-column>
               <el-table-column
-                prop="paymentValue"
-                label="支付即充值"
+                prop="activityProgress"
+                label="上线/下线"
+                align="center"
                 width="100">
                 <template slot-scope="scope">
-                  <span v-if="scope.row.paymentValue == 1"><el-tag>启用</el-tag></span>
-                  <span v-if="scope.row.paymentValue == 2"><el-tag type="danger">禁用</el-tag></span>
+                  <span v-if="scope.row.isonline == 0"> <el-tag>上线</el-tag></span>
+                  <span v-if="scope.row.isonline == 1"> <el-tag>下线</el-tag></span>
+
                 </template>
               </el-table-column>
+
               <el-table-column
                 prop="activeStatus"
-                label="状态"
+                label="活动状态"
+                align="center"
                 width="80">
                 <template slot-scope="scope">
-<!--                  <span v-if="scope.row.activeStatus == 1"> <el-tag>在用</el-tag> </span>-->
-<!--                  <span v-if="scope.row.activeStatus == 2"> <el-tag type="success">挂失</el-tag> </span>-->
-<!--                  <span v-if="scope.row.activeStatus == 3"> <el-tag type="danger">停用</el-tag> </span>-->
                   <el-switch
                     v-model="scope.row.activeStatus"
                     :active-value="'1'"
@@ -101,47 +119,66 @@
                 </template>
 
               </el-table-column>
+
               <el-table-column
-                prop="participationNo"
-                label="参与次数"
-                width="110">
-                <template slot-scope="scope">
-                  <span v-if="scope.row.participationNo == 0">不限制次数</span>
-                  <span v-if="scope.row.participationNo != 0">{{scope.row.participationNo}} 次</span>
-                </template>
+                prop="createTime"
+                label="创建时间"
+                align="center"
+                width="180">
               </el-table-column>
               <el-table-column
-                prop="sort"
-                label="排序"
-                width="110">
-              </el-table-column>
-              <el-table-column
-                prop="updateTime"
-                label="更新时间"
+                prop="createBy"
+                label="操作人"
+                align="center"
                 width="150">
               </el-table-column>
+
               <el-table-column
                 prop="date"
                 label="操作"
+                align="center"
                 width="150">
                 <template slot-scope="scope">
                   <el-button
                     size="mini"
                     type="text"
                     icon="el-icon-edit"
+
                     @click="handleUpdate(scope.row)"
                   >修改</el-button>
 
+<!--                  <el-popconfirm-->
+<!--                    style="margin-left: 5px"-->
+<!--                    @confirm="handleDelete(scope.row)"-->
+<!--                    v-if="scope.row.isonline == '0'" title="这是一段内容确定下线吗？">-->
+<!--                    <el-button-->
+<!--                      size="mini"-->
+<!--                      type="text"-->
+<!--                      icon="el-icon-delete"-->
+<!--                      slot="reference"-->
+<!--                    >下线</el-button>-->
+<!--                  </el-popconfirm>-->
+<!--                  <el-popconfirm-->
+<!--                    style="margin-left: 5px"-->
+<!--                    @confirm="handleDeletes(scope.row)"-->
+<!--                    v-if="scope.row.isonline == '1'" title="这是一段内容确定上线吗？">-->
+<!--                    <el-button-->
+<!--                      size="mini"-->
+<!--                      type="text"-->
+<!--                      icon="el-icon-delete"-->
+<!--                      slot="reference"-->
+<!--                    >上线</el-button>-->
+<!--                  </el-popconfirm>-->
                   <el-popconfirm
                     style="margin-left: 5px"
-                    @confirm="handleDelete(scope.row)"
-                    v-if="scope.row.isonline == '0'" title="这是一段内容确定下线吗？">
+                    @confirm="Deletesl(scope.row)"
+                    title="这是一段内容确定删除吗？">
                     <el-button
                       size="mini"
                       type="text"
                       icon="el-icon-delete"
                       slot="reference"
-                    >下线</el-button>
+                    >删除</el-button>
                   </el-popconfirm>
 
                 </template>
@@ -157,19 +194,23 @@
             />
           </el-card>
       <el-drawer
-        title="添加-储值卡"
+        title="电子储值卡活动配置"
         :visible.sync="dialog"
         size="50%"
         ref="drawer"
       >
         <div class="demo-drawer__content">
           <el-form :model="form"  :rules="rules" :inline="true" :label-position="labelPosition"  >
-            <el-form-item label="面向群体" prop="groupOriented" :label-width="formLabelWidth" >
-              <el-radio-group v-model="form.groupOriented">
-                <el-radio label="1">不限群体</el-radio>
-                <el-radio label="2">会员等级</el-radio>
-              </el-radio-group>
-            </el-form-item>
+            <div style="display: flex;">
+              <div style="font-size: 14px;margin-right: 15px;padding-top: 8px;">电子储值卡活动适配对象</div>
+              <el-form-item label="" prop="groupOriented" :label-width="formLabelWidth" >
+                <el-radio-group v-model="form.groupOriented">
+                  <el-radio label="1">不限群体</el-radio>
+                  <el-radio label="2">会员等级</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </div>
+
             <el-row :gutter="20">
               <el-col :span="12"> <el-form-item label="会员等级"  prop="region"  :label-width="formLabelWidth"  v-if="form.groupOriented == '2' " >
                 <el-select v-model="form.membershipLevel"  multiple  placeholder="会员等级"   >
@@ -227,23 +268,23 @@
 <!--            <el-form-item label="参与次数" :label-width="formLabelWidth">
               <el-input-number v-model="form.participationNo" controls-position="right" :min="1" :max="10"></el-input-number>
             </el-form-item>-->
-            <div>
-              <el-form-item label="员工提成" :label-width="formLabelWidth" prop="employeeCommission">
-                <el-radio-group v-model="form.employeeCommission">
-                  <el-radio label="1">仅会员首次充值提成</el-radio>
-                  <el-radio label="2">会员每次充值提成</el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </div>
-            <div>
-            <el-form-item label="提成类型" :label-width="formLabelWidth" prop="royaltyType">
-              <el-radio-group v-model="form.royaltyType">
-                <el-radio label="1">无</el-radio>
-                <el-radio label="2">按提成金额</el-radio>
-                <el-radio label="3">按充值金额*提成比例</el-radio>
-              </el-radio-group>
-            </el-form-item>
-            </div>
+<!--            <div>-->
+<!--              <el-form-item label="员工提成" :label-width="formLabelWidth" prop="employeeCommission">-->
+<!--                <el-radio-group v-model="form.employeeCommission">-->
+<!--                  <el-radio label="1">仅会员首次充值提成</el-radio>-->
+<!--                  <el-radio label="2">会员每次充值提成</el-radio>-->
+<!--                </el-radio-group>-->
+<!--              </el-form-item>-->
+<!--            </div>-->
+<!--            <div>-->
+<!--            <el-form-item label="提成类型" :label-width="formLabelWidth" prop="royaltyType">-->
+<!--              <el-radio-group v-model="form.royaltyType">-->
+<!--                <el-radio label="1">无</el-radio>-->
+<!--                <el-radio label="2">按提成金额</el-radio>-->
+<!--                <el-radio label="3">按充值金额*提成比例</el-radio>-->
+<!--              </el-radio-group>-->
+<!--            </el-form-item>-->
+<!--            </div>-->
             <el-form-item label="提成金额" v-if="form.royaltyType == 2" :label-width="formLabelWidth" prop="amountCommission">
               <el-input v-model="form.amountCommission" autocomplete="off">
                 <template slot="append">元</template>
@@ -282,13 +323,17 @@
                 <el-radio label="2">禁用</el-radio>
               </el-radio-group>
             </el-form-item>
+
             </div>
-<!--            <el-form-item label="支付储值" :label-width="formLabelWidth" prop="paymentValue">
-              <el-radio-group v-model="form.paymentValue">
-                <el-radio label="1">启用</el-radio>
-                <el-radio label="2">禁用</el-radio>
-              </el-radio-group>
-            </el-form-item>-->
+            <div>
+              <el-form-item label="上线/下线" :label-width="formLabelWidth" prop="activeStatus">
+                <el-radio-group v-model="form.isonline">
+                  <el-radio label="0">上线</el-radio>
+                  <el-radio label="1">下线</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </div>
+
 <!--            <el-form-item label="排序" :label-width="formLabelWidth" prop="sort">
               <el-input-number v-model="form.sort" controls-position="right"  :min="1" :max="10"></el-input-number>
             </el-form-item>-->
@@ -439,7 +484,7 @@
           <div class="demo-drawer__footer">
             <el-button @click="cancelForm">取 消</el-button>
             <el-button type="primary" @click="submitForm('ruleForm')"
-                       v-if="form.isonline == '0'" >
+                      >
               确定</el-button>
           </div>
         </div>
@@ -577,7 +622,7 @@
 </template>
 
 <script>
-  import { getList,addList,eitList,deleteList,listUserGrade,mmc } from "@/api/EventMarketing/SaveBlock";
+  import { getList,addList,eitList,deleteList,listUserGrade,mmc,deletedelById } from "@/api/EventMarketing/SaveBlock";
   import {getActiveConsumption, listExchange, listFavorable} from "@/api/EventMarketing/activeConsumption";
   export default {
     name: 'index',
@@ -675,7 +720,7 @@
           participationNo:0,
           employeeCommission:'1',
           royaltyType:'1',
-          isonline:0,
+          isonline:'0',
           resource:'1',
           activeTime:'1',
           activeStatus:'1',
@@ -866,7 +911,7 @@
           paymentValue:'1',
           cardValueChildList:[],
           fringeBenefit:'',
-          isonline:0
+          isonline:'0'
         }
         this.youhuiquanlist =[]
         this.duihuanquanlist =[]
@@ -918,6 +963,46 @@
         })
 
       },
+      handleDeletes(data){
+
+        let resData =  JSON.parse(JSON.stringify(data))
+
+        let ddata = {
+          isonline : "0",
+          id:resData.id
+
+        }
+        eitList(ddata).then(res=>{
+          if (res.code === 200){
+            this.$message({
+              message: '上线成功',
+              type: 'success'
+            });
+            this.getlist()
+          }else {
+            this.$message.error('修改失败');
+          }
+        })
+
+      },
+      Deletesl(data){
+
+        let resData =  JSON.parse(JSON.stringify(data))
+        if(resData.isonline == 0){
+          this.$message({
+            message: '上线不能删除，需先下线',
+            type: 'success'
+          });
+          return
+        }
+
+        deletedelById(resData.id).then(res=>{
+          console.log(res)
+        })
+
+
+      },
+
       // this.form.tableDatas = response.data.activeConsumptionChildList.filter(item => item.activeGift == '1')
       // this.tableDatas = response.data.activeConsumptionChildList.filter(item => item.activeGift == '2')
       submitForm(){
@@ -1003,4 +1088,13 @@
     box-sizing: border-box;
     padding: 0px 20px;
   }
+  .title_{
+    width: 100%;
+    display: flex;
+    align-items: center;
+    font-size: 20px;
+    font-weight: bold;
+    justify-content: center;
+    margin-bottom: 20px;
+  }
 </style>
diff --git a/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue b/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue
index 35e1c7163..380323095 100644
--- a/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue
@@ -41,6 +41,8 @@
           @click="handleAdd"
 
         >新增</el-button>
+
+
       </el-col>
     </el-row>
 
diff --git a/fuintAdmin/src/views/EventMarketing/yijiancoupon/index.vue b/fuintAdmin/src/views/EventMarketing/yijiancoupon/index.vue
index b0968ab71..a977c6c62 100644
--- a/fuintAdmin/src/views/EventMarketing/yijiancoupon/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/yijiancoupon/index.vue
@@ -77,7 +77,6 @@
             <el-input-number v-model="days"  :min="1" :max="999" label="描述文字"></el-input-number>
             <div style="margin-left: 5px">天 <span style="color: red">(查找最近N天未进行消费的用户)</span>  </div>
           </div>
-
         </el-form-item>
 
         <!--        选择优惠券-->
diff --git a/fuintBackend/fuint-application/src/main/resources/application.properties b/fuintBackend/fuint-application/src/main/resources/application.properties
index 33fe1a245..f95f1ecad 100644
--- a/fuintBackend/fuint-application/src/main/resources/application.properties
+++ b/fuintBackend/fuint-application/src/main/resources/application.properties
@@ -2,7 +2,7 @@
 server.port=8008
 env.profile=dev
 #env.properties.path=D:/workspaces/oilSystem/fuintBackend/configure/
-env.properties.path=D:/code/oilSystem/fuintBackend/configure/
+env.properties.path=D:/oil/oil/oilSystem/fuintBackend/configure/