diff --git a/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue b/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
index 4ab381fcb..67037b4fd 100644
--- a/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
@@ -203,8 +203,6 @@
                   </div>
                 </el-form-item>
               </div>
-
-
               <el-col :span="14">
                 <el-form-item label="赠送积分" :label-width="formLabelWidth" prop="points">
                   <div style="width: 250px">
@@ -212,7 +210,6 @@
                       <template slot="append">分</template>
                     </el-input>
                   </div>
-
                 </el-form-item>
               </el-col>
               <el-col :span="14">
@@ -222,13 +219,9 @@
                       <template slot="append">成长值</template>
                     </el-input>
                   </div>
-
                 </el-form-item>
               </el-col>
-
             </el-row>
-
-
             <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>
@@ -443,65 +436,71 @@
             <el-input v-model="ruleForm.name"></el-input>
           </el-form-item>
           <el-form-item label="权益说明" prop="desc">
-            <el-input type="textarea" v-model="ruleForm.desc"></el-input>
+            <el-input type="textarea" v-model="ruleForm.qyDetail"></el-input>
           </el-form-item>
           <el-form-item label="规则说明" prop="desc">
-            <el-input type="textarea" v-model="ruleForm.desc"></el-input>
+            <el-input type="textarea" v-model="ruleForm.gzDetail"></el-input>
           </el-form-item>
-          <el-form-item label="适用油品油号" prop="desc">
+          <el-form-item label="适用油品油号" prop="oilLimit">
             <div class="d-s" style="cursor: pointer">
-             <div class="d-s">
-               <img src="../../../assets/images/wx.png" style="width: 20px;height: 20px;">
-               <img src="../../../assets/images/xz.png" style="width: 20px;height: 20px;">
+             <div class="d-s" @click="ruleForm.oilLimit = 1">
+               <img src="../../../assets/images/wx.png" v-if="ruleForm.oilLimit != 1" style="width: 20px;height: 20px;">
+               <img src="../../../assets/images/xz.png" v-if="ruleForm.oilLimit == 1" style="width: 20px;height: 20px;">
                <div>不限</div>
              </div>
-              <div class="d-s">
-                <img src="../../../assets/images/wx.png" style="width: 20px;height: 20px;">
-                <img src="../../../assets/images/xz.png" style="width: 20px;height: 20px;">
+
+              <div class="d-s" @click="ruleForm.oilLimit = 2" >
+                <img src="../../../assets/images/wx.png" v-if="ruleForm.oilLimit != 2" style="width: 20px;height: 20px;">
+                <img src="../../../assets/images/xz.png" v-if="ruleForm.oilLimit == 2" style="width: 20px;height: 20px;">
                 <div>自定义</div>
-                <el-select v-model="ruleForm.region" placeholder="请选择油品油号（可多选）" style="margin-left: 10px">
+                <el-select v-if="ruleForm.oilLimit == 2" v-model="ruleForm.oilNumber" placeholder="请选择油品油号（可多选）" multiple style="margin-left: 10px">
+                  <el-option :label="item.oilName" :value="item.oilName"  v-for="(item,index) in oilnumList" :key="index"></el-option>
+
+                </el-select>
+              </div>
+            </div>
+          </el-form-item>
+          <el-form-item label="适用商品" prop="productLimit">
+            <div class="d-s" style="cursor: pointer">
+              <div class="d-s"  @click="ruleForm.productLimit = 1">
+                <img src="../../../assets/images/wx.png" v-if="ruleForm.productLimit != 1" style="width: 20px;height: 20px;">
+                <img src="../../../assets/images/xz.png" v-if="ruleForm.productLimit == 1" style="width: 20px;height: 20px;">
+                <div>不限</div>
+              </div>
+              <div class="d-s" @click="ruleForm.productLimit = 2">
+                <img src="../../../assets/images/wx.png" v-if="ruleForm.productLimit != 2" style="width: 20px;height: 20px;">
+                <img src="../../../assets/images/xz.png" v-if="ruleForm.productLimit == 2" style="width: 20px;height: 20px;">
+                <div>自定义</div>
+                <el-select v-if="ruleForm.productLimit == 2" v-model="ruleForm.productIds" placeholder="请选择商品名称（可多选）" style="margin-left: 10px">
                   <el-option label="区域一" value="shanghai"></el-option>
                   <el-option label="区域二" value="beijing"></el-option>
                 </el-select>
               </div>
             </div>
           </el-form-item>
-          <el-form-item label="适用商品" prop="desc">
+          <el-form-item label="有效期" prop="timeLimit">
             <div class="d-s" style="cursor: pointer">
-              <div class="d-s">
-                <img src="../../../assets/images/wx.png" style="width: 20px;height: 20px;">
-                <img src="../../../assets/images/xz.png" style="width: 20px;height: 20px;">
+              <div class="d-s" @click="ruleForm.timeLimit = 1">
+                <img src="../../../assets/images/wx.png" v-if="ruleForm.timeLimit != 1" style="width: 20px;height: 20px;">
+                <img src="../../../assets/images/xz.png" v-if="ruleForm.timeLimit == 1" style="width: 20px;height: 20px;">
                 <div>不限</div>
               </div>
