From ce0c69be7aa83833184bcc1e743ff378146f81ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com>
Date: Fri, 8 Dec 2023 13:33:52 +0800
Subject: [PATCH] bug 12.08

---
 .../EventMarketing/cardFavorable/index.vue    | 16 ++++++++--
 .../pagesHome/oilRecharge/oilRecharge.vue     | 29 ++++++++++---------
 2 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue b/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue
index d18d21835..039f11b18 100644
--- a/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue
@@ -162,7 +162,7 @@
         </el-form-item>
         <el-form-item label="可用油品" prop="oilType" v-if="form.type == 0">
           <el-checkbox-group v-model="form.oilType">
-            <el-checkbox v-for="city in oillist" :label="city" :key="city">{{city}}</el-checkbox>
+            <el-checkbox v-for="(item,index) in oillist" :label="item.id" :key="index">{{item.oilType}}{{item.oilName}}</el-checkbox>
           </el-checkbox-group>
         </el-form-item>
         <el-form-item label="满足金额" prop="satisfiedAmount" v-if="form.discountType == 0">
@@ -362,7 +362,7 @@
 <script>
   import QRCode from 'qrcodejs2'
   import { listFavorable, getFavorable,getcardFavorable,getcount,getcountList, delFavorable, addFavorable, updateFavorable } from "@/api/EventMarketing/cardFavorable";
-
+  import { getoilName, } from "@/api/EventMarketing/activeConsumption";
 export default {
   name: "Favorable",
   data() {
@@ -391,7 +391,8 @@ export default {
       yue: ['1', '2', '3', '4','5','6','7','8','9','10','11','12','13','14','15','16','17','18','19','20','21','22','23','24','25','26','27','28','29','30','31'],
       lookyue:[],
       zhou:['周一','周二','周三','周四','周五','周六','周天'],
-      oillist:['92#','95#','98#','0#','-10#','LNG','CNG','京92#','京95#','京0#',],
+      oillist:[],
+     /* oillist:['92#','95#','98#','0#','-10#','LNG','CNG','京92#','京95#','京0#',],*/
       checkboxGroup1: ['1'],
       centerDialogVisible:false,
       loadingdialog:true,
@@ -513,8 +514,17 @@ export default {
   },
   created() {
     this.getList();
+    this.getoilName()
   },
   methods: {
+    getoilName(){
+      getoilName().then(res=>{
+        console.log(res)
+        this.oillist = res.data
+
+      })
+
+    },
     yueinput(e){
       console.log(e)
       this.lookyue = e
diff --git a/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue b/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue
index 6493fcbe6..2a809de8c 100644
--- a/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue
+++ b/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue
@@ -40,22 +40,23 @@
 					</view>
 
           <!-- 底部 -->
-          <view class="bottom-box">
-            <view class="anniu">
-              <text>立即充值</text>
-            </view>
-            <view class="dibu">
-              <view class="">充值记录</view>
-              <uni-icons type="right" color="#1678ff" size="14"></uni-icons>
-            </view>
 
-            <view class="box-hui">
-              <view style="margin-bottom: 15px;">服务说明</view>
-              <view class="huisize">1.该服务为储蓄卡直充服务，仅限本站使用</view>
-              <view class="huisize">2.请确认充值类型正确后再付款，一经充值不支持退款； </view>
-            </view>
-          </view>
 				</view>
+        <view class="bottom-box">
+          <view class="anniu">
+            <text>立即充值</text>
+          </view>
+          <view class="dibu">
+            <view class="">充值记录</view>
+            <uni-icons type="right" color="#1678ff" size="14"></uni-icons>
+          </view>
+
+          <view class="box-hui">
+            <view style="margin-bottom: 15px;">服务说明</view>
+            <view class="huisize">1.该服务为储蓄卡直充服务，仅限本站使用</view>
+            <view class="huisize">2.请确认充值类型正确后再付款，一经充值不支持退款； </view>
+          </view>
+        </view>
 
 			</view>
 			<!-- 囤油充值 -->