充值记录

gasStation-uni/pagesMy/moneyBalance/moneyBalance.vue

@@ -11,10 +11,10 @@
 				<view class="kuangbox">使用规则 </view>
 				<view class="box-title">储值余额</view>
 				<view class="box-nmb">{{cardBalance}}元</view>
-				<view class="dis-bt">
+				<!-- <view class="dis-bt">
 					<view class="">累计获得0.00</view>
 					<view class="">已经抵用0.00</view>
-				</view>
+				</view> -->
 			</view>
 			<view class="box-gang">
 				<view class="">明细</view>
@@ -22,22 +22,22 @@
 			</view>
 			<view class="fuji">
 
-				<view class="mx-box" @click="godetails()">
+				<view class="mx-box" @click="godetails()" v-for="(item,index) in list" :key="index">
 					<view class="m-b-box">
 						<view class="box-name">加油站名称</view>
 						<view class="moneyname">充值成功</view>
 					</view>
 					<view class="y-bt">
 						<view class="sizehui">订单金额</view>
-						<view class="sizehei">￥0.01</view>
+						<view class="sizehei">￥{{item.rechargeBalance}}</view>
 					</view>
 					<view class="y-bt">
 						<view class="sizehui">优惠合计</view>
-						<view class="sizehong">￥0.01</view>
+						<view class="sizehong">￥{{item.obtain}}</view>
 					</view>
 					<view class="y-bt">
 						<view class="sizehui">订单时间</view>
-						<view class="sizehei">2023.01.23</view>
+						<view class="sizehei">{{item.createTime}}</view>
 					</view>
 					<view class="dibu">
 						<view class="xiaanniu">评价有礼</view>
@@ -56,6 +56,16 @@
 	export default {
 		data() {
 			return {
+				list: [],
+				totalDetail: '',
+				show: false,
+				query: {
+					mtUserId: '',
+					storeId: '',
+					recordName: '储值卡',
+					pageNo: 1,
+					pageSize: 10
+				},
 				cardBalance: 0.00,
 				title: '',
 
@@ -67,9 +77,31 @@
 
 		},
 		onShow() {
-			this.getUserBalance()
+			this.list = []
+			this.getUserBalance();
+			this.getAllOrderList();
 		},
 		methods: {
+			// 查询全部充值订单
+			getAllOrderList() {
+				request({
+					url: 'business/marketingActivity/cardValueRecord/selectAllRecord',
+					method: 'get',
+					params: this.query
+
+				}).then((res) => {
+					if (res.code == 200) {
+						if (this.pageNo != 1) {
+							this.list = this.list.concat(res.data.records)
+						} else {
+							this.list = res.data.records
+						}
+						this.totalDetail = res.data.total
+						this.show = false
+						uni.hideLoading();
+					}
+				})
+			},
 			godetails() {
 				uni.navigateTo({
 					url: '/pagesMy/details/details'

gasStation-uni/pagesMy/oilBalance/oilBalance.vue

@@ -21,7 +21,7 @@
 				<view class="">明细</view>
 				<!-- <view class="hui-anniu">全部 <u-icon name="arrow-down-fill" size="18"></u-icon> </view> -->
 			</view>
-			<view class="fuji">
+			<view class="fuji" v-for="(item,index) in list" :key="index">
 
 				<view class="mx-box">
 					<view class="m-b-box">
@@ -30,15 +30,15 @@
 					</view>
 					<view class="y-bt">
 						<view class="sizehui">订单金额</view>
-						<view class="sizehei">￥0.01</view>
+						<view class="sizehei">￥{{item.rechargeBalance}}</view>
 					</view>
 					<view class="y-bt">
 						<view class="sizehui">优惠合计</view>
-						<view class="sizehong">￥0.01</view>
+						<view class="sizehong">￥{{item.obtain}}</view>
 					</view>
 					<view class="y-bt">
 						<view class="sizehui">订单时间</view>
-						<view class="sizehei">2023.01.23</view>
+						<view class="sizehei">{{item.createTime}}</view>
 					</view>
 					<view class="dibu">
 						<view class="xiaanniu">评价有礼</view>
@@ -57,6 +57,16 @@
 	export default {
 		data() {
 			return {
+				list: [],
+				totalDetail: '',
+				show: false,
+				query: {
+					mtUserId: '',
+					storeId: '',
+					recordName: '升数卡',
+					pageNo: 1,
+					pageSize: 10
+				},
 				refuelMoney: [],
 				title: '',
 
@@ -68,9 +78,31 @@
 
 		},
 		onShow() {
+			this.list = []
+			this.getAllOrderList();
 			this.getUserBalance()
 		},
 		methods: {
+			// 查询全部充值订单
+			getAllOrderList() {
+				request({
+					url: 'business/marketingActivity/cardValueRecord/selectAllRecord',
+					method: 'get',
+					params: this.query
+
+				}).then((res) => {
+					if (res.code == 200) {
+						if (this.pageNo != 1) {
+							this.list = this.list.concat(res.data.records)
+						} else {
+							this.list = res.data.records
+						}
+						this.totalDetail = res.data.total
+						this.show = false
+						uni.hideLoading();
+					}
+				})
+			},
 			goback() {
 				uni.navigateBack()
 			},