From d654a1cd10555ec529bc3c7955defca0b7813595 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Thu, 19 Sep 2024 15:38:12 +0800
Subject: [PATCH] 9.19

---
 .../service/impl/IndexBannerServiceImpl.java  |  4 +-
 .../service/impl/UserBalanceServiceImpl.java  |  3 +-
 gasStation-uni/pages/index/index.vue          | 44 +++++++------------
 gasStation-uni/pagesHome/MyCard/MyCard.vue    | 32 +++++---------
 gasStation-uni/pagesHome/QRcode/QRcode.vue    | 34 +++++++++++++-
 5 files changed, 64 insertions(+), 53 deletions(-)

diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/indexBanner/service/impl/IndexBannerServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/indexBanner/service/impl/IndexBannerServiceImpl.java
index fd2f6992b..476f312df 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/indexBanner/service/impl/IndexBannerServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/indexBanner/service/impl/IndexBannerServiceImpl.java
@@ -54,8 +54,8 @@ public class IndexBannerServiceImpl extends ServiceImpl<IndexBannerMapper, Index
 
         int row = 0;
         if (StringUtils.isEmpty(indexBanner.getRouteUrl())){
-            indexBanner.setBannerUrl("http://47.95.206.185:83/topbj.png");
-            indexBanner.setRouteUrl("/pagesHome/Activity/index");
+            indexBanner.setBannerUrl("http://47.94.122.58:83/appletIndex.png");
+            indexBanner.setRouteUrl("/pages/refuel/refuel");
             row = baseMapper.insert(indexBanner);
         }else {
             IndexBanner indexBanner1 = this.selectIndexBannerByRouteUrl(indexBanner.getRouteUrl(),storeId);
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java
index ba72d817c..5d995132a 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java
@@ -345,7 +345,8 @@ public class UserBalanceServiceImpl extends ServiceImpl<UserBalanceMapper, UserB
         UserBlanceUniVo userBlanceUniVo = new UserBlanceUniVo();
         if (ObjectUtil.isNotEmpty(balance)) {
             userBlanceUniVo = BeanUtil.copyProperties(balance,UserBlanceUniVo.class);
-            userBlanceUniVo.setAllBalance(balance.getCardBalance()+balance.getGiveAmount());
+            Double giveAmount = ObjectUtil.isNotEmpty(balance.getGiveAmount()) ? balance.getGiveAmount() : 0;
+            userBlanceUniVo.setAllBalance(balance.getCardBalance()+ giveAmount);
         }else {
             userBlanceUniVo.setAllBalance(0.0);
             userBlanceUniVo.setCardBalance(0.0);
diff --git a/gasStation-uni/pages/index/index.vue b/gasStation-uni/pages/index/index.vue
index 836eb2a98..e265683fa 100644
--- a/gasStation-uni/pages/index/index.vue
+++ b/gasStation-uni/pages/index/index.vue
@@ -3,12 +3,11 @@
 
 		<view class="container">
 			<!-- 顶部 -->
-
 			<swiper class="swiper" style="width: 100%;height: 160px; border-radius: 6px;overflow: hidden; " circular
 				:indicator-dots="indicatorDots" :autoplay="autoplay" :interval="interval" :duration="duration">
-				<swiper-item v-for="(item,index) in 3" :key="index" @click="goPage(item.routeUrl)">
+				<swiper-item v-for="(item,index) in list1" :key="index" @click="goPage(item.routeUrl)">
 					<view class="swiper-item uni-bg-red">
-						<image src="../../static/new/banners.png" style="height: 163px; width: 100%;"></image>
+						<image :src="item.bannerUrl" style="height: 163px; width: 100%;"></image>
 					</view>
 				</swiper-item>
 			</swiper>
@@ -53,28 +52,20 @@
 				<view class="title-img">
 					<image src="../../static/new/t1.png" mode=""></image>
 				</view>
-				<view class="_gbox">
-					<view class="_ns">92#汽油</view>
-					<view class="_ns">¥8.99</view>
-					<view class="_ns _lv">0.12%↑</view>
-				</view>
-				<view class="_gbox">
-					<view class="_ns">92#汽油</view>
-					<view class="_ns">¥8.99</view>
-					<view class="_ns _red">0.12%↓</view>
-				</view>
-				<view class="_gbox">
-					<view class="_ns">92#汽油</view>
-					<view class="_ns">¥8.99</view>
-					<view class="_ns _red">0.12%↓</view>
-				</view>
-				<view class="_gbox">
-					<view class="_ns">92#汽油</view>
-					<view class="_ns">¥8.99</view>
-					<view class="_ns _red">0.12%↓</view>
+				<view style="height: 160px;overflow: auto;">
+					<view class="_gbox" v-for="(item,index) in oilTypeList" :key="index">
+						<view class="_ns">{{item.oilName}}{{item.oilType}}</view>
+						<view class="_ns">¥{{item.oilPrice}}</view>
+						<view class="_ns _lv">0.12%↑</view>
+					</view>
+					<!-- <view class="_gbox">
+						<view class="_ns">92#汽油</view>
+						<view class="_ns">¥8.99</view>
+						<view class="_ns _red">0.12%↓</view>
+					</view> -->
 				</view>
 			</view>
-			<view class="station-box" @click="ruleShow = true ">
+			<view class="station-box">
 				<view class="station-title" style="display: flex;justify-content: space-between;">
 					<view>{{store.name}}{{store.description ? "("+store.description+")" : ""}}</view>
 					<view class="lananniu" @click="goGoGo" v-if="distance!=''">
@@ -264,7 +255,7 @@
 			this.isRecharge()
 			// this.getAddress()
 			// this.getUserAuthority()
-			// this.getIndexBanner()
+			this.getIndexBanner()
 		},
 		components: {
 			tabbar
@@ -355,7 +346,6 @@
 									_this.list1[i].bannerUrl = _this.baseUrl + res.data[i].bannerUrl
 								}
 							}
