diff --git a/fuintAdmin/.env.development b/fuintAdmin/.env.development
index b1d3027f0..20c33d346 100644
--- a/fuintAdmin/.env.development
+++ b/fuintAdmin/.env.development
@@ -11,6 +11,6 @@ VUE_APP_BASE_API = '/dev-api'
 VUE_APP_PUBLIC_PATH = '/'
 
 # 后端接口地址
-VUE_APP_SERVER_URL = 'http://192.168.0.138:8008/'
+VUE_APP_SERVER_URL = 'http://192.168.0.196:8080/'
 
 
diff --git a/fuintAdmin/src/api/EventMarketing/activeConsumption.js b/fuintAdmin/src/api/EventMarketing/activeConsumption.js
index 604a7cd39..e6f22c120 100644
--- a/fuintAdmin/src/api/EventMarketing/activeConsumption.js
+++ b/fuintAdmin/src/api/EventMarketing/activeConsumption.js
@@ -16,8 +16,6 @@ export function getoilName(query) {
   })
 }
 
-
-
 // 查询消费有礼活动列表
 export function listActiveConsumption(query) {
   return request({
diff --git a/fuintAdmin/src/api/EventMarketing/yijian.js b/fuintAdmin/src/api/EventMarketing/yijian.js
new file mode 100644
index 000000000..00caec967
--- /dev/null
+++ b/fuintAdmin/src/api/EventMarketing/yijian.js
@@ -0,0 +1,17 @@
+import request from '@/utils/request'
+
+
+export function issueCardFavorable(data) {
+  return request({
+    url: 'business/marketingActivity/cardFavorableRecord/issueCardFavorable',
+    method: 'post',
+    data:data
+  })
+}
+export function getCardFavorableLists(status) {
+  return request({
+    url: 'business/marketingActivity/cardFavorableRecord/getCardFavorableLists',
+    method: 'get',
+    params: status
+  })
+}
diff --git a/fuintAdmin/src/components/Fuint/Doc/index.vue b/fuintAdmin/src/components/Fuint/Doc/index.vue
index 13a36eb3f..74c123a64 100644
--- a/fuintAdmin/src/components/Fuint/Doc/index.vue
+++ b/fuintAdmin/src/components/Fuint/Doc/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div title="帮助文档" class="nav-icon">
+  <div title="收银台" class="nav-icon">
 <!--    <svg-icon icon-class="question" @click="goto" />-->
     <i class="el-icon-s-platform" @click="goto" style="font-size: 24px"></i>
   </div>
diff --git a/fuintAdmin/src/views/EventMarketing/center/index.vue b/fuintAdmin/src/views/EventMarketing/center/index.vue
index dba4d8b4a..aedbda4c5 100644
--- a/fuintAdmin/src/views/EventMarketing/center/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/center/index.vue
@@ -41,6 +41,12 @@
           <div>推荐有礼</div>
         </div>
       </div>
+      <div class="wrap-box" @click="gobox(6)" >
+        <img src="../../../assets/images/tjyl.png" style="width: 260px;height: 260px;margin: 0 auto " >
+        <div class="bottom-box">
+          <div>一键发券</div>
+        </div>
+      </div>
     </div>
 
 
@@ -92,6 +98,9 @@ export default {
       if(id == 5){
         this.$router.push('/EventMarketing/activeRecommend/index')
       }
+      if(id == 6){
+        this.$router.push('/EventMarketing/yijiancoupon/index')
+      }
     },
 
   }
@@ -106,7 +115,7 @@ export default {
   margin: 0px auto;
 }
 .wrap-box{
-  width: 260px;
+  width: 19%;
   text-align: center;
   background: #FFFFFF;
   border-radius: 8px;
@@ -114,6 +123,7 @@ export default {
   box-shadow: 0px 2px 4px rgb(31 30 47 / 10%);
   margin-right: 15px;
   cursor: pointer;
+  margin-bottom: 15px;
 }
 .fji{
   display: flex;
diff --git a/fuintAdmin/src/views/EventMarketing/grantCoupon/index.vue b/fuintAdmin/src/views/EventMarketing/grantCoupon/index.vue
new file mode 100644
index 000000000..86a6d555c
--- /dev/null
+++ b/fuintAdmin/src/views/EventMarketing/grantCoupon/index.vue
@@ -0,0 +1,15 @@
+<template>
+  <div>
+
+  </div>
+</template>
+
+<script>
+export default {
+  name: "index"
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/fuintAdmin/src/views/EventMarketing/yijiancoupon/index.vue b/fuintAdmin/src/views/EventMarketing/yijiancoupon/index.vue
new file mode 100644
index 000000000..b74a52dab
--- /dev/null
+++ b/fuintAdmin/src/views/EventMarketing/yijiancoupon/index.vue
@@ -0,0 +1,891 @@
+<template>
+  <div class="app-container">
+    <el-card style="margin-bottom: 20px">
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+
+        <el-form-item label="券状态" prop="name">
+          <el-select v-model="status"  clearable placeholder="请选择">
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <el-card style="margin-bottom: 20px">
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+          >新增</el-button>
+        </el-col>
+      </el-row>
+
+      <el-table v-loading="loading" :data="activeConsumptionList" :label-position="labelPosition" @selection-change="handleSelectionChange">
+
+        <el-table-column
+          type="index"
+          align="center"
+          label="排序"
+        >
+        </el-table-column>
+        <el-table-column label="会员名字" align="center" prop="name" />
+
+        <el-table-column label="手机号" align="center" prop="mobile" />
+
+        <el-table-column label="券名称" align="center" prop="cardFavorableName"/>
+        <el-table-column label="券的类型" align="center" prop="discountType" >
+          <template slot-scope="scope">
+            <span v-if="scope.row.status == 0">满减券</span>
+            <span v-if="scope.row.status == 1">折扣券</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" align="center" prop="status" >
+          <template slot-scope="scope">
+            <span v-if="scope.row.status == 0"> <el-tag>未使用</el-tag>   </span>
+            <span v-if="scope.row.status == 1"><el-tag type="danger">已使用</el-tag>   </span>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </el-card>
+    <!-- 添加或修改消费有礼活动对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="45%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" :label-position="labelPosition" label-width="110px">
+        <el-form-item label="会员等级" prop=""  >
+          <el-select v-model="gradeIds"  multiple clearable placeholder="会员等级">
+            <el-option :label="item.name" :value="item.id.toString()" v-for="(item,index) in userGradeList" :key="index" >  </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="不活跃用户" prop="">
+          <div style="display: flex;align-items: center">
+            <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>
+
+        <!--        选择优惠券-->
+        <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="form.tableDatas"
+              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>
+        <!--        选择兑换券-->
+
+
+      </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="优惠券列表" :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="tableData"
+        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>
+    <!--    实物列表-->
+    <el-dialog title="实物列表" :visible.sync="dialogTableVisiblesw">
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+        <el-form-item label="选择商品">
+          <el-select v-model="shopdata.goodsId" placeholder="请选择商品" @change="swchange">
+            <el-option :label="item.name" :value="item" v-for="(item,index) in tableDatasw" :key="item.id"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="商品数量" prop="nmb" >
+          <el-input-number v-model="shopdata.count" controls-position="right" :min="1" :max="9999"></el-input-number>
+
+        </el-form-item>
+        <el-button
+
+          type="primary"
+          @click="shwdata()"
+        >确定</el-button>
+
+      </el-form>
+
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { getoiltype,getoilName, listActiveConsumption,listExchange,listLJGoods, getActiveConsumption, delActiveConsumption, addActiveConsumption, updateActiveConsumption,listFavorable } from "@/api/EventMarketing/activeConsumption";
+import {issueCardFavorable,getCardFavorableLists} from "@/api/EventMarketing/yijian";
+import {listUserGrade} from "@/api/staff/user/usergrade";
+
+export default {
+  name: "ActiveConsumption",
+  data() {
+    return {
+      options:[
+        {
+          value: 0,
+          label: '未使用'
+        }, {
+          value: 1,
+          label: '已使用'
+        },
+      ],
+      labelPosition:'left',
+      userGradeList:[],
+      pdidlist:[],//判断优惠券id
+      pddhidlist:[],//判断兑换券id
+      pdswidlist:[],//判断实物id
+      dialogTableVisible:false,//优惠券
+      dialogTableVisibledh:false,//兑换券
+      dialogTableVisiblesw:false,//实物
+      tableData: [],//优惠券
+      tableDatadh:[],//兑换券
+      tableDatasw:[],//实物
+      tableDatas:[],//公共选择区域
+      //请求优惠券列表时的参数
+      youhuiquan:{
+        name:'',
+        pageNum: 1,
+        pageSize: 10,
+      },
+      ytotal:0,
+      //请求兑换券列表时的参数
+      duihuanquan:{
+        name:'',
+        pageNum: 1,
+        pageSize: 10,
+        total:0
+      },
+      dtotal:0,
+      //请求实物列表时的参数
+      shiwu:{
+        isRecovery:0,
+        page: 1,
+        pageSize: 10,
+      },
+      stotal:0,
+      shopdata:{
+        goodsId:'',
+        count:0,
+      },
+      oillist:['92#','95#','98#','0#','-10#','LNG','CNG','京92#','京95#','京0#',],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 消费有礼活动表格数据
+      activeConsumptionList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      listFavorable:{
+        pageNum: 1,
+        pageSize: 10,
+      },
+      listFavorablesw:{
+        isRecovery:0,
+        page: 1,
+        pageSize: 10,
+      },
+
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        chainStorId: null,
+        storeId: null,
+        name: null,
+        participationConditionMoney: null,
+        activeStartTime: null,
+        activeEndTime: null,
+        adaptOil: [],
+        adaptUserType: null,
+        memberType: null,
+        dieselUserLevel: null,
+        gasolineUserLevel: null,
+        naturalUserLevel: null,
+        paymentType: null,
+        participationCondition: null,
+        participationAcount: null,
+        limitAcount: null,
+        activeGift: [],
+        points: null,
+        status: null,
+        isonline: null,
+      },
+      status:null,
+      // 表单参数
+      form: {
+
+
+
+      },
+      cardFavorableIds:[],
+      gradeIds:[],
+      days:15,
+      // 表单校验
+      rules: {
+        adaptOil: [
+          { required: true, message: '必填项不能为空', trigger: 'blur' },
+        ],
+        name: [
+          { required: true, message: '必填项不能为空', trigger: 'blur' },
+        ],
+        participationConditionMoney: [
+          { required: true, message: '必填项不能为空', trigger: 'blur' },
+        ],
+        activeStartTime: [
+          { required: true, message: '必填项不能为空', trigger: 'blur' },
+        ],
+        activeEndTime: [
+          { required: true, message: '必填项不能为空', trigger: 'blur' },
+        ],
+        adaptUserType: [
+          { required: true, message: '必填项不能为空', trigger: 'blur' },
+        ], dieselUserLevel: [
+          { required: true, message: '必填项不能为空', trigger: 'blur' },
+        ], gasolineUserLevel: [
+          { required: true, message: '必填项不能为空', trigger: 'blur' },
+        ], naturalUserLevel: [
+          { required: true, message: '必填项不能为空', trigger: 'blur' },
+        ], participationCondition: [
+          { required: true, message: '必填项不能为空', trigger: 'blur' },
+        ], participationAcount: [
+          { required: true, message: '必填项不能为空', trigger: 'blur' },
+        ], limitAcount: [
+          { required: true, message: '必填项不能为空', trigger: 'blur' },
+        ], activeGift: [
+          { required: true, message: '必填项不能为空', trigger: 'blur' },
+        ],
+        status: [
+          { required: true, message: '必填项不能为空', trigger: 'blur' },
+        ],
+        isonline: [
+          { required: true, message: '必填项不能为空', trigger: 'blur' },
+        ],
+        points: [
+          { required: true, message: '必填项不能为空', trigger: 'blur' },
+        ],
+        activeConsumptionChildList: [
+          { required: true, message: '必填项不能为空', trigger: 'blur' },
+        ],
+
+
+
+      }
+    };
+  },
+  created() {
+    this.getList();
+
+    this.getoilName()
+    this.listUserGrade()
+  },
+  methods: {
+    indexMethod(index) {
+      return index * 2;
+    },
+    /** 查询消费有礼活动列表 */
+    getList() {
+      this.loading = true;
+      let data = {
+        status:this.status
+      }
+      getCardFavorableLists(data).then(response => {
+        this.activeConsumptionList = response.data.records;
+        this.total = response.data.total;
+        console.log(response)
+        this.loading = false;
+      });
+    },
+
+    listUserGrade(){
+      listUserGrade().then(res=>{
+        if(res.code == 200){
+          this.userGradeList = res.data.records
+        }
+
+      })
+    },
+    // 查询油类
+    getoiltypeliet(){
+      getoiltype().then(res=>{
+        console.log(res)
+      })
+    },
+    //
+    getoilName(){
+      getoilName().then(res=>{
+        console.log(res)
+        this.oillist = res.data
+
+      })
+
+    },
+    swchange(e){
+      console.log(this.shopdata)
+    },
+    // 请求实物
+    getlistLJGoods(){
+      this.tableDatasw = []
+      listLJGoods(this.shiwu).then(res=>{
+        if(res.code==200){
+          console.log( res)
+          this.dialogTableVisiblesw = true
+          this.tableDatasw  = res.data.records
+          this.stotal = res.data.total
+
+
+        }
+      })
+    },
+    // 请求兑换券
+    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.tableData = []
+      listFavorable(this.youhuiquan).then(res=>{
+        if(res.code == 200){
+          this.dialogTableVisible = true
+          this.tableData  = res.data.records
+          this.ytotal = res.data.total
+        }
+
+      })
+    },
+    // 实物选择处理
+    shwdata(){
+      this.dialogTableVisiblesw = false
+      if(this.pdswidlist.indexOf( this.shopdata.goodsId.id)>-1 ){
+        this.$message.error("该商品已存在")
+        return
+      }
+      this.pdswidlist.push( this.shopdata.goodsId.id,)
+      let data = {
+        activeGift: 4,
+        goodsIds : this.shopdata.goodsId.id,
+        goodsName: this.shopdata.goodsId.name,
+
+        goodsTotal:this.shopdata.count
+      }
+      this.form.shiwudata.push(data)
+
+      console.log( this.form.shiwudata)
+      this.shopdata = []
+    },
+    // 兑换券券列表选择
+    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.tableDatas.push(data)
+      this.$message.success("新增成功")
+    },
+    // 优惠券列表选择
+    chosedata(row){
+      this.dialogTableVisible = false
+
+
+      if( this.cardFavorableIds.indexOf(row.id)>-1 ){
+        this.$message.error("该优惠卡券已存在")
+        return
+      }
+      console.log(this.cardFavorableIds)
+      this.cardFavorableIds.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.form.tableDatas.push(data)
+
+      this.$message.success("新增成功")
+
+    },
+    // 优惠券删除
+    deletedata(row){
+      if(this.form.tableDatas&&this.form.tableDatas.length>0){
+        let delIdx=-1;
+        for ( let item of this.form.tableDatas) {
+          delIdx++;
+          if (item.id===row.id){
+            break
+          }
+        }
+        this.pdidlist.splice(delIdx,1);
+        this.cardFavorableIds.splice(delIdx,1);
+        this.form.tableDatas.splice(delIdx,1);
+
+
+      }
+    },
+    // 兑换券删除
+    deletedhdata(row){
+      if(this.tableDatas&&this.tableDatas.length>0){
+        let delIdx=-1;
+        for ( let item of this.tableDatas) {
+          delIdx++;
+          if (item.id===row.id){
+            break
+          }
+        }
+        this.pddhidlist.splice(delIdx,1);
+        this.tableDatas.splice(delIdx,1);
+
+
+      }
+    },
+    // 实物删除
+    deleteswdata(row){
+
+      if( this.form.shiwudata&& this.form.shiwudata.length>0){
+        let delIdx=-1;
+        for ( let item of  this.form.shiwudata) {
+          delIdx++;
+          if (item.id===row.id){
+            break
+          }
+        }
+        this.pdswidlist.splice(delIdx,1);
+        this.form.shiwudata.splice(delIdx,1);
+
+
+      }
+    },
+    // 取消按钮
+    cancel() {
+      this.pdswidlist = []
+      this.form.shiwudata= []
+      this.pddhidlist= []
+      this.tableDatas= []
+      this.pdidlist= []
+      this.cardFavorableIds= []
+      this.form.tableDatas= []
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        chainStorId: null,
+        storeId: null,
+        name: null,
+        participationConditionMoney: null,
+        activeStartTime: null,
+        activeEndTime: null,
+        adaptOil: [],
+        adaptUserType: '0',
+        memberType: null,
+        dieselUserLevel: [],
+        gasolineUserLevel: [],
+        naturalUserLevel: [],
+        paymentType: null,
+        participationCondition: null,
+        participationAcount: null,
+        limitAcount: null,
+        activeGift: [],
+        points: null,
+        status: 0,
+        isonline: 0,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        tableDatas:[],
+        shiwudata:[],
+        updateTime: null,
+        activeConsumptionChildList:[]
+      };
+      this.pdswidlist = []
+      this.form.shiwudata= []
+      this.pddhidlist= []
+      this.tableDatas= []
+      this.pdidlist= []
+      this.form.tableDatas= []
+      this.cardFavorableIds = []
+      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
+      getActiveConsumption(id).then(response => {
+        this.form = response.data;
+        this.form.tableDatas = response.data.activeConsumptionChildList.filter(item => item.activeGift == '1')
+        this.tableDatas = response.data.activeConsumptionChildList.filter(item => item.activeGift == '2')
+        this.form.shiwudata = response.data.activeConsumptionChildList.filter(item => item.activeGift == '4')
+        this.open = true;
+        this.title = "修改一键发券";
+      });
+    },
+    handleDeletexia(row){
+      getActiveConsumption(row.id).then(response => {
+        // this.form = response.data;
+        let data = response.data
+        data.isonline = 1
+        updateActiveConsumption(data).then(response => {
+          this.$modal.msgSuccess("下线成功");
+          this.open = false;
+          this.getList();
+        });
+
+      });
+    },
+    qiyong(row){
+      if(row.isonline == 1){
+        this.$message.error("下线不可进行操作")
+        return
+      }
+      getActiveConsumption(row.id).then(response => {
+        // this.form = response.data;
+        let data = response.data
+        data.status = 1
+        updateActiveConsumption(data).then(response => {
+          this.$modal.msgSuccess("操作成功");
+          this.open = false;
+          this.getList();
+        });
+
+      });
+    },
+    jinyong(row){
+      if(row.isonline == 1){
+        this.$message.error("下线不可进行操作")
+        return
+      }
+      getActiveConsumption(row.id).then(response => {
+        // this.form = response.data;
+        let data = response.data
+        data.status = 0
+        updateActiveConsumption(data).then(response => {
+          this.$modal.msgSuccess("操作成功");
+          this.open = false;
+          this.getList();
+        });
+
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+
+      this.form.activeConsumptionChildList = this.form.tableDatas.concat(this.tableDatas, this.form.shiwudata);
+      console.log(this.form.activeConsumptionChildList)
+      let data = {
+        cardFavorableIds : this.cardFavorableIds,
+        gradeIds:this.gradeIds,
+        days:this.days
+
+      }
+
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          issueCardFavorable(data).then(response => {
+            this.$modal.msgSuccess("新增成功");
+            this.open = false;
+            this.getList()
+          });
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除消费有礼活动编号为"' + ids + '"的数据项？').then(function() {
+        return delActiveConsumption(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('business/marketingActivity/activeConsumption/export', {
+        ...this.queryParams
+      }, `activeConsumption_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
+<style scoped lang="scss">
+.box-bt{
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  font-size: 18px;
+}
+</style>
diff --git a/fuintAdmin_zt/.env.development b/fuintAdmin_zt/.env.development
index b1d3027f0..cd5a27545 100644
--- a/fuintAdmin_zt/.env.development
+++ b/fuintAdmin_zt/.env.development
@@ -11,6 +11,6 @@ VUE_APP_BASE_API = '/dev-api'
 VUE_APP_PUBLIC_PATH = '/'
 
 # 后端接口地址
-VUE_APP_SERVER_URL = 'http://192.168.0.138:8008/'
+VUE_APP_SERVER_URL = 'http://192.168.0.121:8080/'
 
 
diff --git a/fuintCashierWeb/src/assets/images/backbbj.png b/fuintCashierWeb/src/assets/images/backbbj.png
deleted file mode 100644
index b291621ed..000000000
Binary files a/fuintCashierWeb/src/assets/images/backbbj.png and /dev/null differ
diff --git a/fuintCashierWeb/src/assets/images/box-left.png b/fuintCashierWeb/src/assets/images/box-left.png
deleted file mode 100644
index 6b825dc84..000000000
Binary files a/fuintCashierWeb/src/assets/images/box-left.png and /dev/null differ
diff --git a/gasStation-uni/pages/index/index.vue b/gasStation-uni/pages/index/index.vue
index 51bb39447..207687bef 100644
--- a/gasStation-uni/pages/index/index.vue
+++ b/gasStation-uni/pages/index/index.vue
@@ -153,9 +153,7 @@
 				shows: '',
 				title: '',
 				oilTypeList: '',
-				columns: [
-
-				],
+				columns: [],
 				oilInfo: {
 					oilName: '未添加',
 					oilPrice: '0',
@@ -507,10 +505,10 @@
 										_this.list3.push(_this.baseUrl + item)
 									})
 								}
-								
+
 								_this.lon = _this.store.longitude,
 								_this.lat = _this.store.latitude,
-													
+
 								_this.getIndexBanner()
 							}else{
 								uni.showToast({
@@ -518,7 +516,7 @@
 									icon:"none"
 								})
 							}
-							
+
 						})
 
 						// uni.showToast({
@@ -636,7 +634,7 @@
 				uni.openLocation({
 					latitude: lat,
 					longitude: lon,
-					
+
 					success: function() {
 						console.log('success');
 					},
@@ -926,4 +924,4 @@
 		color: white;
 		margin: 0 auto;
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/gasStation-uni/pages/refuel/refuel.vue b/gasStation-uni/pages/refuel/refuel.vue
index f922206c1..e698f141a 100644
--- a/gasStation-uni/pages/refuel/refuel.vue
+++ b/gasStation-uni/pages/refuel/refuel.vue
@@ -664,7 +664,7 @@
 		width: 100%;
 		display: flex;
 		flex-wrap: wrap;
-		height: 77%;
+
 		overflow-y: scroll;
 	}
 
@@ -692,6 +692,7 @@
 		margin-top: 5px;
 		padding: 12px 0px;
 		border-radius: 6px;
+		margin-bottom: 10px;
 	}
 
 	.box-oil2 {
@@ -704,7 +705,7 @@
 		color: #666666;
 		background: white;
 		margin-right: 13px;
-		margin-top: 10px;
+
 		padding: 12px 0px;
 		border-radius: 6px;
 	}
@@ -758,4 +759,4 @@
 		text-align: right;
 		color: #999999;
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/gasStation-uni/pagesLogin/login/webview.vue b/gasStation-uni/pagesLogin/login/webview.vue
index 3faf16b3b..a4001dd10 100644
--- a/gasStation-uni/pagesLogin/login/webview.vue
+++ b/gasStation-uni/pagesLogin/login/webview.vue
@@ -6,7 +6,27 @@
 			<view class="my-icons"></view>
 		</view>
 		<view class="">
-			<view class="content" v-html="text">
+			<view class="content">
+				来个油惠小程序隐私保护指引
+				本指引是来个油惠小程序开发者 "山东华夏深蓝数字科技有限公司"（以下简称“开发者”）为处理你的个人信息而制定。
+				开发者处理的信息
+				根据法律规定，开发者仅处理实现小程序功能所必要的信息。
+				为了您能正常使用小程序，需要您进行登录，开发者将在获取你的明示同意后，收集你的手机号。
+				为了获取离您最近的店铺信息，开发者将在获取你的明示同意后，收集你的位置信息。
+				你的权益
+				关于你的个人信息，你可以通过以下方式与开发者联系，行使查阅、复制、更正、删除等法定权利。
+				若你在小程序中注册了账号，你可以通过以下方式与开发者联系，申请注销你在小程序中使用的账号。在受理你的申请后，开发者承诺在十五个工作日内完成核查和处理，并按照法律法规要求处理你的相关信息。
+				电话:15288868301
+				开发者对信息的存储
+				 开发者承诺，除法律法规另有规定外，开发者对你的信息的保存期限应当为实现处理目的所必要的最短时间。
+				信息的使用规则
+				开发者将会在本指引所明示的用途内使用收集的信息
+				如开发者使用你的信息超出本指引目的或合理范围，开发者必须在变更使用目的或范围前，再次以电话方式告知并征得你的明示同意。
+				信息对外提供
+				开发者承诺，不会主动共享或转让你的信息至任何第三方，如存在确需共享或转让时，开发者应当直接征得或确认第三方征得你的单独同意。
+				开发者承诺，不会对外公开披露你的信息，如必须公开披露时，开发者应当向你告知公开披露的目的、披露信息的类型及可能涉及的信息，并征得你的单独同意。
+				你认为开发者未遵守上述约定，或有其他的投诉建议、或未成年人个人信息保护相关问题，可通过以下方式与开发者联系；或者向微信进行投诉。
+				电话 : 15288868301
 
 			</view>
 		</view>
@@ -75,4 +95,4 @@
 		position: fixed;
 		top: 0px;
 	}
-</style>
\ No newline at end of file
+</style>