From 423155b8134694c2f2e68f6d3f5239ba0541b0cf Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 31 十二月 2024 18:10:35 +0800
Subject: [PATCH] ll

---
 h5/pages/login/login.vue |   62 +++++++++++++++++++-----------
 1 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/h5/pages/login/login.vue b/h5/pages/login/login.vue
index 15766ad..8107316 100644
--- a/h5/pages/login/login.vue
+++ b/h5/pages/login/login.vue
@@ -43,13 +43,31 @@
 			return {
 				code: ''
 			}
+		},
+		onLoad(option) {
+			console.log('onLoad');
+			if(option.ywid){
+				uni.setStorageSync('ywinfo', {
+					type: option.type,
+					yw: option.yw,
+					ywid: option.ywid
+				})
+			}
 		},
 		onShow() {
 			var that = this
 			let url = 'https://atwl.ahzyssl.com/zhyq_h5/#/'
 			let code = ''
-			if (window.location.href.indexOf('code=') !== -1 || this.code) {
-
+			if (window.location.href.indexOf('code=') !== -1 || this.code) {
+				// if(window.location.href.indexOf('wdata') !== -1){
+				// 	uni.redirectTo({
+				// 		url: '/pages/wdata/home?code=' + 
+				// 	})
+				// }
+				const ywinfo = uni.getStorageSync('ywinfo') || {}
+				 if(ywinfo.ywid && (ywinfo.type || ywinfo.type == 0)){
+					 this.userAuth(ywinfo.type)
+				 }
 			} else {
 				// let url = window.location.href
 				const appID = 'wx173e6caf5abc718a'
@@ -114,27 +132,25 @@
 								that.$store.commit('setMember', res.data.member)
 							}
 							let flag = res.data.member && res.data.member.id
-							setTimeout(() => {
-								if (source == 0) {
-									if (res.data.token) {
-										that.$store.commit('setToken', res.data.token)
-										getUserInfo().then(ress => {
-											that.$store.commit('setDriverInfo', ress.data)
-										})
-									}
-									this.driverLogin(flag)
-								} else if (source == 2) {
-									if (res.data.token) {
-										that.$store.commit('setToken', res.data.token)
-										getUserInfo().then(ress => {
-											that.$store.commit('setUserInfo', ress.data)
-										})
-									}
-									this.staffLogin(flag)
-								} else {
-									this.jump('/pages/index/index')
-								}
-							}, 300)
+							if (source == 0) {
+								if (res.data.token) {
+									that.$store.commit('setToken', res.data.token)
+									getUserInfo().then(ress => {
+										that.$store.commit('setDriverInfo', ress.data)
+									})
+								}
+								this.driverLogin(flag)
+							} else if (source == 2) {
+								if (res.data.token) {
+									that.$store.commit('setToken', res.data.token)
+									getUserInfo().then(ress => {
+										that.$store.commit('setUserInfo', ress.data)
+									})
+								}
+								this.staffLogin(flag)
+							} else {
+								this.jump('/pages/index/index')
+							}
 						}
 					})
 				}

--
Gitblit v1.9.3