From 298fa3037bc0f094187cf0c10992155270c8684a Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Sun, 29 Sep 2024 15:36:53 +0800
Subject: [PATCH] 9.29

---
 gasStation-uni/pages/refuel/refuel.vue        |  2 +-
 .../pagesHome/cardDetails/index.vue           |  4 +-
 .../pagesHome/myPointsOrder/details.vue       | 61 +++++++++++--------
 gasStation-uni/pagesMy/fleetInfo/fund.vue     |  8 ++-
 4 files changed, 44 insertions(+), 31 deletions(-)

diff --git a/gasStation-uni/pages/refuel/refuel.vue b/gasStation-uni/pages/refuel/refuel.vue
index e81728933..46aef0448 100644
--- a/gasStation-uni/pages/refuel/refuel.vue
+++ b/gasStation-uni/pages/refuel/refuel.vue
@@ -33,7 +33,7 @@
 						<view class="leftIput">
 							￥<input style="width: 100%;" v-model="oilOrder.amount" type="text" placeholder="请输入金额" />
 						</view>
-						<view class="rr_box">{{oilOrder.oilNum}}L</view>
+						<view class="rr_box">{{oilOrder.oilNum || 0}}L</view>
 					</view>
 					<view class="title_">
 						付款备注
diff --git a/gasStation-uni/pagesHome/cardDetails/index.vue b/gasStation-uni/pagesHome/cardDetails/index.vue
index d6014fe0c..02d5d7fe4 100644
--- a/gasStation-uni/pagesHome/cardDetails/index.vue
+++ b/gasStation-uni/pagesHome/cardDetails/index.vue
@@ -103,7 +103,7 @@
 				</view>
 				<u-icon name="arrow-right" color="#333"></u-icon>
 			</view>
-			<view class="g-box">
+			<view class="g-box" @click="goZJ()">
 				<view class="d-s">
 					<image src="../../static/my/fleetAmount.png" style="width: 20px; height: 20px;margin-right: 5px; ">
 					</image>
@@ -241,7 +241,7 @@
 			},
 			goZJ(){
 				uni.navigateTo({
-					url:'/pagesMy/fleetInfo/fund'
+					url:'/pagesMy/fleetInfo/fund?fleetId='+this.fleetId
 				})
 			},
 			// 跳转车队信息
diff --git a/gasStation-uni/pagesHome/myPointsOrder/details.vue b/gasStation-uni/pagesHome/myPointsOrder/details.vue
index 79da27d18..0d0068869 100644
--- a/gasStation-uni/pagesHome/myPointsOrder/details.vue
+++ b/gasStation-uni/pagesHome/myPointsOrder/details.vue
@@ -3,18 +3,22 @@
 		<view class="container">
 			<view class="box_f">
 				<view class="box_top">
-					<view class="">订单号：xxxxxxxxxxxxxxxxxxxx</view>
-					<view class="">未使用</view>
+					<view class="">订单号：{{orderInfo.orderNumber}}</view>
+					<view class="">{{orderInfo.orderStatus}}</view>
 				</view>
 				<view class="box_cont">
 					<view class="">
-						<image src="../../static/logo.png" style="width: 60px; height: 60px; "></image>
+						<image :src="baseUrl+orderInfo.coverImage" v-if="orderInfo.coverImage" style="width: 60px; height: 60px; "></image>
+						<image src="../../static/logo.png" v-else style="width: 60px; height: 60px; "></image>
 					</view>
 					<view class="r-bas">
-						<view style="font-size: 16px;color: #333333; margin-bottom: 5px;">虚拟产品</view>
-						<view class="">x1</view>
+						<view style="font-size: 16px;color: #333333; margin-bottom: 5px;">{{orderInfo. giftName}}</view>
+						<view class="">x{{orderInfo.exchangeQuantity || 0}}</view>
 						<view class="b-bs">
-							<view class="size1">实付： <text style="color: #E02020;">100积分</text> </view>
+							<view class="size1">
+								实付： <text style="color: #E02020;">{{orderInfo.integral}}积分</text>
+								<text style="color: #E02020;" v-if="orderInfo.amount">+{{orderInfo.amount}}元</text>
+							</view>
 
 						</view>
 					</view>
@@ -32,53 +36,53 @@
 				<view class="title_">自提信息</view>
 				<view class="b-s">
 					<view class="">油站名称</view>
-					<view class="">中建锦绣二期站</view>
+					<view class="">{{orderInfo.storeName}}</view>
 				</view>
 				<view class="b-s">
 					<view class="">油站地址</view>
