From bc9eeb2710b19bf09a12f28ade9755d2c9703b83 Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Mon, 23 May 2022 10:55:38 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9H5=20=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=B7=B3=E8=BD=AC=202.=E4=BB=B7=E6=A0=BC?=
 =?UTF-8?q?=E7=B2=BE=E5=BA=A6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                     | 16 ++++++++--------
 pages/goods/refuel-succes/refuel-succes.vue | 21 +++++++++++++++++++++
 pages/user/order_details/order_details.vue  |  8 ++++----
 pages/user/order_list/order_list.vue        |  2 +-
 4 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/App.vue b/App.vue
index c85253e..751aaba 100644
--- a/App.vue
+++ b/App.vue
@@ -5,15 +5,15 @@
 			// brestUrl: 'http://192.168.3.4:9302/brest',
 			// imgUrl: 'https://192.168.3.4:9301/filesystem/',
 			//正式
-			// url: 'https://hsg.dctpay.com/crest',
-			// imgUrl: 'https://hsg.dctpay.com/filesystem/',
-			// brestUrl : 'https://hsg.dctpay.com/brest',
-			// imageWxImg:'https://hsg.dctpay.com/filesystem/wxApplets/',
+			url: 'https://hsg.dctpay.com/crest',
+			imgUrl: 'https://hsg.dctpay.com/filesystem/',
+			brestUrl : 'https://hsg.dctpay.com/brest',
+			imageWxImg:'https://hsg.dctpay.com/filesystem/wxApplets/',
 			//测试
-			url: 'https://hsgcs.dctpay.com/crest',
-			brestUrl : 'https://hsgcs.dctpay.com/brest',
-			imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
-			imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/',
+			// url: 'https://hsgcs.dctpay.com/crest',
+			// brestUrl : 'https://hsgcs.dctpay.com/brest',
+			// imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
+			// imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/',
 			userInfo: "",
 			brestUserInfo : '',
 			openId: '',
diff --git a/pages/goods/refuel-succes/refuel-succes.vue b/pages/goods/refuel-succes/refuel-succes.vue
index 6cb378b..7f4d20b 100644
--- a/pages/goods/refuel-succes/refuel-succes.vue
+++ b/pages/goods/refuel-succes/refuel-succes.vue
@@ -68,6 +68,8 @@
 				<text class="paddtright10">￥{{orderInfo.deductionPrice}}</text>
 			</view>
 		</view>
+		
+		<view class="btn mart50" @click="backHome()">返回首页</view>
 	<!-- 	<view class="width90 font13 fcor999 mart10">
 			*本站不支持电子发票,如需发票请到加油站前台索取
 		</view> -->
@@ -127,6 +129,11 @@
 					}
 				})
 			},
+			backHome(){
+				uni.switchTab({
+					url:'../../tabBar/home/home'
+				})
+			}
 		}
 	}
 </script>
@@ -193,4 +200,18 @@
 		border-top: 1px solid #58C4E6;
 		border-left: 1px solid #58C4E6;
 	}
+	.btn {
+		color: #FFFFFF;
+		background-color: #0083f5;
+		width: 80%;
+		margin-left: 10%;
+		margin-top: 80rpx;
+		margin-bottom: 50rpx;
+		height: 90rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		border-radius: 45rpx;
+		font-size: 40rpx;
+	}
 </style>
diff --git a/pages/user/order_details/order_details.vue b/pages/user/order_details/order_details.vue
index eb4d0c6..19870d6 100644
--- a/pages/user/order_details/order_details.vue
+++ b/pages/user/order_details/order_details.vue
@@ -112,7 +112,7 @@
 				<view class="right" v-else>
 					<image style="width: 15px;height: 15px;vertical-align: sub;"
 						src="../../../static/img/jfx.png">
-					</image>{{recinfo.totalPrice * 10 * 10}}
+					</image>{{(recinfo.totalPrice * 10 * 10).toFixed(0)}}
 				</view>
 			</view>
 			<view class="row" v-if="recinfo.payPrice">
@@ -125,7 +125,7 @@
 				<view class="right" v-else>
 					<image style="width: 15px;height: 15px;vertical-align: sub;"
 						src="../../../static/img/jfx.png">
-					</image>{{recinfo.payPrice* 10 * 10}}
+					</image>{{(recinfo.payPrice* 10 * 10).toFixed(0)}}
 				</view>
 			</view>
 			<view class="row" v-if="recinfo.payRealPrice">
@@ -138,7 +138,7 @@
 				<view class="right" v-else>
 					<image style="width: 15px;height: 15px;vertical-align: sub;"
 						src="../../../static/img/jfx.png">
-					</image>{{recinfo.payRealPrice * 10 * 10}}
+					</image>{{(recinfo.payRealPrice * 10 * 10).toFixed(0)}}
 				</view>
 			</view>
 			<view class="row" v-if="recinfo.deductionPrice">
@@ -151,7 +151,7 @@
 				<view class="right" v-else>
 					<image style="width: 15px;height: 15px;vertical-align: sub;"
 						src="../../../static/img/jfx.png">
-					</image>{{recinfo.deductionPrice * 10 * 10}}
+					</image>{{(recinfo.deductionPrice * 10 * 10).toFixed(0)}}
 				</view>
 			</view>
 			<view class="row">
diff --git a/pages/user/order_list/order_list.vue b/pages/user/order_list/order_list.vue
index 446b697..e423025 100644
--- a/pages/user/order_list/order_list.vue
+++ b/pages/user/order_list/order_list.vue
@@ -78,7 +78,7 @@
 							<view class="font16 fontwig6 text1 fcor333 aliitem" style="justify-content: flex-end;"
 								v-else>
 								<image style="width: 15px;height: 15px;" src="../../../static/img/jfx.png">
-								</image>{{row.payPrice * 10 * 10}}
+								</image>{{(row.payPrice * 10 * 10).toFixed(0)}}
 							</view>
 							<view class="fotrt font15 text1 fcor999 mart5">{{typeText[row.orderStatus]}}</view>
 						</view>