1212

pages/tabbar/station/stationList.vue

@@ -260,6 +260,7 @@
 			this.tools.userLocationChenk().then(res => { 
 				this.refreshLocation();
 			}).catch(err => {});
+			this.getSiteList()
 		},
 		onLoad() { 
 			// this.refreshLocation()
@@ -268,7 +269,6 @@
 			} else {
 				this.isFilterData=true
 			}
-			this.getSiteList()
 		},
 
 		onPullDownRefresh() {
@@ -430,31 +430,36 @@
 
 			},
 			toDetail(item) {
-				let itemS = encodeURIComponent(JSON.stringify(item))
-				if (uni.getStorageSync('user')) {
-					uni.navigateTo({
-						url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`,
-						fail: (err) => {
-							// console.log(err)
-						},
-						success: () => {
-							// console.log('err')
-						}
-					})
-				} else {
-					uni.showModal({
-						title: '请您登录',
-						content: "登录小星加油才可以加油 |˛˙꒳​˙)♡",
-						confirmText: '去登陆',
-						success: (res) => {
-							if (res.confirm) {
-								uni.reLaunch({
-									url: '../../../BagAuth/pages/login/login'
-								})
-							}
-						}
-					})
-				}
+				let itemS = encodeURIComponent(JSON.stringify(item));
+				uni.navigateTo({
+					url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`,
+					fail: (err) => {},
+					success: () => {}
+				})
+				// if (uni.getStorageSync('user')) {
+				// 	uni.navigateTo({
+				// 		url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`,
+				// 		fail: (err) => {
+				// 			// console.log(err)
+				// 		},
+				// 		success: () => {
+				// 			// console.log('err')
+				// 		}
+				// 	})
+				// } else {
+				// 	uni.showModal({
+				// 		title: '请您登录',
+				// 		content: "登录小星加油才可以加油 |˛˙꒳​˙)♡",
+				// 		confirmText: '去登陆',
+				// 		success: (res) => {
+				// 			if (res.confirm) {
+				// 				uni.reLaunch({
+				// 					url: '../../../BagAuth/pages/login/login'
+				// 				})
+				// 			}
+				// 		}
+				// 	})
+				// }
 			},
 			nameSelect(value, item) {
 				this.title2 = item.text