diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/mapper/xml/FleetConsumeRecordMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/mapper/xml/FleetConsumeRecordMapper.xml
index decd493e2..d39ae991a 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/mapper/xml/FleetConsumeRecordMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/mapper/xml/FleetConsumeRecordMapper.xml
@@ -41,7 +41,7 @@
             </if>
 
         </where>
-        order by create_time desc
+        order by fc.create_time desc
     </select>
 </mapper>
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetLinesChangeServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetLinesChangeServiceImpl.java
index 6112365c3..ff46697cd 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetLinesChangeServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetLinesChangeServiceImpl.java
@@ -31,7 +31,7 @@ public class FleetLinesChangeServiceImpl extends ServiceImpl<FleetLinesChangeMap
     @Override
     public IPage<FleetLinesChangeVo> queryByPageUni(Page page1, FleetLinesChangeVo fleetLinesChangeVo) {
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
-        fleetLinesChangeVo.setUserId(nowAccountInfo.getId());
+//        fleetLinesChangeVo.setUserId(nowAccountInfo.getId());
         if (ObjectUtil.isNotEmpty(fleetLinesChangeVo.getStartTime())) {
             DateTime parse = DateUtil.parse(fleetLinesChangeVo.getStartTime(), "yyyy-MM");
             fleetLinesChangeVo.setStartTime(DateUtil.beginOfMonth(parse).toString());
diff --git a/gasStation-uni/pagesMy/fleetInfo/fund.vue b/gasStation-uni/pagesMy/fleetInfo/fund.vue
index f654b5683..ea89f08e0 100644
--- a/gasStation-uni/pagesMy/fleetInfo/fund.vue
+++ b/gasStation-uni/pagesMy/fleetInfo/fund.vue
@@ -11,99 +11,62 @@
 				<view class="card_box c-url">
 
 					<view style="margin: 13px 0px;">可用余额（元）</view>
-					<view class="r-num">1299.00</view>
+					<view class="r-num">{{fleetBalance}}</view>
 				</view>
 				<view class="tab-bs">
 					<view class="w_box" @click="show1 = true">类型筛选 <u-icon name="arrow-down-fill"></u-icon> </view>
 					<view class="w_box" @click="show = true">全部时间 <u-icon name="arrow-down-fill"></u-icon> </view>
 				</view>
-				<view class="bai_box">
+				<view class="bai_box" v-for="item in pointsList">
 					<view class="left-img">
 						<!-- <image src="../../static/icon/hyxf.png" mode=""></image> -->
 						<image src="../../static/icon/jfdh.png" mode=""></image>
 					</view>
 					<view style="width: 85%;">
 						<view class="right-box">
-							<view class="l-text">积分兑换</view>
-							<view class="r-text">900</view>
+							<view class="l-text">{{item.fromType}}</view>
+							<view class="r-text">{{item.cardPaymentAmount}}</view>
 						</view>
 						<view class="right-box">
 							<view class="">储值卡</view>
-							<view class="">余额120000.00</view>
+							<view class="">余额{{item.afterTheChange}}</view>
 						</view>
 						<view class="right-box">
-							<view class="">中建锦绣二期店</view>
-							<view class="">2024-09-09 16:54:09</view>
+							<view class="">{{item.storeName}}</view>
+							<view class="">{{item.paymentTime}}</view>
 						</view>
 					</view>
 				</view>
-				<view class="bai_box">
-					<view class="left-img">
-						<image src="../../static/icon/hycz.png" mode=""></image>
-					</view>
-					<view style="width: 85%;">
-						<view class="right-box">
-							<view class="l-text">会员充值</view>
-							<view class="r-text">900</view>
-						</view>
-						<view class="right-box">
-							<view class="">储值卡</view>
-							<view class="">余额120000.00</view>
-						</view>
-						<view class="right-box">
-							<view class="">中建锦绣二期店</view>
-							<view class="">2024-09-09 16:54:09</view>
-						</view>
-					</view>
-				</view>
-				<view class="bai_box">
-					<view class="left-img">
-						<image src="../../static/icon/yp.png" mode=""></image>
-					</view>
-					<view style="width: 85%;">
-						<view class="right-box">
-							<view class="l-text">油品</view>
-							<view class="r-text">900</view>
-						</view>
-						<view class="right-box">
-							<view class="">储值卡</view>
-							<view class="">余额120000.00</view>
-						</view>
-						<view class="right-box">
-							<view class="">中建锦绣二期店</view>
-							<view class="">2024-09-09 16:54:09</view>
-						</view>
-					</view>
-				</view>
-				<!-- <view v-if="!pointsList || pointsList.length==0">
-				<u-empty mode="list" icon="http://cdn.uviewui.com/uview/empty/list.png">
-				</u-empty>
-			</view> -->
 				<u-datetime-picker :show="show" v-model="value1" mode="year-month" @cancel="cancel1"
 					@confirm="confirm1"></u-datetime-picker>
-				<u-picker :show="show1" :columns="columns" @cancel="cancel" @confirm="confirm"></u-picker>
+				<u-picker :show="show1" :columns="columnsBalance" keyName="label" @cancel="cancel" @confirm="confirmBalance"></u-picker>
 			</view>
 			<view v-if="type==1">
 				<view class="tab-bs">
 					<view class="w_box" @click="show1 = true">类型筛选 <u-icon name="arrow-down-fill"></u-icon> </view>
 					<view class="w_box" @click="show = true">全部时间 <u-icon name="arrow-down-fill"></u-icon> </view>
 				</view>
-				<view class="bai_box">
+				<view class="bai_box" v-for=" item in pointsList">
 					<view class="left-img">
 						<image src="../../static/icon/hyxf.png" mode=""></image>
 					</view>
 					<view style="width: 85%;">
 						<view class="right-box">
-							<view class="l-text">额度增加</view>
-							<view class="r-text">+2000.00</view>
+							<view class="l-text" v-if="item.adjustType == 0">额度增加</view>
+							<view class="l-text" v-else>额度扣除</view>
+							<view class="r-text">
+								<span v-if="item.adjustType == 0">+</span>
+								<span v-else>-</span>
+								{{item.adjustLimit}}
+							</view>
 						</view>
 						<view class="right-box">
-							<view class="">小小（156****6655）</view>
-							<view class="">当前额度0.00</view>
+							<view class="">{{item.userName}}</view>
+							<view class="">当前额度{{item.remainingCreditLimit}}</view>
 						</view>
 						<view class="right-box">
-							<view class="">操作人：问问</view>
-							<view class="">2024-09-09 16:54:09</view>
+							<view class="">操作人：{{item.createName}}</view>
+							<view class="">{{item.createTime}}</view>
 						</view>
 					</view>
 				</view>
@@ -113,7 +76,8 @@
 			</view> -->
 				<u-datetime-picker :show="show" v-model="value1" mode="year-month" @cancel="cancel1"
 					@confirm="confirm1"></u-datetime-picker>
-				<u-picker :show="show1" :columns="columns" @cancel="cancel" @confirm="confirm"></u-picker>
+				<u-picker :show="show1" :columns="columns" keyName="label" @cancel="cancel"
+					@confirm="confirm"></u-picker>
 			</view>
 		</view>
 	</view>
@@ -141,8 +105,30 @@
 				show: false,
 				show1: false,
 				value1: Number(new Date()),
+				fleetBalance:0,
 				columns: [
-					['全部类型', '油品', '积分兑换', '会员充值']
+					[{
+						label: '全部类型',
+						type: null
+					}, {
+						label: '额度增加',
+						type: 0
+					}, {
+						label: '额度扣除',
+						type: 1
+					}]
+				],
+				columnsBalance: [
+					[{
+						label:'全部类型',
+						type:null
+					}, {
+						label:'油品'
+					}, {
+						label:'积分兑换'
+					}, {
+						label:"会员充值"
+					}]
 				],
 				queryParams: {
 					pageNo: 1,
@@ -150,17 +136,20 @@
 					type: "",
 					storeId: uni.getStorageSync("storeId"),
 					changeReason: "",
+					fleetId: "",
 					startTime: ""
 				},
 				pointsList: [],
 				total: 0,
-				fleetId:'',
-				storeId:''
+				fleetId: '',
+				storeId: ''
 			}
 		},
 		onLoad(e) {
-			this.fleetId = e.fleetId
-			this.storeId = uni.getStorageSync("storeId")
+			this.queryParams.fleetId = e.fleetId
+			// console.log('this.fleetId', this.fleetId);
+			this.storeId = uni.getStorageSync("storeId"),
+			this.getFleetBalance()
 		},
 		onShow() {
 			this.query.chainStoreId = uni.getStorageSync('chainStoreId');
@@ -190,6 +179,11 @@
 		methods: {
 			getindex(index) {
 				this.type = index
+				if (index == 1) {
+					this.getFleetLinesChange()
+				} else if (index == 0) {
+					this.getList()
+				}
 			},
 			// 获取余额信息
 			getUserBalance() {
@@ -203,9 +197,36 @@
 					}
 				})
 			},
