From cc5dc93ed5b4fe12b3108b359cddc1b5021d939d Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Fri, 20 May 2022 09:40:02 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=9B=A2=E6=B2=B9=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       | 16 ++++++++--------
 pages/goods/refuel-details/refuel-details.vue | 19 +++++++++++++++++--
 pages/login/register.vue                      |  1 -
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/App.vue b/App.vue
index 751aaba..c85253e 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-details/refuel-details.vue b/pages/goods/refuel-details/refuel-details.vue
index 6f24543..f7f3863 100644
--- a/pages/goods/refuel-details/refuel-details.vue
+++ b/pages/goods/refuel-details/refuel-details.vue
@@ -322,12 +322,27 @@
 				this.priceGun = item.priceGun;
 				this.totalPrice = '0.00';
 				this.discountPrice = '0.00';
-				this.inputMoney = '';
+				this.inputMoney = '';
+				this.oilLiters = '0';
+				this.discount = '0';
+				this.oilSubsidy = '0';
+				this.litersPreferences = '0';
+				this.pricePreferences = '0';
+				this.totalPreferences = '0';
 				this.$refs.popup.hide();
 			},
 			//选择油枪
 			changeValue2(item) {
-				this.gunNo = item.gunNo;
+				this.gunNo = item.gunNo;
+				this.totalPrice = '0.00';
+				this.discountPrice = '0.00';
+				this.inputMoney = '';
+				this.oilLiters = '0';
+				this.discount = '0';
+				this.oilSubsidy = '0';
+				this.litersPreferences = '0';
+				this.pricePreferences = '0';
+				this.totalPreferences = '0';
 				this.$refs.popup.hide();
 			},
 			// select(amount) {
diff --git a/pages/login/register.vue b/pages/login/register.vue
index 9d127a8..745b5b6 100644
--- a/pages/login/register.vue
+++ b/pages/login/register.vue
@@ -137,7 +137,6 @@
 							data: res.return_data.uniqueCode
 						})
 						uni.navigateBack({
-							delta:2
 						});
 					} else {
 						uni.showToast({