-					<view class="">济南市槐荫区xxxxxx</view>
+					<view class="">{{orderInfo.storeAddress}}</view>
 				</view>
 				<view class="b-s">
 					<view class="">预留信息</view>
-					<view class="">张三 13964068390</view>
+					<view class="">{{orderInfo.addrName}} {{orderInfo.addrMobile}}</view>
 				</view>
 			</view>
 			<view class="box_" style="font-size: 14px;">
 				<view class="title_">金额信息</view>
 				<view class="b-s">
 					<view class="">订单金额</view>
-					<view class="r-size">￥0.00</view>
+					<view class="r-size">￥{{orderInfo.amount || 0}}</view>
 				</view>
 				<view class="b-s">
 					<view class="">订单积分</view>
-					<view class="r-size">100积分</view>
+					<view class="r-size">{{orderInfo.integral || 0}}积分</view>
 				</view>
 				<view class="b-s">
-					<view class="">共1件商品</view>
-					<view class="r-size">实付：100积分</view>
+					<view class="">共{{orderInfo.exchangeQuantity}}件商品</view>
+					<view class="r-size">实付：{{orderInfo.integral || 0}}积分</view>
 				</view>
 			</view>
 			<view class="box_" style="font-size: 14px;">
 				<view class="title_">订单信息</view>
 				<view class="b-s">
 					<view class="">订单编号</view>
-					<view class="">xxxxxxxxxxxxxxxxxxxx</view>
+					<view class="">{{orderInfo.orderNumber}}</view>
 				</view>
 				<view class="b-s">
 					<view class="">下单油站</view>
-					<view class="">中建锦绣二期站</view>
+					<view class="">{{orderInfo.storeName}}</view>
 				</view>
 				<view class="b-s">
 					<view class="">下单时间</view>
-					<view class="">2024-08-09 10:44:02</view>
+					<view class="">{{orderInfo.createTime}}</view>
 				</view>
 				<view class="b-s">
 					<view class="">支付方式</view>
-					<view class="">微信</view>
+					<view class="">{{orderInfo.paymentType}}</view>
 				</view>
 				<view class="b-s">
 					<view class="">支付时间</view>
-					<view class="">2024-08-09 10:45:02</view>
+					<view class="">{{orderInfo.createTime}}</view>
 				</view>
 			</view>
 
@@ -87,11 +91,13 @@
 </template>
 
 <script>
+	import config from '@/config'
 	import request from '../../utils/request';
 	export default {
 		data() {
 			return {
 				title: '',
+				baseUrl: config.baseUrl,
 				List: [],
 				pageNo: 1,
 				pageSize: 10,
@@ -100,7 +106,8 @@
 					code: 'https://qm.qq.com/cgi-bin/qm/qr?k=LKqML292dD2WvwQfAJXBUmvgbiB_TZWF&noverify=0', // 生成二维码的值
 					size: 300, // 460代表生成的二维码的宽高均为460rpx
 				},
-				orderId:'',
+				orderId: '',
+				orderInfo: {}
 			}
 		},
 		onPullDownRefresh() {
@@ -110,28 +117,28 @@
 		onReachBottom() {
 			// 触底加载
 			if (this.pageNo >= this.totalPage) {
-				
+
 			} else {
 				this.pageNo++
 			}
 		},
 		onLoad(e) {
-
+			this.orderId = e.orderId
+			this.getInfo()
 		},
 
 		components: {
 
 		},
 		methods: {
-			getInfo(){
+			getInfo() {
 				request({
-					url: 'business/integral/integralOrders/queryByPageUni',
+					url: 'business/integral/integralOrders/' + this.orderId,
 					method: 'get',
-					params: this.query
-				
 				}).then((res) => {
 					if (res.code == 200) {
-						
+						console.log(res, 132);
+						this.orderInfo = res.data
 					}
 				})
 			},
@@ -238,4 +245,4 @@
 	.r-size {
 		color: #E02020;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/gasStation-uni/pagesMy/fleetInfo/fund.vue b/gasStation-uni/pagesMy/fleetInfo/fund.vue
index a44fbb75a..f654b5683 100644
--- a/gasStation-uni/pagesMy/fleetInfo/fund.vue
+++ b/gasStation-uni/pagesMy/fleetInfo/fund.vue
@@ -153,9 +153,15 @@
 					startTime: ""
 				},
 				pointsList: [],
-				total: 0
+				total: 0,
+				fleetId:'',
+				storeId:''
 			}
 		},
+		onLoad(e) {
+			this.fleetId = e.fleetId
+			this.storeId = uni.getStorageSync("storeId")
+		},
 		onShow() {
 			this.query.chainStoreId = uni.getStorageSync('chainStoreId');
 			this.getUserBalance()