From 8fbd6b8d09e70494d920cc0b77812e9643be3196 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 23 八月 2022 17:37:31 +0800
Subject: [PATCH] 2022.8.23
---
pages/module_user/userlogin/userlogin.js | 39 +++++++++++++++++++++++++++++----------
1 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/pages/module_user/userlogin/userlogin.js b/pages/module_user/userlogin/userlogin.js
index 5609ece..dd378ee 100644
--- a/pages/module_user/userlogin/userlogin.js
+++ b/pages/module_user/userlogin/userlogin.js
@@ -34,19 +34,22 @@
},
loginWx() {
+ var that = this
wx.getUserProfile({
lang: 'zh_CN',
desc: '鐢ㄤ簬鏄剧ず锛屾彁绀虹敤鎴峰綋鍓嶅凡鐧诲綍',
success(res) {
console.log(res);
- wx.login({
- timeout: 10000,
- success: (result) => {
- console.log(result);
- },
- fail: (res) => {},
- complete: (res) => {},
- })
+ // wx.login({
+ // timeout: 10000,
+ // success: (result) => {
+ // console.log(result);
+ // },
+ // fail: (res) => {},
+ // complete: (res) => {},
+ // })
+
+ that.login()
}
})
},
@@ -56,13 +59,20 @@
var that = this
wx.getStorage({
key: 'accessToken',
- success(res) {
+ success(res) { //鑾峰彇鎴愬姛鑷姩鐧诲綍
app.globalData.accessToken = res.data
that.setData({
userName: res.data.userName,
password: res.data.password
})
+ wx.showLoading({
+ title: '鐧诲綍涓�',
+ mask: true,
+ })
+ setTimeout(() => {
+ wx.hideLoading()
+ }, 10000);
userservice.login(that.data.userName, that.data.password, {
success(data) {
if (data.success) {
@@ -89,14 +99,23 @@
that.setData({
loading: false
})
+ wx.hideLoading()
}
})
},
+ fail(e) { //鑾峰彇澶辫触
+ //鍚庡彴鏌ヨ寰俊鏄惁缁戝畾璐﹀彿锛屾湭缁戝畾鍒欒烦杞敞鍐岀晫闈�
+ wx.navigateTo({
+ url: '/pages/module_user/userregistercompany/userregistercompany',
+ success: (result) => {},
+ fail: (res) => {},
+ complete: (res) => {},
+ })
+ }
})
},
getUserInfo() {
- var that = this
userservice.getUserInfo(app.globalData.accessToken.userId, {
success(data) {
app.globalData.userInfo = data
--
Gitblit v1.9.3