更新

BagAuth/pages/login/login.vue

@@ -23,24 +23,23 @@
 			<view class="gray-text">加载中...</view>
 		</view>
 		<view class="margin-lg flex flex-direction text-center">
-			<button v-if="checked" @click="decryptPhoneNumber" class="cu-btn round  bg-main-oil  lg text-lg"
+			<button v-if="checked" class="cu-btn round  bg-main-oil  lg text-lg" open-type="getPhoneNumber"
-				open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">
+				@getphonenumber="decryptPhoneNumber">
-				<text class="cuIcon-weixin padding-right-xs"> </text>
 				<text>
-					微信用户一键登录
+					一键登录
 				</text>
 			</button>
 			<button v-else class="cu-btn round  bg-main-oil  lg text-lg" @click="$refs.popup.open('center')">
-				<text class="cuIcon-weixin padding-right-xs"> </text>
+				<!-- <text class="cuIcon-weixin padding-right-xs"> </text> -->
 				<text>
-					微信用户一键登录
+					一键登录
 				</text>
 			</button>
 			<button class="cu-btn margin-top round lg" @tap="refuseEmpower">
 				输入手机号码登录
 			</button>
 			<button class="cu-btn bg-0 margin-top round  text-sm" @tap="refuseLogin">
-				跳过
+				跳过登录
 			</button>
 		</view>
 		<loginBottom ref='loginBottom' :checked='checked' @onCheck="checkAgree" />
