更新

BagStation/pages/components/price-select-tab.vue

@@ -365,6 +365,10 @@
 			activeCur: {
 				type: Number,
 				default: 0
+			},
+			siteId: {
+				type: String,
+				default: ""
 			}
 		},
 		data() {
@@ -672,10 +676,9 @@
 				})
 			},
 			checkInfo() {
-				// console.log(this.radio)
 				this.tsetPlate(this.plateNumber ? this.plateNumber : this.plateNumberSel)
-				if (!this.testPlateResult && !['1689182438357262336', '1689183144276463616', '1689185023261741056']
-					.includes(this.oilItem.siteId)) {
+				if (!this.testPlateResult && !['1689182438357262336', '1689183144276463616', '1689185023261741056','1762304610449412096']
+					.includes(this.siteId || this.oilItem.siteId)) {
 					// this.plateNumber=''
 					uni.showToast({
 						title: '车牌号不可为空或格式错误，请重新输入',
@@ -836,8 +839,8 @@
 			beforeMake() {
 				// console.log(this.radio, 'beforeMake')
 				this.tsetPlate(this.plateNumber ? this.plateNumber : this.plateNumberSel)
-				if (!this.testPlateResult &&  !['1689182438357262336', '1689183144276463616', '1689185023261741056']
-					.includes(this.oilItem.siteId)) {
+				if (!this.testPlateResult && !['1689182438357262336', '1689183144276463616', '1689185023261741056','1762304610449412096']
+					.includes(this.siteId || this.oilItem.siteId)) {
 					// this.plateNumber=''
 					uni.showToast({
 						title: '车牌号不可为空或格式错误，请重新输入',

BagStation/pages/makeOrder/makeOrder.vue

@@ -63,7 +63,7 @@
 		<!-- 价格 -->
 		<price-select-tab @onChangePayQr="onChangePayQr" @onChangePay="onChangePay" :active-cur="activeCur"
 			:site-name="siteInfo.siteName" :channel-list="siteInfo.oilSiteChannelDetailsVos"
-			:channelJuli="siteInfo.juli"></price-select-tab>
+			:channelJuli="siteInfo.juli" :siteId="siteId"></price-select-tab>
 
 
 	</view>
@@ -79,6 +79,7 @@
 		data() {
 			return {
 				isBackPrev: true,
+				siteId:'',
 				otherImgURL: this.global.otherImgURL,
 				radio: 'B',
 				mainURL: this.global.mainURL,
@@ -109,6 +110,7 @@
 					if (authorization && target.siteId) {
 						// 扫码进入 返回按钮点击回到首页
 						this.isBackPrev = false
+						this.siteId = target.siteId
 						this.getSiteInfo(target.siteId)
 					}
 				} catch (e) {}

components/three-sites.vue

@@ -50,7 +50,7 @@
 			}
 		},
 		created() {
-			this.getSiteList()
+			this.refreshLocation()
 		},
 		methods: {
 			toSitePage(){
@@ -62,13 +62,14 @@
 			refreshLocation(){
 				uni.getLocation({
 				    type: 'wgs84',
-				    success: function (res) {
+				    success: (res) => {
 						uni.setStorageSync('location',res)
+						this.getSiteList()
 				    }
 				});
 			},
 			getSiteList() {
-				this.refreshLocation()
+				// this.refreshLocation()
 				let data1 = {
 					currentPage: 1,
 					pageSize: 3,

pages/tabbar/home/home.vue

@@ -83,7 +83,8 @@
 			</view>
 		</view>
 		<msg-models :showAuthFrror="showAuthFrror" @hideOneModal="hideModel"></msg-models>
-		<three-sites @hideOneModal="showThreeSites=false" :showThreeSites="showThreeSites"></three-sites>
+		<three-sites v-if="showThreeSites" @hideOneModal="showThreeSites=false"
+			:showThreeSites="showThreeSites"></three-sites>
 	</view>
 </template>
 
@@ -237,7 +238,8 @@
 		},
 
 		onPullDownRefresh() {
-			// this.refreshLocation()
+			this.refreshLocation()
+
 			setTimeout(function() {
 				uni.stopPullDownRefresh()
 			}, 800);
@@ -306,6 +308,7 @@
 					type: 'wgs84',
 					success: (res) => {
 						uni.setStorageSync('location', res)
+						this.getSiteList()
 					},
 					fail: () => {
 						uni.getSetting({
@@ -318,25 +321,23 @@
 										success: (resSec) => {
 											if (resSec.confirm) {
 												uni.openSetting({
-													success: (resThird) => {
-														if (resThird
-															.authSetting[
-																'scope.userLocation'
-															]) {
-															this.refreshLocation()
-														}
-													}
+
 												})
 											}
 										}
 									})
+								} else {
+									uni.showToast({
+										title: '获取定位失败，请稍后再试！',
+										icon: 'none'
+									})
 								}
 							}
 						})
 					},
-					complete: () => {
-						this.getSiteList()
-					},
+					// complete: () => {
+					// 	this.getSiteList()
+					// },
 				});
 			},
 
@@ -443,14 +444,16 @@
 					currentPage: 1,
 					pageSize: 10,
 					params: {
-						longitude: 117.157817,
-						latitude: 31.802472,
+						// longitude: 117.157817,
+						// latitude: 31.802472,
 						clientBelong: 'ZHONGPIN',
 						comprehensiveSort: 1,
 						zpDisable: 'ENABLE',
 						sort: "juli",
 						...uni.getStorageSync('location'),
 						...this.filterData,
+						// latitude: '37.38808',
+						// longitude: '112.40546'
 					}
 				};
 

pages/tabbar/station/stationList.vue

@@ -256,14 +256,14 @@
 				}
 			},
 		},
-		onShow() {
-			this.tools.userLocationChenk().then(res => {
-				this.refreshLocation();
-			}).catch(err => {});
-			this.getSiteList()
-		},
+		// onShow() {
+		// 	this.tools.userLocationChenk().then(res => {
+		// 		this.refreshLocation();
+		// 	}).catch(err => {});
+		// 	this.getSiteList()
+		// },
 		onLoad() {
-			// this.refreshLocation()
+			this.refreshLocation()
 			if (!uni.getStorageSync('filterData')) {
 				this.getFilterData()
 			} else {
@@ -369,15 +369,55 @@
 			onSelected(e) {
 				// console.log(e)
 			},
+			// refreshLocation() {
+			// 	uni.getLocation({
+			// 		type: 'wgs84',
+			// 		success: function(res) {
+			// 			uni.setStorageSync('location', res)
+			// 		}
+			// 	});
+			// },
 			refreshLocation() {
 				uni.getLocation({
 					type: 'wgs84',
-					success: function(res) {
+					success: (res) => {
 						uni.setStorageSync('location', res)
-					}
+						this.getSiteList()
+					},
+					fail: () => {
+						uni.getSetting({
+							success: (res) => {
+								if (!res.authSetting['scope.userLocation']) {
+									uni.showModal({
+										title: '请您打开定位权限',
+										content: '用于获取您当前位置附近的油站',
+										confirmText: '去设置',
+										success: (resSec) => {
+											if (resSec.confirm) {
+												uni.openSetting({
+													complete:() => {
+														// this.getSiteList()
+														// this.realPosition()
+														this.refreshLocation()
+													}
+												})
+											}
+										}
+									})
+								}else {
+									uni.showToast({
+										title:'获取定位失败，请稍后再试！',
+										icon:'none'
+									})
+								}
+							}
+						})
+					},
+					// complete: () => {
+					// 	this.getSiteList()
+					// },
 				});
 			},
-
 			getSiteList() {
 				let parameter = {
 					currentPage: this.currentPage,