-              <div class="d-s">
-                <img src="../../../assets/images/wx.png" style="width: 20px;height: 20px;">
-                <img src="../../../assets/images/xz.png" style="width: 20px;height: 20px;">
-                <div>自定义</div>
-                <el-select v-model="ruleForm.region" placeholder="请选择商品名称（可多选）" style="margin-left: 10px">
-                  <el-option label="区域一" value="shanghai"></el-option>
-                  <el-option label="区域二" value="beijing"></el-option>
-                </el-select>
-              </div>
-            </div>
-          </el-form-item>
-          <el-form-item label="有效期" prop="desc">
-            <div class="d-s" style="cursor: pointer">
-              <div class="d-s">
-                <img src="../../../assets/images/wx.png" style="width: 20px;height: 20px;">
-                <img src="../../../assets/images/xz.png" style="width: 20px;height: 20px;">
-                <div>不限</div>
-              </div>
-              <div class="d-s">
-                <img src="../../../assets/images/wx.png" style="width: 20px;height: 20px;">
-                <img src="../../../assets/images/xz.png" style="width: 20px;height: 20px;">
+              <div class="d-s" @click="ruleForm.timeLimit = 2">
+                <img src="../../../assets/images/wx.png" v-if="ruleForm.timeLimit != 2" style="width: 20px;height: 20px;">
+                <img src="../../../assets/images/xz.png" v-if="ruleForm.timeLimit == 2" style="width: 20px;height: 20px;">
                 <div>自定义</div>
                 <el-date-picker
-                  style="margin-left: 10px"
-                  v-model="value1"
-                  type="daterange"
-                  range-separator="至"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期">
+                  v-if="ruleForm.timeLimit == 2"
+                  style="margin: 0 10px"
+                  v-model="ruleForm.effectiveDateStart"
+                  type="date"
+                  placeholder="开始日期">
+                </el-date-picker>
+                <el-date-picker
+                  v-if="ruleForm.timeLimit == 2"
+                  v-model="ruleForm.effectiveDateEnd"
+                  type="date"
+                  placeholder="结束日期">
                 </el-date-picker>
               </div>
             </div>
@@ -519,7 +518,8 @@
 </template>
 
 <script>
-  import { getList,addList,eitList,deleteList,listUserGrade,mmc,deletedelById } from "@/api/EventMarketing/SaveBlock";
+  import { getList,addList,eitList,deleteList,listUserGrade,mmc,deletedelById,cardValueRule,saveOrUpdate } from "@/api/EventMarketing/SaveBlock";
+  import {oilNumberList1} from "@/api/order/oilnumgun";
   import {getActiveConsumption, listExchange, listFavorable} from "@/api/EventMarketing/activeConsumption";
   import {delLJGoods} from "@/api/convenienceStore/ljgoods";
   export default {
@@ -530,12 +530,15 @@
         ruleForm: {
           name: '',
           region: '',
-          date1: '',
+          oilLimit:1,
+          productLimit:1,
+          timeLimit:1,
           date2: '',
           delivery: false,
           type: [],
           resource: '',
-          desc: ''
+          desc: '',
+          oilNumber:[]
         },
         Crule:false,
         orderShow:false,
@@ -654,6 +657,7 @@
           cardValueChildList:[],
         },
         tableDatas: [],
+        oilnumList:[],
         formLabelWidth: '100px',
         timer: null,
         options: [ ],
@@ -671,11 +675,26 @@
     methods:{
       addCrule(){
         this.Crule =! this.Crule
+        cardValueRule().then(res=>{
+          this.ruleForm = res.data
+          this.ruleForm.oilNumber = res.data.oilNumber.split(',')
+          console.log(this.ruleForm,'1231232')
+        })
+        oilNumberList1().then(res=>{
+          console.log(res)
+          this.oilnumList = res.data.records
+        })
       },
       submitForms(formName) {
         this.$refs[formName].validate((valid) => {
           if (valid) {
-            alert('submit!');
+            this.ruleForm.oilNumber = this.ruleForm.oilNumber.join(',')
+            saveOrUpdate(this.ruleForm).then(res=>{
+              console.log(res)
+              if(res.code == 200){
+                this.$message.success('添加成功')
+              }
+            })
           } else {
             console.log('error submit!!');
             return false;
@@ -835,7 +854,6 @@
           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
           if (this.form.isonline==1) {
             this.isOnLine = true
diff --git a/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue b/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
index 2536ab172..c97da4ab0 100644
--- a/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
@@ -45,7 +45,7 @@
         <div style="display: flex;justify-content: space-between;box-sizing: border-box;align-items: center;padding: 1px">
           <div class="left-c">新型加油卡，以储油为特色，让车主提前锁定油价，享受便捷灵活的加油体验</div>
           <div>
-            <el-button type="primary" style="margin-bottom: 10px " >编辑囤油卡规则</el-button>
+
             <el-button type="primary" style="margin-bottom: 10px " @click="addoilBlock()">新增囤油卡活动</el-button>
           </div>