@@ -174,28 +173,36 @@
 				})
 			},
 			decryptPhoneNumber(e) {
-				if (!this.checked) {
+				uni.getSetting({
-					uni.showToast({
+					success: () => {
-						title: '请您阅读并同意协议',
+						if (e.detail.errMsg === 'getPhoneNumber:ok') {
-						icon: 'none'
+							const data1 = {
-					})
+								...e.detail,
-					return
+								sessionKey: this.sessionKey,
-				}
+								unionId: uni.getStorageSync('unionid'),
-				if (e.detail.errMsg === 'getPhoneNumber:ok') {
+								openId: uni.getStorageSync('openid'),
-					const data1 = {
+							}
-						...e.detail,
+							let url1 = 0 == this.TabCur ? 'bindLoginByPhonePersonal' :
-						sessionKey: this.sessionKey,
+								'bindLoginByPhoneCompany'
-						unionId: uni.getStorageSync('unionid'),
+							this.bindLoginByPhone(data1, url1)
-						openId: uni.getStorageSync('openid'),
+						}
 					}
-					let url1 = 0 == this.TabCur ? 'bindLoginByPhonePersonal' : 'bindLoginByPhoneCompany'
+				})
-					this.bindLoginByPhone(data1, url1)
+
-				} else {
+				// if (!this.checked) {
-					uni.showModal({
+				// 	uni.showToast({
-						title: '用户拒绝手机号的授权',
+				// 		title: '请您阅读并同意协议',
-						content: `请输入手机号码登录，如有疑问，请联系客服处理`
+				// 		icon: 'none'
-					})
+				// 	})
-				}
+				// 	return
+				// }
+
+				// else {
+				// 	uni.showModal({
+				// 		title: '用户拒绝手机号的授权',
+				// 		content: `请输入手机号码登录，如有疑问，请联系客服处理`
+				// 	})
+				// }
 			},
 			bindLoginByPhone(data, url) {
 				if (this.count < 1) {

BagAuth/pages/login/oldLogin.vue

@@ -465,7 +465,7 @@
 				} else {
 					this.userHandle = true
 					uni.showModal({
-						title: '用户拒绝了手机号的授权，并给你一个大耳巴子',
+						title: '用户拒绝了手机号的授权',
 						content: `如有疑问，请联系客服处理`
 					})
 				}

BagStation/pages/stationDetail/stationDetail.vue

@@ -308,7 +308,7 @@
 				if (!user) {
 					uni.showModal({
 						title: '请您登录',
-						content: "登录佰川加油才可以加油 |˛˙꒳​˙)♡",
+						content: "登录中品加油才可以加油 |˛˙꒳​˙)♡",
 						confirmText: '去登陆',
 						success: (res) => {
 							if (res.confirm) {

pages/index/startPage/startPage.vue

@@ -88,8 +88,11 @@
 								url: '/pages/tabbar/home/home',
 							})
 						} else {
-							uni.redirectTo({
+							// uni.redirectTo({
-								url: '/BagAuth/pages/login/login'
+							// 	url: '/BagAuth/pages/login/login'
+							// })
+							uni.switchTab({
+								url: '/pages/tabbar/home/home',
 							})
 						}
 					}

pages/tabbar/home/home.vue

@@ -237,7 +237,7 @@
 		},
 
 		onPullDownRefresh() {
-			this.refreshLocation()
+			// this.refreshLocation()
 			setTimeout(function() {
 				uni.stopPullDownRefresh()
 			}, 800);
@@ -249,17 +249,11 @@
 			const openid = uni.getStorageSync('openid')
 			if (token && openid) {
 				this.getAuthInfo()
-			} else {
-				uni.showToast({
-					title: '您还没有登录哦',
-					icon: "none"
-				})
 			}
 			this.refreshLocation();
 		},
 
 		methods: {
-
 			toManagement() {
 				const user = uni.getStorageSync('user');
 				if (user) {
@@ -318,12 +312,21 @@
 							success: (res) => {
 								if (!res.authSetting['scope.userLocation']) {
 									uni.showModal({
-										title: '请您打开定位权限',
+										title: '提示',
-										content: '用于获取您当前位置附近的油站',
+										content: '您暂无授权定位权限，将无法显示附近油站',
 										confirmText: '去设置',
 										success: (resSec) => {
 											if (resSec.confirm) {
-												uni.openSetting({})
+												uni.openSetting({
+													success: (resThird) => {
+														if (resThird
+															.authSetting[
+																'scope.userLocation'
+															]) {
+															this.refreshLocation()
+														}
+													}
+												})
 											}
 										}
 									})
@@ -370,16 +373,61 @@
 
 
 			showQr() {
+				let user = uni.getStorageSync("user");
+				if (!user) {
+					uni.showModal({
+						content: "登录后才能出示付款码哦",
+						confirmText: "去登录",
+						success: function(res) {
+							if (res.confirm) {
+								uni.navigateTo({
+									url: "/BagAuth/pages/login/login",
+								});
+							}
+						},
+					});
+					return;
+				}
 				this.showThreeSites = true
 			},
 
 			toCards() {
+				let user = uni.getStorageSync("user");
+				if (!user) {
+					uni.showModal({
+						content: "登录后才能查看哦",
+						confirmText: "去登录",
+						success: function(res) {
+							if (res.confirm) {
+								uni.navigateTo({
+									url: "/BagAuth/pages/login/login",
+								});
+							}
+						},
+					});
+					return;
+				}
 				uni.navigateTo({
 					url: '/BagMoney/pages/oilCards/oilCards'
 				})
 			},
 
 			toOrders() {
+				let user = uni.getStorageSync("user");
+				if (!user) {
+					uni.showModal({
+						content: "登录后才能查看哦",
+						confirmText: "去登录",
+						success: function(res) {
+							if (res.confirm) {
+								uni.navigateTo({
+									url: "/BagAuth/pages/login/login",
+								});
+							}
+						},
+					});
+					return;
+				}
 				uni.switchTab({
 					url: '/pages/tabbar/order/orderList/orderList'
 				})
@@ -394,42 +442,19 @@
 				let params = {
 					currentPage: 1,
 					pageSize: 10,
-					params: { //类型：Object  必有字段  备注：// 筛选对象
+					params: {
-						longitude: 117.157817, //  必有字段  备注：// 当前位置经度
+						longitude: 117.157817,
-						latitude: 31.802472, //  必有字段  备注：// 当前位置维度
+						latitude: 31.802472,
-						// siteBrand: "", //   备注：// 石油品牌 ( 1-中国石油 2-中国石化 3-壳牌 4-民营 5-中海油 6-京博 7-中化石油 8-其他 )
-						// channelCode: "", //   备注：// 渠道编码 ( OIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）)
-						// oilProductCode: "0#" //   备注：// 油号选择 ( 0# 92# 92#)
 						clientBelong: 'ZHONGPIN',
 						comprehensiveSort: 1,
 						zpDisable: 'ENABLE',
-						sort: "juli", //类型：String  必有字段  备注：// 智能排序 ( price：价格最低 juli：距离最近 ) 默认距离排序
+						sort: "juli",
 						...uni.getStorageSync('location'),
 						...this.filterData,
 					}
 				};
 
-				if (!uni.getStorageSync('user')) {
+				oilSiteApi.getSiteLists(params).then(res => {
-					oilSiteApi.readOnlySites(params).then(res => {
-						this.getCount++
-						if (res.code == 20000) {
-							this.siteList = res.data.list
-						} else {
-							if (this.getCount == 1) {
-								setTimeout(() => {
-									this.getSiteList()
-								}, 1000)
-							}
-						}
-					})
-				} else {
-					oilSiteApi.getSiteLists(params).then(res => {
-						if (res.code == 20000) {
-							this.siteList = res.data.list
-						}
-					})
-				}
-				oilSiteApi[uni.getStorageSync('user') ? 'getSiteLists' : 'getSiteLists'](params).then(res => {
 					if (res.code == 20000) {
 						this.siteList = res.data.list
 					}
@@ -437,6 +462,21 @@
 			},
 
 			toDetail(item) {
+				let user = uni.getStorageSync("user");
+				if (!user) {
+					uni.showModal({
+						content: "登录后才能查看哦",
+						confirmText: "去登录",
+						success: function(res) {
+							if (res.confirm) {
+								uni.navigateTo({
+									url: "/BagAuth/pages/login/login",
+								});
+							}
+						},
+					});
+					return;
+				}
 				let itemS = encodeURIComponent(JSON.stringify(item));
 				uni.navigateTo({
 					url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`
@@ -488,6 +528,21 @@
 			},
 
 			openScan() {
+				let user = uni.getStorageSync("user");
+				if (!user) {
+					uni.showModal({
+						content: "登录后才能使用扫一扫哦",
+						confirmText: "去登录",
+						success: function(res) {
+							if (res.confirm) {
+								uni.navigateTo({
+									url: "/BagAuth/pages/login/login",
+								});
+							}
+						},
+					});
+					return;
+				}
 				uni.scanCode({
 					scanType: 'qrCode',
 					onlyFromCamera: false,

pages/tabbar/station/stationList.vue

@@ -33,13 +33,13 @@
 		<!-- 筛选开始 -->
 		<scroll-view class="screentop  bg-white" style="flex: 1;">
 			<view class="">
-				<sl-filter v-if="isFilterData" reflexTitle ref="slFilter" :productCodeList="productCodeList" :areaCodeList="areaCodeList"
+				<sl-filter v-if="isFilterData" reflexTitle ref="slFilter" :productCodeList="productCodeList"
-					@result="filterRes" :menuList="menuList"></sl-filter>
+					:areaCodeList="areaCodeList" @result="filterRes" :menuList="menuList"></sl-filter>
 				<!-- <sl-filter reflexTitle ref="slFilter" @result="filterRes" :menuList="menuList"></sl-filter> -->
 			</view>
 			<view class="bg-white min-height-50 padding-top" v-if="siteList.length>0">
 				<site-item v-for="(item,index) in siteList" :key="item.id" :site-item="item" :first="index==0"
-					:listHeight="listHeight"  class="cu-list menu-avatar cu-item" @tap="toDetail(item)">
+					:listHeight="listHeight" class="cu-list menu-avatar cu-item" @tap="toDetail(item)">
 				</site-item>
 				<view class="placeholder-hidden">
 
@@ -69,11 +69,11 @@
 
 		data() {
 			return {
-				getSiteListTimer:null,
+				getSiteListTimer: null,
 				filterData: {
 					// oilProductCode: '0#'
 				},
-				isFilterData:false,
+				isFilterData: false,
 				contentTitle: '您当前位置附近没有油站，可以点击左上角-距离-选择其他省市进行查看。',
 				loadStatus: 'load',
 				listHeight: 160,
@@ -267,7 +267,7 @@
 			if (!uni.getStorageSync('filterData')) {
 				this.getFilterData()
 			} else {
-				this.isFilterData=true
+				this.isFilterData = true
 			}
 		},
 
@@ -331,31 +331,31 @@
 						uni.setStorageSync('productCodeList', res.data.productCodeList)
 						uni.setStorageSync('areaCodeList', res.data.areaCodeList)
 						this.areaCodeList = uni.getStorageSync('areaCodeList')
-							let channelCodes = []
+						let channelCodes = []
-							res.data.channelCodes.map(item => {
+						res.data.channelCodes.map(item => {
-								channelCodes.push({
+							channelCodes.push({
-									title: item.name,
+								title: item.name,
-									value: item.id
+								value: item.id
-								})
 							})
-							let productCodes = []
+						})
-							res.data.productCodes.map(item => {
+						let productCodes = []
-								productCodes.push({
+						res.data.productCodes.map(item => {
-									title: item.name,
+							productCodes.push({
-									value: item.id
+								title: item.name,
-								})
+								value: item.id
 							})
-							let siteBrands = []
+						})
-							res.data.siteBrands.map(item => {
+						let siteBrands = []
-								siteBrands.push({
+						res.data.siteBrands.map(item => {
-									title: item.name,
+							siteBrands.push({
-									value: item.id
+								title: item.name,
-								})
+								value: item.id
 							})
-							menuList[0].detailList = menuList[0].detailList.concat(channelCodes)
+						})
-							menuList[1].detailList = menuList[1].detailList.concat(productCodes)
+						menuList[0].detailList = menuList[0].detailList.concat(channelCodes)
-							menuList[2].detailList = menuList[2].detailList.concat(siteBrands)
+						menuList[1].detailList = menuList[1].detailList.concat(productCodes)
-							uni.setStorageSync('filterData', this.menuList);
+						menuList[2].detailList = menuList[2].detailList.concat(siteBrands)
+						uni.setStorageSync('filterData', this.menuList);
 						if (uni.getStorageSync('areaCodeList')) {
 							this.areaCodeList = uni.getStorageSync('areaCodeList')
 						} else {
@@ -379,87 +379,67 @@
 			},
 
 			getSiteList() {
-				let data1 = {
+				let parameter = {
 					currentPage: this.currentPage,
 					pageSize: 10,
 					params: { //类型：Object  必有字段  备注：// 筛选对象
-					clientBelong:'ZHONGPIN',
+						clientBelong: 'ZHONGPIN',
-					longitude: 117.157817, //  必有字段  备注：// 当前位置经度
+						longitude: 117.157817, //  必有字段  备注：// 当前位置经度
-					latitude: 31.802472, //  必有字段  备注：// 当前位置维度
+						latitude: 31.802472, //  必有字段  备注：// 当前位置维度
 						sort: "juli", //类型：String  必有字段  备注：// 智能排序 ( price：价格最低 juli：距离最近 ) 默认距离排序
 						siteName: this.siteName,
 						...uni.getStorageSync('location'),
 						// ...this.filterData
-						siteBrand: this.siteName ? '' : this.filterData.siteBrand, //   备注：// 石油品牌 ( 1-中国石油 2-中国石化 3-壳牌 4-民营 5-中海油 6-京博 7-中化石油 8-其他 )
+						siteBrand: this.siteName ? '' : this.filterData
-						channelCode: this.siteName ? '' : this.filterData.channelCode, //   备注：// 渠道编码 ( OIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）)
+						.siteBrand, //   备注：// 石油品牌 ( 1-中国石油 2-中国石化 3-壳牌 4-民营 5-中海油 6-京博 7-中化石油 8-其他 )
-						oilProductCode: this.siteName ? '' : this.filterData.oilProductCode, //   备注：// 油号选择 ( 0# 92# 92#)
+						channelCode: this.siteName ? '' : this.filterData
+						.channelCode, //   备注：// 渠道编码 ( OIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）)
+						oilProductCode: this.siteName ? '' : this.filterData
+						.oilProductCode, //   备注：// 油号选择 ( 0# 92# 92#)
 						provinceCode: this.filterData.provinceCode,
 						cityCode: this.filterData.cityCode,
 						areaCode: this.filterData.areaCode,
 						distance: this.filterData.distance,
-						zpDisable:'ENABLE',
+						zpDisable: 'ENABLE',
 						comprehensiveSort: this.filterData.comprehensiveSort ? this.filterData.comprehensiveSort : 1
 					}
+				}
 				
-				}
+				oilSiteApi.getSiteLists(parameter).then(res => {
-				if (!uni.getStorageSync('Authorization')) {
+					if (res.code == 20000) {
-					oilSiteApi.readOnlySites(data1).then(res => {
+						this.siteList = this.siteList.concat(res.data.list)
-						if (res.code == 20000) {
+						if (res.data.list.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页
-							this.siteList = this.siteList.concat(res.data.list)
+							this.loadStatus = 'nomore'
-							if (res.data.list.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页
+						} else {
-								this.loadStatus = 'nomore'
+							this.currentPage++
-							} else {
+							this.loadStatus = 'load'
-								this.currentPage++
-								this.loadStatus = 'load'
-							}
 						}
-					})
+					}
-				} else {
+				})
-					oilSiteApi.getSiteLists(data1).then(res => {
-						if (res.code == 20000) { 
-							this.siteList = this.siteList.concat(res.data.list)
-							if (res.data.list.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页
-								this.loadStatus = 'nomore'
-							} else {
-								this.currentPage++
-								this.loadStatus = 'load'
-							}
-						}
-					})
-				}
 
 			},
 			toDetail(item) {
+				let user = uni.getStorageSync("user");
+				if (!user) {
+					uni.showModal({
+						content: "登录后才能查看哦",
+						confirmText: "去登录",
+						success: function(res) {
+							if (res.confirm) {
+								uni.navigateTo({
+									url: "/BagAuth/pages/login/login",
+								});
+							}
+						},
+					});
+					return;
+				}
 				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
@@ -497,22 +477,22 @@
 				// 	this.getSiteList()
 				// }, 100)
 				clearTimeout(this.getSiteListTimer);
-				this.getSiteListTimer = setTimeout(()=>{
+				this.getSiteListTimer = setTimeout(() => {
 					this.currentPage = 1
 					this.siteList = []
 					this.getSiteList()
-				},500);
+				}, 500);
 			},
 			onSearch() {
 				// this.currentPage = 1
 				// this.siteList = []
 				// this.getSiteList()
 				clearTimeout(this.getSiteListTimer);
-				this.getSiteListTimer = setTimeout(()=>{
+				this.getSiteListTimer = setTimeout(() => {
 					this.currentPage = 1
 					this.siteList = []
 					this.getSiteList()
-				},500);
+				}, 500);
 			}
 		}
 	}

utils/request.js

@@ -4,7 +4,7 @@ import utils from '@/utils/encode'
 // const env = process.env.NODE_ENV
 const env = 'production'/*  */
 // const env = 'test'
-// const testUrl = 'http://192.168.0.254:38080'
+const testUrl = 'http://192.168.110.77:38080'
 // const productUrl = 'http://121.196.213.68/adminapi' //预生产
 
 const productUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new 
@@ -22,9 +22,8 @@ service.interceptors.request.use(
 		uni.showLoading({
 			title: '加载中...'
 		})
-		const token = uni.getStorageSync('Authorization')
+		const token = uni.getStorageSync('Authorization') || " "
 		const unionId = uni.getStorageSync('unionid')
-		console.log(unionId)
 		const openId = uni.getStorageSync('openid')
 		// const accountSources = 'WE_CHAT_PROGRAM' 
 		const accountSources = 'LOGIN_MP_WECHAT'

utils/tool.js

@@ -222,22 +222,21 @@ export default {
 				success(res) {
 					console.log(res.authSetting,'res.authSetting')
 					if (!res.authSetting[ 'scope.userLocation']) {
-								console.log('用户没有授权用户没有授权用户没有授权用户没有授权')
+								// console.log('用户没有授权用户没有授权用户没有授权用户没有授权')
 						// 用户没有授权
 						uni.showModal({
 							title: '提示',
-							content: '您暂无授权定位权限，将无法显示油站距离',
+							content: '您暂无授权定位权限，将无法显示附近油站',
+							confirmText: '去设置',
 							success(res) {
 								if (res.confirm) {
 									wx.openSetting({
 										success(res) {
 											if (res.authSetting['scope.userLocation']) {
 												re()
-												// 授权成功，重新定位
 											} else {
-												// 没有允许定位权限
 												wx.showToast({
-													title: '您拒绝了定位权限，将无法使用附近电站站功能',
+													title: '您拒绝了定位权限',
 													icon: 'none'
 												});
 												rj('拒绝了定位权限')