更新

BagAuth/pages/login/login.vue

@@ -27,18 +27,18 @@
 				@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>
-					手机号快捷登录
+					一键登录
 				</text>
 			</button>
-			<!-- 			<button class="cu-btn margin-top round lg" @tap="refuseEmpower">
+			<button class="cu-btn margin-top round lg" @tap="refuseEmpower">
 				输入手机号码登录
-			</button> -->
+			</button>
 			<button class="cu-btn bg-0 margin-top round  text-sm" @tap="refuseLogin">
 				跳过
 			</button>
@@ -50,7 +50,10 @@
 					使用协议及隐私保护
 				</view>
 				<view class="protocol_content">
-					为了更好地保障您的合法权益，请您阅读并同意 <text style="  color: black; font-weight: 600;" @click="$refs.loginBottom.toAgree('baichuanUserAgree')">《用户协议》</text> 与 <text style=" color: black; font-weight: 600;" @click="$refs.loginBottom.toAgree('baichuanPrivacyAgreement')">《隐私政策》</text>。
+					为了更好地保障您的合法权益，请您阅读并同意 <text style="  color: black; font-weight: 600;"
+						@click="$refs.loginBottom.toAgree('baichuanUserAgree')">《用户协议》</text> 与 <text
+						style=" color: black; font-weight: 600;"
+						@click="$refs.loginBottom.toAgree('baichuanPrivacyAgreement')">《隐私政策》</text>。
 				</view>
 				<view class="protocol_footer">
 					<button @click="$refs.popup.close()" class="protocol_footer_close">取消</button>
