From 6c5165f73c90fbd4e22e4f9a39497b5a25ee37f9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 26 十二月 2024 09:53:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/staffLogin/login.vue | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/h5/pages/staffLogin/login.vue b/h5/pages/staffLogin/login.vue
index 3681b31..6e6aa57 100644
--- a/h5/pages/staffLogin/login.vue
+++ b/h5/pages/staffLogin/login.vue
@@ -86,7 +86,9 @@
ProtocolFlag: false,
captcha: {},
htmlText: '',
- windowHeight: ''
+ windowHeight: '',
+
+ ywinfo: {}
}
},
@@ -94,7 +96,12 @@
this.initCaptcha()
const result = uni.getWindowInfo()
this.windowHeight = result.windowHeight
- console.log('result', result);
+
+ const ywinfo = uni.getStorageSync('ywinfo') || {}
+ if (ywinfo.ywid && ywinfo.type == 2) {
+ this.ywinfo = ywinfo
+ uni.setStorageSync('ywinfo', {})
+ }
},
onBackPress(options) {
uni.redirectTo({
@@ -151,14 +158,19 @@
if (res.code === 200) {
this.setToken(res.data)
getUserInfo().then(ress => {
+ uni.setStorageSync('ywinfo', this.ywinfo)
this.setUserInfo(ress.data)
uni.redirectTo({
url: "/pages/staff/index"
})
})
saveHkUserOpenid({})
- }
- })
+ }else{
+ this.initCaptcha()
+ }
+ }, () => {
+ this.initCaptcha()
+ })
}
}
}
--
Gitblit v1.9.3