From 47c9ffc2d96616af096a52c336f076c75805a855 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Mon, 11 Mar 2024 15:59:18 +0800
Subject: [PATCH] bug

---
 .../pagesHome/oilRecharge/oilRecharge.vue     | 53 ++++++++++++++-----
 1 file changed, 40 insertions(+), 13 deletions(-)

diff --git a/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue b/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue
index 60e688cc0..6900484de 100644
--- a/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue
+++ b/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue
@@ -89,19 +89,26 @@
 			</view>
 			<!-- 囤油充值 -->
 			<view class="boxback" v-if="actinput == 1">
-				<view class="box-cz">
-					<view class="box-jg" :class="{ 'actbox' : actindex == index }" v-for="(item,index) in cardFuleList"
+				<swiper class="swiper" style="width: 100%;height: 70px;" circular
+					:autoplay="autoplay" :interval="interval" :vertical="true" :duration="duration">
+					<swiper-item  class="conttainer-box" v-for="(item,index) in cardList" :key="index">
+						<view class="box_s">
+							{{item.discountActiveDescribe || ''}}
+						</view>
+					</swiper-item>
+				</swiper>
+				<view class="box-cz" style="margin-top: 20px;">
+					<view :class="{ 'actbox' : actindex == index }" v-for="(item,index) in cardFuleList"
+						style="display: flex;justify-content: space-around;width: 98%;border-radius: 8px;border: 1px solid #e2e2e2;
+							box-sizing: border-box;padding: 10px;margin: 5px;height: 60px;line-height: 18px;"
 						:key="index" @click="fuleindex(index,item.rechargeBalance,item.points,item.id)">
-						<view class="s-title" :class="{ 'actsize' : actindex == index }">油品:{{item.type}}
-						</view>
-						<view class="s-title" :class="{ 'actsize' : actindex == index }">油号:{{item.oilType}}
-						</view>
-						<view class="min-size" :class="{ 'actsize' : actindex == index }">单价￥<text
-								style="font-weight: bold;"></text>{{item.incomeLitres}}元/升</view>
-						<view class="min-size" :class="{ 'actsize' : actindex == index }">总价￥{{item.rechargeBalance}}元
-						</view>
-						<view class="min-size" :class="{ 'actsize' : actindex == index }">升数:{{item.incomeLitres}}L
-						</view>
+						<view style="font-size: 16px;font-weight: bold;line-height: 40px;" :class="{ 'actsize' : actindex == index }">{{item.oilType}}</view>
+						<!-- <view style="font-size: 12px;font-weight: bold;margin: 0 5px;" :class="{ 'actsize' : actindex == index }">:</view> -->
+						<view class="min-size1" :class="{ 'actsize' : actindex == index }"><view>国标油价</view><view>{{item.gbPrice}}￥/L</view></view>
+						<view class="min-size1" :class="{ 'actsize' : actindex == index }"><view>本站油价</view><view>{{item.oilPrice}}￥/L</view></view>
+						<view class="min-size1" :class="{ 'actsize' : actindex == index }"><view>锁价</view><view>{{item.lockupPrice}}￥/L</view></view>
+						<view class="min-size1" :class="{ 'actsize' : actindex == index }"><view>总升数</view><view>{{item.incomeLitres || 0}}L</view></view>
+						<view class="min-size1" style="color: red;" :class="{ 'actsize' : actindex == index }"><view>总价</view><view>￥{{item.rechargeBalance}}</view></view>
 					</view>
 				</view>
 				<view class="box-hui">
@@ -230,6 +237,7 @@
 				shuomingFList: [],
 				columns: [],
 				actList: [],
+				cardList: [],
 				autoplay: true,
 				interval: 3000,
 				duration: 500,
@@ -261,16 +269,17 @@
 			console.log('11111111111111', this.cardRecordId);
 			if (option.id == 0) {
 				this.getValueCars();
+				this.activen()
 			}
 			if (option.id == 1) {
 				console.log("囤油");
 				this.getFuelCars();
+				this.getFuelCarList()
 			}
 
 		},
 		onShow() {
 			this.getStaffList()
-			this.activen()
 		},
 		methods: {
 
@@ -625,6 +634,18 @@
 					}
 				})
 			},
+			//囤油卡
+			getFuelCarList() {
+				request({
+					url: 'business/marketingActivity/cardFuelDiesel/appletList?storeId='+uni.getStorageSync("storeId"),
+					method: 'get',
+				}).then(res => {
+					if (res.code == 200) {
+						console.log(res,111);
+						this.cardList = res.data
+					}
+				})
+			},
 			//礼品卡兑换
 			exchangeGift() {
 				request({
@@ -822,6 +843,12 @@
 		//color: #e2e2e2;
 		text-align: center;
 	}
+	.min-size1 {
+		font-size: 12px;
+		//color: #e2e2e2;
+		text-align: center;
+		margin: 0 5px;
+	}
 
 	.actbox {
 		border: 1px solid #1678ff;