-							console.log(_this.list1);
 						}
 					})
 				}
@@ -727,7 +717,7 @@
 						})
 
 						this.columns = [oilData]
-
+						console.log(this.oilTypeList, '728');
 					}
 				})
 			},
@@ -1216,4 +1206,4 @@
 		justify-content: center;
 		color: #fff;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/gasStation-uni/pagesHome/MyCard/MyCard.vue b/gasStation-uni/pagesHome/MyCard/MyCard.vue
index 1c968e58e..f91f813ab 100644
--- a/gasStation-uni/pagesHome/MyCard/MyCard.vue
+++ b/gasStation-uni/pagesHome/MyCard/MyCard.vue
@@ -11,11 +11,11 @@
 				储值卡余额
 			</view>
 			<view class="card-num">
-				¥123456.98
+				¥{{cardBalance.cardBalance}}
 			</view>
-			<view class="r-box">
+			<!-- <view class="r-box">
 				NO.xxxxxxxxxxxxxxxxxx
-			</view>
+			</view> -->
 		</view>
 		<view class="card_1">
 			<view class="top_card">
@@ -29,11 +29,11 @@
 				剩余油量
 			</view>
 			<view class="card-num">
-				123.98L
+				{{cardBalance.refuelMoney || 0}}L
 			</view>
-			<view class="r-box">
+			<!-- <view class="r-box">
 				NO.xxxxxxxxxxxxxxxxxx
-			</view>
+			</view> -->
 		</view>
 		<view class="card_2">
 			<view class="top_card">
@@ -48,9 +48,9 @@
 			<view class="card-b">
 				卡密：xxxxxxxxxxxxxxxxx
 			</view>
-			<view class="r-box">
+			<!-- <view class="r-box">
 				NO.xxxxxxxxxxxxxxxxxx
-			</view>
+			</view> -->
 		</view>
 	</view>
 </template>
@@ -79,7 +79,7 @@
 		},
 		onShow() {
 			this.query.chainStoreId = uni.getStorageSync('chainStoreId');
-			// this.getCardFuleRecords();
+			this.getCardFuleRecords();
 			this.getUserBalance()
 		},
 		methods: {
@@ -126,30 +126,20 @@
 					url: 'business/marketingActivity/cardFuelRecord/queryByPageApplet',
 					method: 'get',
 				}).then(res => {
-					console.log(res)
 					if (res.code == 200) {
 						this.cardsList = res.data.records
-						console.log(this.toil, 111, res);
+						console.log(this.cardsList,'131');
 					}
 				})
 			},
 			getUserBalance() {
-				this.cardsList = []
 				request({
 					url: '/business/userManager/user/getUserBalanceApplet',
 					method: 'get',
 					params: this.query
 				}).then(res => {
-					console.log(res)
 					if (res.code == 200) {
-						this.cardBalance = res.data.cardBalance
-						this.cardsList = JSON.parse(res.data.refuelMoney)
-						if (this.cardsList.length != 0) {
-							this.toil = this.cardsList.length - 1
-
-						} else {
-							this.toil = this.cardsList.length
-						}
+						this.cardBalance = res.data
 					}
 				})
 			},
diff --git a/gasStation-uni/pagesHome/QRcode/QRcode.vue b/gasStation-uni/pagesHome/QRcode/QRcode.vue
index a01da578b..a8ed36558 100644
--- a/gasStation-uni/pagesHome/QRcode/QRcode.vue
+++ b/gasStation-uni/pagesHome/QRcode/QRcode.vue
@@ -35,9 +35,9 @@
 				<view class="bottom-box">
 					<view class="">
 						<view class="h_siz">储值卡</view>
-						<view class="">余额￥42222.00</view>
+						<view class="">余额￥{{cardBalance.cardBalance}}</view>
 					</view>
-					<view class="">充值</view>
+					<view class="button_c" @click="goMemberRecharge()">充值</view>
 				</view>
 
 			</view>
@@ -115,17 +115,37 @@
 				barCode: "",
 				isLook: false,
 				timer: {},
+				cardBalance:{},
 			}
 		},
 		onLoad() {
 			this.getBarCode()
 			this.getQrCode()
 			this.countdown()
+			this.getUserInfo()
 		},
 		components: {
 
 		},
 		methods: {
+			// 跳转会员充值
+			goMemberRecharge() {
+				uni.navigateTo({
+					url: '/pagesHome/memberRecharge/index'
+				})
+			},
+			// 查询用户储值卡余额信息
+			getUserInfo(){
+				request({
+					url: '/business/userManager/user/getUserBalanceApplet',
+					method: 'get',
+					params: this.query
+				}).then(res => {
+					if (res.code == 200) {
+						this.cardBalance = res.data
+					}
+				})
+			},
 			// 是否查看数字
 			lookNumber() {
 				if (this.isLook) {
@@ -202,6 +222,16 @@
 </script>
 
 <style scoped lang="scss">
+	.button_c{
+		width: 60px;
+		height: 30px;
+		line-height: 30px;
+		text-align: center;
+		border-radius: 5px;
+		background-color: #FF9655;
+		color: #FFFFFF;
+	}
+	
 	.content {
 		background: #f4f5f6;
 	}