更新

BagAuth/pages/login/login.vue

@@ -223,17 +223,17 @@
 					let user = resData.authTokenDTO.loginUser
 					uni.setStorageSync('user', user)
 
-					setTimeout(() => {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							complete: (err) => {
-							}
-						})
-					}, 1000);
+					// setTimeout(() => {
+					// 	uni.showToast({
+					// 		title: res.msg,
+					// 		icon: 'none',
+					// 		complete: (err) => {
+					// 		}
+					// 	})
+					// }, 1000);
 					if(this.scanningParams) {
 						uni.redirectTo({
-							url: `/BagStation/pages/stationDetail/stationDetail?q=${this.scanningParams}`
+							url: `/BagStation/pages/makeOrder/makeOrder?q=${this.scanningParams}`
 						})
 						return 
 					}

BagAuth/pages/login/oldLogin.vue

@@ -171,11 +171,11 @@
 				loginRes: {},
 				checked: false,
 				next: false,
-				scanningParams:null
+				scanningParams: null
 			}
 		},
 		onLoad(options) {
-			if(options.scanningParams) {
+			if (options.scanningParams) {
 				// 用于扫码进入油站详情页面
 				this.scanningParams = options.scanningParams
 			}
@@ -408,11 +408,11 @@
 							icon: 'none'
 						})
 					}, 1000);
-					if(this.scanningParams) {
+					if (this.scanningParams && this.scanningParams !== 'null') {
 						uni.redirectTo({
-							url: `/BagStation/pages/stationDetail/stationDetail?q=${this.scanningParams}`
+							url: `/BagStation/pages/makeOrder/makeOrder?q=${this.scanningParams}`
 						})
-						return 
+						return
 					}
 					//  这里有问题
 					uni.switchTab({