From acc76ef744016a3aae7b161d5c3d3cc1edefbb12 Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Fri, 24 Mar 2023 13:31:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                    |  4 ++--
 pages/tabbar/home/home.vue | 22 ++++------------------
 utils/request.js           |  8 ++++----
 3 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/App.vue b/App.vue
index bc4d5d8..94367d4 100644
--- a/App.vue
+++ b/App.vue
@@ -117,10 +117,10 @@
 							imageUrl: 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/login-bg.png',
 						}
 					}
+					let white = ['pages/index/startPage/startPage']
 					// 是否跳过登陆
 					let isRefuseLogin = uni.getStorageSync('refuseLogin')
-					console.log('isRefuseLogin',isRefuseLogin,typeof isRefuseLogin)
-					if(isRefuseLogin || view.route === 'pages/index/startPage/startPage' || view.route.includes('BagAuth')) return 					
+					if(isRefuseLogin || white.includes(view.route) || view.route.includes('BagAuth')) return 	
 					 this.getAmount()
 				})
 			},
diff --git a/pages/tabbar/home/home.vue b/pages/tabbar/home/home.vue
index 5035aa7..11ab45d 100644
--- a/pages/tabbar/home/home.vue
+++ b/pages/tabbar/home/home.vue
@@ -454,11 +454,7 @@
 				} else if (index == 8) {
 					this.goToPage('/BagAuth/pages/agreeMent/OperationGuide')
 				}
-				// else if(index==8){
-				// 	uni.navigateTo({
-				// 		url: '/BagStation/myCars/myCars'
-				// 	})
-				// }
+
 				else {
 					uni.showToast({
 						title: '功能暂无',
@@ -468,9 +464,6 @@
 			},
 
 			showQr() {
-				// uni.navigateTo({
-				// 	url: '/BagStation/pages/stationDetail/stieQr'
-				// })
 				this.showThreeSites = true
 			},
 			toCards() {
@@ -492,16 +485,11 @@
 				let params = {
 					currentPage: 1,
 					pageSize: 10,
-					params: { //类型：Object  必有字段  备注：// 筛选对象
-						// longitude: 117.157817, //  必有字段  备注：// 当前位置经度
-						// latitude: 31.802472, //  必有字段  备注：// 当前位置维度
-						// siteBrand: "", //   备注：// 石油品牌 ( 1-中国石油 2-中国石化 3-壳牌 4-民营 5-中海油 6-京博 7-中化石油 8-其他 )
-						// channelCode: "", //   备注：// 渠道编码 ( OIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）)
-						// oilProductCode: "0#" //   备注：// 油号选择 ( 0# 92# 92#)
+					params: { 
 						clientBelong:'ZHONGPIN',
 						comprehensiveSort:1,
 						zpDisable:'ENABLE',
-						sort: "juli", //类型：String  必有字段  备注：// 智能排序 ( price：价格最低 juli：距离最近 ) 默认距离排序
+						sort: "juli", // price：价格最低 juli：距离最近 
 						...uni.getStorageSync('location'),
 						...this.filterData,
 					}
@@ -511,7 +499,6 @@
 					oilSiteApi.readOnlySites(params).then(res => {
 						this.getCount++
 						if (res.code == 20000) {
-							// console.log(res.data.list)
 							this.siteList = res.data.list
 						} else {
 							if (this.getCount == 1) {
@@ -552,8 +539,7 @@
 			},
 			toDetail(item) {
 				let itemS = encodeURIComponent(JSON.stringify(item))
-				// console.log(uni.getStorageSync('user'))
-				// return 
+
 				if (uni.getStorageSync('user')) {
 					uni.navigateTo({
 						url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`,
diff --git a/utils/request.js b/utils/request.js
index 2161780..0ed3efb 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -42,7 +42,7 @@ service.interceptors.request.use(
 		} else {
 			url = config.url
 		}
-
+		// uni.hideLoading()
 		return config
 	},
 	error => {
@@ -68,15 +68,15 @@ service.interceptors.response.use(
 		}
 
 		uni.hideLoading()
+		let dontTipTextArr = ['令牌为空，不允许操作','您的ip已经更改，请重新登录','登录与操作设备不同']
+		let dontTipCodeArr = [20000,42011]
 		if(response.config.url.indexOf('/oil-site/oilSiteOrderInfo/getOrderQrCode')  === -1){
-			if (res.code != 20000 && res.msg != '令牌为空，不允许操作' && res.msg != '您的ip已经更改，请重新登录' && res.msg != '登录与操作设备不同') {
+			if (!dontTipCodeArr.includes(res.code) && !dontTipTextArr.includes(res.msg)) {
 				uni.showToast({
 					title: res.msg,
 					icon: "none"
 				})
-			
 			}
-			
 		}
 		return res
 	},