From c943ba57c0b9c442d39f21f6ea2f43b182fbdee8 Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Tue, 21 Mar 2023 15:23:36 +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

---
 BagAuth/pages/login/login.vue    |  2 +-
 BagAuth/pages/login/oldLogin.vue | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/BagAuth/pages/login/login.vue b/BagAuth/pages/login/login.vue
index aa39ac4..150fca8 100644
--- a/BagAuth/pages/login/login.vue
+++ b/BagAuth/pages/login/login.vue
@@ -225,7 +225,7 @@
 			},
 			refuseEmpower() {
 				uni.navigateTo({
-					url: '/BagAuth/pages/login/oldLogin'
+					url: `/BagAuth/pages/login/oldLogin?scanningParams=${this.scanningParams}`
 				})
 			},
 
diff --git a/BagAuth/pages/login/oldLogin.vue b/BagAuth/pages/login/oldLogin.vue
index b098323..4ba57bc 100644
--- a/BagAuth/pages/login/oldLogin.vue
+++ b/BagAuth/pages/login/oldLogin.vue
@@ -171,7 +171,14 @@
 				count: 0,
 				loginRes: {},
 				checked: false,
-				next: false
+				next: false,
+				scanningParams:null
+			}
+		},
+		onLoad(option) {
+			if(options.scanningParams) {
+				// 用于扫码进入油站详情页面
+				this.scanningParams = options.scanningParams
 			}
 		},
 		onShow() {},
@@ -402,6 +409,12 @@
 							icon: 'none'
 						})
 					}, 1000);
+					if(this.scanningParams) {
+						uni.redirectTo({
+							url: `/BagStation/pages/stationDetail/stationDetail?q=${this.scanningParams}`
+						})
+						return 
+					}
 					//  这里有问题
 					uni.switchTab({
 						url: '/pages/tabbar/home/home'