From dece3803d4d918715c786ce2fb5b17d4a4bdb22c Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Thu, 26 May 2022 13:54:19 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E4=B8=80=E9=94=AE=E5=8A=A0?=
 =?UTF-8?q?=E6=B2=B9=E5=8A=9F=E8=83=BD?=
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 |  6 +++---
 pages/goods/refuel/refuel.vue                 | 20 +++++++++----------
 pages/tabBar/home/home.vue                    |  9 ++-------
 4 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/App.vue b/App.vue
index 1fbcc6f..48a6792 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 3639b7f..2a45777 100644
--- a/pages/goods/refuel-details/refuel-details.vue
+++ b/pages/goods/refuel-details/refuel-details.vue
@@ -230,7 +230,7 @@
 			this.getDictionaryByCodeTypeMoney();
 		},
 		onShow() {
-			this.user = app.globalData.userInfo;
+			this.user = app.globalData.userInfo;
 		},
 		onUnload() {
 			if (app.globalData.accountType && app.globalData.accountType == '000000#/') {
@@ -266,7 +266,7 @@
 					isTyAgent: this.isTyAgent
 				}
 				recentGasStation(params).then(res => {
-					uni.hideLoading();
+					uni.hideLoading();
 					if (res.return_code == '000000') {
 						this.storeList = res.return_data;
 						if (!this.oilNo) {
@@ -306,7 +306,7 @@
 					isTyAgent: this.isTyAgent
 				}
 				getGasDetailByStoreKey(params).then(res => {
-					uni.hideLoading();
+					uni.hideLoading();
 					if (res.return_code == '000000') {
 						this.storeList = res.return_data;
 						if (!this.oilNo) {
diff --git a/pages/goods/refuel/refuel.vue b/pages/goods/refuel/refuel.vue
index 1f79090..ea767a7 100644
--- a/pages/goods/refuel/refuel.vue
+++ b/pages/goods/refuel/refuel.vue
@@ -161,14 +161,14 @@
 			if (app.globalData.accountId) {
 				that.isTyAgent = true;
 			}
-			uni.getLocation({
-				type: 'wgs84',
-				success: function(res) {
-					that.latitudeful = res.latitude;
-					that.longitudeful = res.longitude;
-					that.getGasStoreList();
-				}
-			})
+			that.getGasStoreList();
+			// uni.getLocation({
+			// 	type: 'wgs84',
+			// 	success: function(res) {
+			// 		that.latitudeful = res.latitude;
+			// 		that.longitudeful = res.longitude;
+			// 	}
+			// })
 		},
 		onReachBottom() {
 			this.getGasStoreList();
@@ -254,8 +254,8 @@
 					distance: this.distanceNum,
 					regionId: app.globalData.cityId,
 					oilNoName: this.onilName,
-					latitude: this.latitudeful,
-					longitude: this.longitudeful,
+					latitude: app.globalData.latitude,
+					longitude: app.globalData.longitude,
 					pageNum: pagenum,
 					pageSize: this.pageSize,
 					isTyAgent: this.isTyAgent
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index 9a7295d..b0e261b 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -249,12 +249,7 @@
 			})
 			// #endif
 			//定位
-			// #ifdef MP
 			this.postionIng();
-			// #endif
-			// #ifdef H5
-			this.getCoordinates();
-			// #endif
 			uni.getStorage({
 				key: "user",
 				success(e) {
@@ -284,7 +279,7 @@
 		methods: {
 			jumpcdx() {
 				location.href =
-					'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https%3A%2F%2Fhsgcs.dctpay.com%2FhsgH5%2Findex.html%23%2F&response_type=code&scope=snsapi_base&state=1#wechat_redirect';
+					'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https%3A%2F%2Fhsg.dctpay.com%2FhsgH5%2Findex.html%23%2F&response_type=code&scope=snsapi_base&state=1#wechat_redirect';
 			},
 			//获取首页功能
 			getCmsContentcmsContent() {
@@ -388,7 +383,7 @@
 					type: 'wgs84',
 					success: function(res) {
 						app.globalData.latitude = res.latitude;
-						app.globalData.longitude = res.longitude;
+						app.globalData.longitude = res.longitude;
 						// that.findByLatAndLng(res.longitude, res.latitude);
 						// #ifdef H5
 						that.getUserLocation(res.longitude, res.latitude);