@@ -73,7 +76,7 @@
 		},
 		data() {
 			return {
-				loginType:false,
+				loginType: false,
 				// imgsrc:require('../../../BagStation/static/img/login-bg.png'),
 				checked: false,
 				userHandle: false,
@@ -90,12 +93,12 @@
 				sessionKey: '',
 				nickName: '',
 				loginOut: uni.getStorageSync('loginOut') ? true : false,
-				scanningParams:null
+				scanningParams: null
 			}
 		},
 		onLoad(e) {
-			if(e.loginType){
+			if (e.loginType) {
-				this.loginType = Boolean(e.loginType); 
+				this.loginType = Boolean(e.loginType);
 			}
 			uni.clearStorageSync()
 			// this.refreshLocation()
@@ -103,10 +106,10 @@
 				provider: 'weixin',
 				success: (loginRes) => {
 					const code = loginRes.code
-					this.onceCode = code	
+					this.onceCode = code
 					oilIdentityApi.sendCode(this.onceCode).then(res => {
 						if (res.code === 20000) {
-							if(e.scanningParams) {
+							if (e.scanningParams) {
 								// 用于扫码进入油站详情页面
 								this.scanningParams = e.scanningParams
 							}
@@ -143,7 +146,7 @@
 				this.checked = val
 			},
 			refuseLogin() {
-				uni.setStorageSync('loginType',false)
+				uni.setStorageSync('loginType', false)
 				uni.switchTab({
 					url: '/pages/tabbar/home/home'
 				})
@@ -164,8 +167,7 @@
 				}, url).then(res => {
 					if (res.code == 20000) {
 						this.loginSuccess(res)
-					}else{
+					} else {}
-					}
 				})
 			},
 			refuseEmpower() {
@@ -204,7 +206,7 @@
 				if (this.count < 1) {
 					oilIdentityApi.bindLoginByPhone(data, url).then(res => {
 						if (res.code == 20000) {
-							this.loginSuccess(res) 
+							this.loginSuccess(res)
 						}
 					})
 				}
@@ -231,18 +233,18 @@
 					// 		}
 					// 	})
 					// }, 1000);
-					if(this.scanningParams) {
+					if (this.scanningParams) {
 						uni.redirectTo({
 							url: `/BagStation/pages/makeOrder/makeOrder?q=${this.scanningParams}`
 						})
-						return 
+						return
 					}
 					//  这里有问题
 					uni.switchTab({
 						url: '/pages/tabbar/home/home'
 					})
-				}else{ 
+				} else {
-					if(!this.loginType){
+					if (!this.loginType) {
 						this.refuseLogin()
 					}
 				}
@@ -253,7 +255,7 @@
 
 <style>
 	.protocol_footer_close {
-		width: 185rpx; 
+		width: 185rpx;
 		border-radius: 94rpx 94rpx 94rpx 94rpx;
 		opacity: 1;
 		border: 1px solid #000000;
@@ -261,7 +263,7 @@
 	}
 
 	.protocol_footer_confirm {
-		width: 185rpx; 
+		width: 185rpx;
 		background: #FD0505;
 		border-radius: 56rpx 56rpx 56rpx 56rpx;
 		opacity: 1;
@@ -271,7 +273,7 @@
 
 	.protocol_footer {
 		display: flex;
-		justify-content: space-between; 
+		justify-content: space-between;
 		color: #FFFFFF;
 	}
 

components/site-item/site-item.vue

@@ -96,7 +96,7 @@
 		},
 		filters: {
 			channelCodeFamt(value) {
-				console.log(value)
+				// console.log(value)
 				if (!value) {
 					return '未知'
 					// 渠道编码 ( XOIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）)

components/sl-filter/filter-view.vue

@@ -120,7 +120,6 @@
 		},
 		created() {
 			
-			console.log('%c 子组件参数↓','font-size:30px;color:red')
 		},
 		mounted() {
 			if(this.areaCodeList1.length == 0){

pages/index/startPage/startPage.vue

@@ -61,12 +61,12 @@
 			}
 			// 在页面中定义插屏广告
 			let interstitialAd = null
-			
+
 			// 在页面onLoad回调事件中创建插屏广告实例
 			if (wx.createInterstitialAd) {
-			  interstitialAd = wx.createInterstitialAd({
+				interstitialAd = wx.createInterstitialAd({
-			    adUnitId: 'adunit-a7faf57adeed211f'
+					adUnitId: 'adunit-a7faf57adeed211f'
-			  })
+				})
 			}
 			interstitialAd.onLoad((err) => {
 				// console.log('onLoad event emit', err)
@@ -76,10 +76,6 @@
 					if (key == '在线') {
 						uni.switchTab({
 							url: '/pages/tabbar/home/home',
-							fail: (err) => {
-								// console.log(err)
-							}
-							// url:'/BagStation/orderDetail/orderDetail'
 						})
 					} else {
 						uni.redirectTo({
@@ -87,30 +83,25 @@
 						})
 					}
 				}, 2000)
-				// console.log('onError event emit', err)
 			})
 			// 在适合的场景显示插屏广告
 			if (interstitialAd) {
-			  interstitialAd.show().catch((err) => {
+				interstitialAd.show().catch((err) => {
-			    // console.error(err)
+					// console.error(err)
-			  })
+				})
 			}
 			interstitialAd.onClose(res => {
-			  setTimeout(() => {
+				setTimeout(() => {
-			  	if (key == '在线') {
+					if (key == '在线') {
-			  		uni.switchTab({
+						uni.switchTab({
-			  			url: '/pages/tabbar/home/home',
+							url: '/pages/tabbar/home/home',
-			  			fail: (err) => {
+						})
-			  				// console.log(err)
+					} else {
-			  			}
+						uni.redirectTo({
-			  			// url:'/BagStation/orderDetail/orderDetail'
+							url: '/BagAuth/pages/login/login'
-			  		})
+						})
-			  	} else {
+					}
-			  		uni.redirectTo({
+				}, 1000)
-			  			url: '/BagAuth/pages/login/login'
-			  		})
-			  	}
-			  }, 2000)
 			})
 		},
 		onReady(option) {
@@ -187,4 +178,4 @@
 	.page-content image {
 		width: 750upx;
 	}
-</style>
+</style>