礼品卡

fuintAdmin/src/api/EventMarketing/oilBlock.js

@@ -41,9 +41,9 @@ export function eitList(data) {
   })
 }
 //删除列表
-export function deleteList(id) {
+export function deleteById(id) {
   return request({
-    url: 'business/marketingActivity/cardValue?idList='+id,
+    url: 'business/marketingActivity/cardFuelDiesel/'+id,
     method: 'delete',
 
   })

fuintAdmin/src/views/EventMarketing/giftBlock/index.vue

@@ -190,7 +190,7 @@
             >
           </el-table-column>
           <el-table-column
-            prop="effectiveTimeStart"
+            prop="useTime"
             label="使用时间"
            >
           </el-table-column>

fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue

@@ -36,9 +36,9 @@
         <div class="wrap-box">
           <div  class="tjbox" v-for="(item,index) in tjlist" :key="index" >
             <div>油品名称: <span class="cu">{{item.oilName}}</span>  </div>
-            <div>总参与人数: <span class="cu">{{item.peoples}}</span></div>
-            <div>售出总金额: <span class="cu">{{item.money}}</span></div>
-            <div>售出总升数: <span class="cu">{{item.litres}}</span></div>
+            <div>总参与人数: <span class="cu">{{item.peoples}}</span> 人</div>
+            <div>售出总金额: <span class="cu">{{item.money}}</span> 元</div>
+            <div>售出总升数: <span class="cu">{{item.litres}}</span> L</div>
           </div>
         </div>
       </el-card>
@@ -85,14 +85,14 @@
             label="活动时间"
             width="330"
             >
+<!--            <template slot-scope="scope" v-if="scope.row.activeTime==='2'">-->
             <template slot-scope="scope">
-              <div style="display: flex;align-items: center">
+              <div v-if="scope.row.activeTime==='2'" style="display: flex;align-items: center">
                 <div>{{scope.row.createTime}}</div>
                 <div> --- </div>
                 <div>{{scope.row.endTime}}</div>
               </div>
-
-<!--              <el-tag>{{scope.row.type}}</el-tag>-->
+              <div v-if="scope.row.activeTime==='1'" style="display: flex;align-items: center"><div>不限时间</div></div>
             </template>
           </el-table-column>
           <el-table-column
@@ -179,6 +179,13 @@
                 @click="handleUpdate(scope.row)"
               >修改</el-button>
 
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+              >删除
+              </el-button>
             </template>
 
           </el-table-column>
@@ -288,7 +295,7 @@
 </template>
 
 <script>
-  import { getList,oilName,addList,eitList,getById,getoilnum,getstatistics} from "@/api/EventMarketing/oilBlock";
+  import { getList,oilName,addList,eitList,getById,getoilnum,getstatistics,deleteById} from "@/api/EventMarketing/oilBlock";
   export default {
     dicts: ['oil_type'],
     name: 'index',
@@ -489,6 +496,14 @@
 
         this.centerDialogVisible = false
       },
+      handleDelete(data){
+        deleteById(data.id).then(res => {
+          if (res.code == 200) {
+            this.$message.success('删除成功')
+            this.getList()
+          }
+        })
+      },
       handleUpdate(data){
         getById(data.id).then(res=>{
           if (res.code == 200){