From a8fb7ae2dbb61a94141ed5e73d3bb2632b7b84df Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期日, 28 九月 2025 15:25:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
h5/pages/login/login.vue | 93 ++++++++++++++++++++++++++--------------------
1 files changed, 52 insertions(+), 41 deletions(-)
diff --git a/h5/pages/login/login.vue b/h5/pages/login/login.vue
index 9ab5fd0..4a2ca65 100644
--- a/h5/pages/login/login.vue
+++ b/h5/pages/login/login.vue
@@ -43,33 +43,40 @@
return {
code: ''
}
- },
- onLoad(option) {
- if(option.ywid){
- uni.setStorageSync('ywinfo', {
- type: option.type,
- yw: option.yw,
- ywid: option.ywid
- })
+ },
+ onLoad(option) {
+ console.log('onLoad');
+ if (option.ywid) {
+ uni.setStorageSync('ywinfo', {
+ type: option.type,
+ yw: option.yw,
+ ywid: option.ywid
+ })
}
+ // https://atwl.ahzyssl.com/zhyq_h5/#/pages/login/login?type=2&yw=5&ywid=b3db2072-a453-470d-8c0d-ba3b8b256530
},
onShow() {
- var that = this
- let url = 'https://atwl.ahzyssl.com/zhyq_h5/#/'
- let code = ''
- if (window.location.href.indexOf('code=') !== -1 || this.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'
- let uri = encodeURIComponent(url)
- let authURL =
- `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appID}&redirect_uri=${uri}&response_type=code&scope=snsapi_base#wechat_redirect`
- window.location.href = authURL
- }
+ // 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('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'
+ // let uri = encodeURIComponent(url)
+ // let authURL =
+ // `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appID}&redirect_uri=${uri}&response_type=code&scope=snsapi_base#wechat_redirect`
+ // window.location.href = authURL
+ // }
},
methods: {
@@ -126,24 +133,28 @@
that.$store.commit('setMember', res.data.member)
}
let flag = res.data.member && res.data.member.id
- if (source == 0) {
- if (res.data.token) {
- that.$store.commit('setToken', res.data.token)
- getUserInfo().then(ress => {
- that.$store.commit('setDriverInfo', ress.data)
- })
+ 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')
+ setTimeout(() => {
+ that.driverLogin(flag)
+ }, 200)
+ } else if (source == 2) {
+ if (res.data.token) {
+ that.$store.commit('setToken', res.data.token)
+ getUserInfo().then(ress => {
+ that.$store.commit('setUserInfo', ress.data)
+ })
+ }
+ setTimeout(() => {
+ that.staffLogin(flag)
+ }, 200)
+ } else {
+ this.jump('/pages/index/index')
}
}
})
--
Gitblit v1.9.3