Merge branch '5月27日-一键加油分支' into dev

pages/goods/refuel-details/refuel-details.vue

@@ -215,7 +215,7 @@
 			this.counId = options.desId;
 			if (app.globalData.accountId) {
 				this.isTyAgent = true;
-			}
+			}
 			// #ifdef H5
 			if (app.globalData.accountType && app.globalData.accountType == '000000#/') {
 				this.recentGasStation();
@@ -265,7 +265,7 @@
 					longitude: app.globalData.longitude,
 					isTyAgent: this.isTyAgent
 				}
-				recentGasStation(params).then(res => {
+				recentGasStation(params).then(res => {
 					uni.hideLoading();
 					if (res.return_code == '000000') {
 						this.storeList = res.return_data;

pages/tabBar/home/home.vue

@@ -187,20 +187,6 @@
 					}
 				}
 			})
-			uni.getStorage({
-				key: 'accountType',
-				success(e) {
-					if (e.data) {
-						app.globalData.accountType = e.data;
-						if (e.data == '000000#/' && app.globalData.h5code) {
-							uni.navigateTo({
-								url: '../../goods/refuel-details/refuel-details'
-							})
-						}
-
-					}
-				}
-			})
 			// #endif
 		},
 		onLoad(options) {
@@ -384,6 +370,7 @@
 					success: function(res) {
 						app.globalData.latitude = res.latitude;
 						app.globalData.longitude = res.longitude;
+						
 						// that.findByLatAndLng(res.longitude, res.latitude);
 						// #ifdef H5
 						that.getUserLocation(res.longitude, res.latitude);
@@ -519,7 +506,21 @@
 							that.getCmsAactibity();
 							that.getCmsContentcmshome();
 							that.getCmsContentcmsContent();
-						}
+						}
+						uni.getStorage({
+							key: 'accountType',
+							success(e) {
+								if (e.data) {
+									app.globalData.accountType = e.data;
+									if (e.data == '000000#/' && app.globalData.h5code) {
+										uni.navigateTo({
+											url: '../../goods/refuel-details/refuel-details'
+										})
+									}
+						
+								}
+							}
+						})
 
 					})
 					.catch(err => {