更新

BagAuth/pages/login/login.vue

@@ -59,7 +59,7 @@
 			<button class="cu-btn margin-top round lg" @tap="refuseEmpower">
 				输入手机号码登录
 			</button>
-			<button class="cu-btn margin-top bg-0 round lg" @tap="refuseLogin">
+			<button v-if="isShow" class="cu-btn margin-top bg-0 round lg" @tap="refuseLogin">
 				跳过
 			</button>
 		</view> 
@@ -95,7 +95,8 @@
 				loginRes: {},
 				sessionKey: '',
 				nickName: '',
-				loginOut: uni.getStorageSync('loginOut') ? true : false
+				loginOut: uni.getStorageSync('loginOut') ? true : false,
+				isShow:true
 			}
 		},
 		onLoad(option) {  
@@ -134,7 +135,10 @@
 				let siteId = uni.getStorageSync('siteId')
 				uni.clearStorageSync();
 				if(isJump) uni.setStorageSync('isJump',isJump)
-				if(siteId) uni.setStorageSync('siteId',siteId)
+				if(siteId) {
+					this.isShow = false
+					uni.setStorageSync('siteId',siteId)
+				}
 				this.refreshLocation()
 				let _that = this
 				uni.login({

BagStation/pages/stationDetail/stationDetail.vue

@@ -5,7 +5,7 @@
 			<block slot="backText">返回</block>
 		</cu-custom> -->
 		<view class="bg-img fixed-top  flex align-end margin-bottom-lg " :style="'background-image: url('+imgURL+'site-bg.png '+');width: 750upx;height: 326rpx;background-size:cover'">
-			<image @tap="goBack" :src="imgURL+'site-back.png'" width="20upx" mode="widthFix" class="position-ab site-back">
+			<image v-if="isShow" @tap="goBack" :src="imgURL+'site-back.png'" width="20upx" mode="widthFix" class="position-ab site-back">
 			</image>
 			<view class="cu-list menu margin padding-sm  radius my-shadow  bg-white yu-card-xuan">
 				<view class="cu-item ">
@@ -164,7 +164,7 @@
 					<text class="showtext">当前油站距离您较远，请与加油员确认您选择的油站是否正确。</text>
 				</view>
 				<view class="checklocation_box_button">
-					<view class="cu-tn btn-box red_btn" @tap="backTohome">
+					<view v-if="isShow" class="cu-tn btn-box red_btn" @tap="backTohome">
 						返回油站列表
 					</view>
 					<view class="cu-tn btn-box" @tap="gotoPay">
@@ -210,7 +210,8 @@
 				secondChannelCode: '',
 				ureaNum:false,
 				ureaproductType:'',
-				areaPrice:''
+				areaPrice:'',
+				isShow:true
 			}
 		},
 		onHide() {
@@ -218,10 +219,11 @@
 		},
 		onLoad(option) {
 			// let siteId = uni.getStorageSync('siteId') || 
-			if(option.siteId) {
+			if(option.siteId && !option.customerJump) {
-				uni.setStorageSync('siteId',siteId)
+				this.isShow = false
-				this.siteId = siteId
+				this.siteId = option.siteId
-				this.getSiteInfo(siteId) 
+				this.getSiteInfo(option.siteId) 
+				uni.setStorageSync('siteId',option.siteId)
 				return 
 			}
 			// console.log(option)
@@ -232,8 +234,7 @@
 			// 	let obj = option.item,
 			// 	var oilItem = JSON.parse(option.item)  
 			// } 
-			let oilItem = option.channerCode == 'TY' ? uni.getStorageSync('OtherSiteInfo')  : JSON.parse(option.item) 
+			let oilItem = option.channerCode == 'TY' ? uni.getStorageSync('OtherSiteInfo') : option.item ? JSON.parse(option.item) : {siteId:option.siteId}
-
 			// if(oilItem.secondChannelCode === 'SQ'){
 			// 	oilItem.listTag = oilItem.sqSiteBelong === 'JKJY' ? '集卡加油' :'上汽联名卡'
 			// }
@@ -544,6 +545,7 @@
 		text-align: center;
 	}
 	.red_btn{
+		margin-right: 20rpx;
 		color: #FFFFFF;
 		background-color: #FF6700;
 	}
@@ -565,8 +567,8 @@
 	}
 	.checklocation_box_button{
 		display: flex;
-		justify-content: space-between;
+		justify-content: center;
-		align-items: center;
+		/* align-items: center; */
 		padding: 0 5%;
 	}
 	.btn-box{

BagStation/pages/stationDetail/stieQr.vue

@@ -180,9 +180,9 @@
 			tkiQrcode
 		},
 		onLoad(option) {
-			console.log('进入siteQr',option)
+			// console.log('进入siteQr',option)
 			let oilItem = uni.getStorageSync('oilItem')
-			console.log(oilItem)
+			// console.log(oilItem)
 			this.showtitles = oilItem.listTag 
 		},
 		data() {
@@ -236,7 +236,7 @@
 			cards() {
 				if (this.cardList.length) {
 					let cards = []
-					console.log(this.cardList,'---------------------')
+					// console.log(this.cardList,'---------------------')
 					this.cardList.forEach((e) => {
 						// cards.push(e.accountCardCode)
 						e.companyName =  e.companyName + '('+( e.companyType==0?`柴油账户:${e.balance}元`:e.companyType==1?`汽油账户:${e.balance}元`:e.companyType==2?`LNG账户:${e.balance}元`:`尿素:${e.balance}元`) + ')'
@@ -255,7 +255,7 @@
 				this.otherUser = 'kl'
 			}
 			this.otherUserInfo = otherUserInfo
-			console.log('+++++',option)
+			// console.log('+++++',option)
 			this.showtitles = oilItem.listTag 
 			this.siteId = option.siteId
 			this.activeChannelCode = option.activeChannelCode
@@ -284,11 +284,11 @@
 					oilCardNature: activeCard.oilCardType, //类型：String  必有字段  备注：油卡性质
 					accountCardCode: activeCard.accountCardCode //类型：String  必有字段  备注：油卡卡号
 				}
-				console.log('这里是二维码参数',data2)
+				// console.log('这里是二维码参数',data2)
 				qrApi.getOilQrCode(data2).then(res => {
-					console.log('这里是二维码返回处+',res,'+')
+					// console.log('这里是二维码返回处+',res,'+')
 					if (res.code === 20000) {
-						console.log(res.data)
+						// console.log(res.data)
 						// console.log(this.otherUser,'++++++++++++++++++++')
 						// if(this.otherUser = 'kl'){
 						// 	this.val = res.data.codeStr+"&"+this.otherUser
@@ -313,8 +313,8 @@
 				})
 			},
 			getUserCard() {
-				console.log('%c look that ↓','color:red;font-size:50px')
+				// console.log('%c look that ↓','color:red;font-size:50px')
-				console.log(uni.getStorageSync('oilItem'),'*-*-*-*-')
+				// console.log(uni.getStorageSync('oilItem'),'*-*-*-*-')
 				accountApi.getNewUserAccount({siteId:uni.getStorageSync('oilItem').siteId}).then(res => {
 					if (res.code == 20000) {
 						this.cardList = res.data
@@ -326,7 +326,7 @@
 			},
 			toSiteDetail(id) {
 				uni.redirectTo({
-					url: `/BagStation/pages/stationDetail/stationDetail?siteId=${id}`,
+					url: `/BagStation/pages/stationDetail/stationDetail?siteId=${id}&customerJump=false`,
 					fail: (err) => {
 						// console.log(err)
 					},

BagStation/pages/stationMap/stationMap.vue

@@ -294,7 +294,7 @@ export default {
     },
     toDetail(id) {
       uni.navigateTo({
-        url: `/BagStation/pages/stationDetail/stationDetail?siteId=${id}`,
+        url: `/BagStation/pages/stationDetail/stationDetail?siteId=${id}&customerJump=false`,
         fail: (err) => {
           // // console.log(err)
         },

pages/tabbar/qrCenter/qrCenter.vue

@@ -110,7 +110,7 @@
 			},
 			toDetail() {
 				uni.navigateTo({
-					url: `/BagStation/pages/stationDetail/stationDetail?siteId=${this.siteId}`,
+					url: `/BagStation/pages/stationDetail/stationDetail?siteId=${this.siteId}&customerJump=false`,
 					fail: (err) => {
 						// console.log(err)
 					},