更新

BagStation/pages/stationDetail/stationDetail.vue

@@ -278,28 +278,35 @@
 				})
 			},
 			getSiteInfo(id, item) {
-				let user = uni.getStorageSync('user');
+				// let user = uni.getStorageSync('user');
 				let data2 = {
 					...uni.getStorageSync('location'),
 					siteId: id,
 					clientBelong: "BAICHUAN"
 				}
-				if (user) {
+				oilSiteApi.getSiteDetailsByKA(data2).then(res => {
-					oilSiteApi.getSiteDetailsByKA(data2).then(res => {
+					if (res.code == 20000) {
-						if (res.code == 20000) {
+						this.siteInfo = res.data
-							this.siteInfo = res.data
+					}else {
-						}else {
+						this.siteInfo = item
-							setTimeout(()=>{
+					}
-								uni.showToast({
+				})
-									title:res.msg,
+				// if (user) {
-									icon:'none'
+				// 	oilSiteApi.getSiteDetailsByKA(data2).then(res => {
-								})
+				// 		if (res.code == 20000) {
-							},1000)
+				// 			this.siteInfo = res.data
-						}
+				// 		}else {
-					})
+				// 			setTimeout(()=>{
-				} else {
+				// 				uni.showToast({
-					this.siteInfo = item
+				// 					title:res.msg,
-				}
+				// 					icon:'none'
+				// 				})
+				// 			},1000)
+				// 		}
+				// 	})
+				// } else {
+				// 	this.siteInfo = item
+				// }
 
 			},
 			makePay() {

pages/tabbar/home/home.vue

@@ -153,7 +153,7 @@
 			<view class="">
 				<swiper autoplay interval='5000' style="width: 100%;height: 204rpx;" class="swiper" circular>
 					<swiper-item @click="swiperClick(item,index)" v-for="(item,index) in swiperArray">
-						<image :src="item.src" style="width: 100%;"  mode="widthFix"></image>
+						<image :src="item.src" style="width: 100%;" mode="widthFix"></image>
 					</swiper-item>
 					<swiper-item>
 						<ad unit-id="adunit-fae65289bc72095d" ad-intervals="30"></ad>
@@ -179,7 +179,8 @@
 			</view>
 		</view>
 		<msg-models :showAuthFrror="showAuthFrror" @hideOneModal="hideModel"></msg-models>
-		<three-sites v-if="showThreeSites" @hideOneModal="showThreeSites=false" :showThreeSites="showThreeSites"></three-sites>
+		<three-sites v-if="showThreeSites" @hideOneModal="showThreeSites=false"
+			:showThreeSites="showThreeSites"></three-sites>
 	</view>
 </template>
 
@@ -200,10 +201,9 @@
 		},
 		data() {
 			return {
-				swiperArray: [
+				swiperArray: [{
-					{
+						src: this.global.imgURL + 'banner-baichuan.png',
-						src:this.global.imgURL+'banner-baichuan.png',
+						link: ''
-						link:''
 					},
 					// {
 					// 	src: 'https://xoil-public.oss-cn-beijing.aliyuncs.com/WMP-IMG/banner-2dwk.png',
@@ -360,7 +360,7 @@
 		},
 
 		methods: {
-			toActivity(){},
+			toActivity() {},
 			toManagement() {
 				const user = uni.getStorageSync('user');
 				if (user) {
@@ -389,7 +389,7 @@
 				// uni.navigateTo({
 				// 	url: '/pages/tabbar/home/link?url=' + encodeURIComponent(JSON.stringify(item.link))
 				// })
-				if(item?.JumpPage){
+				if (item?.JumpPage) {
 					uni.navigateTo({
 						url: item.JumpPage
 					})
@@ -426,7 +426,7 @@
 										success: (resSec) => {
 											if (resSec.confirm) {
 												uni.openSetting({
-													complete:() => {
+													complete: () => {
 														// this.getSiteList()
 														// this.realPosition()
 														// this.refreshLocation()
@@ -435,10 +435,10 @@
 											}
 										}
 									})
-								}else {
+								} else {
 									uni.showToast({
-										title:'获取定位失败，请稍后再试！',
+										title: '获取定位失败，请稍后再试！',
-										icon:'none'
+										icon: 'none'
 									})
 								}
 							}
@@ -541,12 +541,25 @@
 			},
 
 			showQr() {
-				// uni.navigateTo({
+				let user = uni.getStorageSync("user");
-				// 	url: '/BagStation/pages/stationDetail/stieQr'
+				if (!user) {
-				// })
+					uni.showToast({
+						title: '登录后才能出示付款码哦',
+						icon: 'none'
+					})
+					return
+				}
 				this.showThreeSites = true
 			},
 			toCards() {
+				let user = uni.getStorageSync("user");
+				if (!user) {
+					uni.showToast({
+						title: '登录后才能获取加油卡哦',
+						icon: 'none'
+					})
+					return
+				}
 				uni.navigateTo({
 					url: '/BagMoney/pages/oilCards/oilCards'
 				})
@@ -603,31 +616,8 @@
 			toDetail(item) {
 				let itemS = encodeURIComponent(JSON.stringify(item))
 				uni.navigateTo({
-					url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`,
+					url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`
-					fail: (err) => {},
-					success: () => {}
 				})
-				// console.log(itemS)
-				// if (uni.getStorageSync('user')) {
-				// 	uni.navigateTo({
-				// 		url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`,
-				// 		fail: (err) => {},
-				// 		success: () => {}
-				// 	})
-				// } else {
-				// 	uni.showModal({
-				// 		title: '请您登录',
-				// 		content: "登录佰川加油才可以加油 |˛˙꒳​˙)♡",
-				// 		confirmText: '去登陆',
-				// 		success: (res) => {
-				// 			if (res.confirm) { 
-				// 				uni.reLaunch({
-				// 					url: '../../../BagAuth/pages/login/login?loginType=true'
-				// 				})
-				// 			}
-				// 		}
-				// 	})
-				// }
 			},
 			getFilterData() {
 				oilSiteApi.getCheckInfo().then(res => {
@@ -727,11 +717,15 @@
 					}
 				})
 			},
-			scan1() {
-				// 测试用
-				this.getScanRes('fixed_1371293944539422720')
-			},
 			openScan() {
+				let user = uni.getStorageSync("user");
+				if (!user) {
+					uni.showToast({
+						title: '登录后才能使用扫一扫哦',
+						icon: 'none'
+					})
+					return
+				}
 				uni.scanCode({
 					scanType: 'qrCode',
 					onlyFromCamera: false,

pages/tabbar/station/stationList.vue

@@ -469,13 +469,7 @@
 			toDetail(item) {
 				let itemS = encodeURIComponent(JSON.stringify(item));
 				uni.navigateTo({
-					url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`,
+					url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`
-					fail: (err) => {
-						// console.log(err)
-					},
-					success: () => {
-						// console.log('err')
-					}
 				})
 				// if (uni.getStorageSync('user')) {
 				// 	uni.navigateTo({

utils/request.js

@@ -2,13 +2,13 @@ import axios from 'axios'
 import utils from '@/utils/encode'
 
 // const env = process.env.NODE_ENV
-const env = 'production'/*  */
+const env = 'production' /*  */
 // const env = 'test'
 const testUrl = 'http://192.168.110.77:38080'
 // const productUrl = 'http://121.196.213.68/adminapi' //预生产
 
-// const productUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new 
+const productUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new 
-const productUrl = 'http://uat.xingoil.com/adminapi' // 生产，加密 new 
+// const productUrl = 'http://uat.xingoil.com/adminapi' // 生产，加密 new 
 const service = axios.create({
 	baseURL: env == 'production' ? productUrl : testUrl,
 	// baseURL: testUrl,
@@ -22,7 +22,7 @@ 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')
@@ -38,11 +38,14 @@ service.interceptors.request.use(
 
 		console.log(config)
 
-		if(['/oil-site/oilSiteAppInfo/findKASiteInfoByPage','/oil-site/oilSiteAppInfo/getSiteDetailsByKA','/oil-site/oilSiteAppInfo/getSitePriceKAByBelong'].includes(config.url)) {
+		if (['/oil-site/oilSiteAppInfo/findKASiteInfoByPage', '/oil-site/oilSiteAppInfo/getSiteDetailsByKA',
-			let parentCompanyId = config.baseURL === 'https://www.xingoil.com/adminapi' ? '1812649739013771264' : '1810568376122056704'
+				'/oil-site/oilSiteAppInfo/getSitePriceKAByBelong'
-			if(config.data.params) {
+			].includes(config.url)) {
+			let parentCompanyId = config.baseURL === 'https://www.xingoil.com/adminapi' ? '1812649739013771264' :
+				'1810568376122056704'
+			if (config.data.params) {
 				config.data.params['parentCompanyId'] = parentCompanyId
-			}else config.data['parentCompanyId'] = parentCompanyId
+			} else config.data['parentCompanyId'] = parentCompanyId
 		}
 
 		if (env === 'production') {
@@ -85,8 +88,9 @@ service.interceptors.response.use(
 		}
 
 		uni.hideLoading()
-		if(response.config.url.indexOf('/oil-site/oilSiteOrderInfo/getOrderQrCode')  === -1){
+		if (response.config.url.indexOf('/oil-site/oilSiteOrderInfo/getOrderQrCode') === -1) {
-			if (res.code != 20000 && res.msg != '令牌为空，不允许操作' && res.msg != '您的ip已经更改，请重新登录' && res.msg != '登录与操作设备不同' && res.msg != '用户未登录只可查询前两页油站信息') {
+			if (res.code != 20000 && res.msg != '令牌为空，不允许操作' && res.msg != '您的ip已经更改，请重新登录' && res.msg !=
+				'登录与操作设备不同' && res.msg != '用户未登录只可查询前两页油站信息') {
 				uni.showToast({
 					title: res.msg,
 					icon: "none"