-			getList() {
+			//获取车队金额
+			getFleetBalance(){
+				
 				request({
-					url: '/business/integral/integralDetail/queryByPageUni',
+					url: '/fleetInfo/' + this.queryParams.fleetId,
+					method: 'get',
+					// params: this.query
+				}).then(res => {
+					if (res.code == 200) {
+						this.fleetBalance = res.data.totalBalance
+					}
+				})
+			},
+			//获取额度
+			getFleetLinesChange() {
+				request({
+					url: '/fleetLinesChange/queryByPageUni',
+					method: 'get',
+					params: this.queryParams
+				}).then(res => {
+					if (res.code == 200) {
+						this.pointsList = res.data.records,
+							this.total = res.data.total
+					}
+				})
+			},
+			getList() {
+				console.log('this.queryParams:', this.queryParams);
+				request({
+					url: '/fleetConsumeRecord/queryByPageUni',
 					method: 'get',
 					params: this.queryParams
 				}).then(res => {
@@ -217,10 +238,23 @@
 			},
 			confirm(e) {
 				this.queryParams.pageNo = 1
+				console.log("获取的e:", e);
 				if (e.value[0] == '全部类型') {
-					this.queryParams.type = ""
+					this.queryParams.adjustType = null
 				} else {
-					this.queryParams.type = e.value[0]
+					this.queryParams.adjustType = e.value[0].type
+				}
+				this.getFleetLinesChange()
+				this.show1 = false
+			},
+			
+			confirmBalance(e) {
+				this.queryParams.pageNo = 1
+				console.log("获取的e:", e);
+				if (e.value[0] == '全部类型') {
+					this.queryParams.formType = null
+				} else {
+					this.queryParams.formType = e.value[0].type
 				}
 				this.getList()
 				this.show1 = false
@@ -240,7 +274,7 @@
 			confirm1(e) {
 				this.queryParams.startTime = this.timestampToString(e.value)
 				this.queryParams.pageNo = 1
-				this.getList()
+				this.getFleetLinesChange()
 				this.show = false
 			},
 			cancel1() {