From 437144f41c74505d362a5214a18cec3d01b3ce4b Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期一, 10 十月 2022 17:51:30 +0800
Subject: [PATCH] 2022.10.10
---
pages/m_user/userloginpw/userloginpw.js | 119 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 69 insertions(+), 50 deletions(-)
diff --git a/pages/m_user/userloginpw/userloginpw.js b/pages/m_user/userloginpw/userloginpw.js
index b7fbbb7..67ac4df 100644
--- a/pages/m_user/userloginpw/userloginpw.js
+++ b/pages/m_user/userloginpw/userloginpw.js
@@ -1,9 +1,10 @@
// pages/m_user/userloginpw/userloginpw.js
-const userservice = require("../../../service/userservice")
+import b_login from '../behaviors/b_login'
+
const app = getApp()
Page({
-
+ behaviors: [b_login],
/**
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
@@ -35,13 +36,13 @@
})
},
- inputUserName (e) {
+ inputUserName(e) {
this.setData({
userName: e.detail.value
});
},
- inputPassword (e) {
+ inputPassword(e) {
this.setData({
password: e.detail.value
});
@@ -54,7 +55,7 @@
icon: 'none'
})
return
- }
+ }
if (this.data.password == '') {
wx.showToast({
title: '璇疯緭鍏ュ瘑鐮�',
@@ -62,65 +63,83 @@
})
return
}
- var that = this
this.setData({
loading: true
})
- userservice.login(this.data.userName, this.data.password, {
- success (data) {
- if (data.success) {
- app.globalData.accessToken = {
- userName: that.data.userName,
- password: that.data.password,
- userId: data.userId,
- suserId: data.suserId,
- }
+ // userservice.login(this.data.userName, this.data.password, {
+ // success (data) {
+ // if (data.success) {
+ // app.globalData.accessToken = {
+ // userName: that.data.userName,
+ // password: that.data.password,
+ // userId: data.userId,
+ // suserId: data.suserId,
+ // }
+ // wx.setStorage({
+ // key: 'accessToken',
+ // data: app.globalData.accessToken,
+ // })
+ // that.getUserInfo()
+ // } else {
+ // wx.showToast({
+ // title: '璐︽埛鎴栧瘑鐮侀敊璇�',
+ // duration: 1000,
+ // icon: 'none',
+ // })
+ // }
+ // },
+ // complete () {
+ // that.setData({
+ // loading: false
+ // })
+ // }
+ // })
+ if (app.globalData.userProfile) {
+ app.globalData.userProfile.userName = this.data.userName
+ app.globalData.userProfile.password = this.data.password
+ this.loginPw(app.globalData.userProfile)
+ } else {
+ wx.getUserProfile({
+ lang: 'zh_CN',
+ desc: '鐢ㄤ簬鏄剧ず锛屾彁绀虹敤鎴峰綋鍓嶅凡鐧诲綍',
+ success:(res)=> {
+ console.log(res);
wx.setStorage({
- key: 'accessToken',
- data: app.globalData.accessToken,
+ data: res.userInfo,
+ key: 'userProfile',
})
- that.getUserInfo()
- } else {
- wx.showToast({
- title: '璐︽埛鎴栧瘑鐮侀敊璇�',
- duration: 1000,
- icon: 'none',
- })
+ const token = res.userInfo
+ token.userName = this.data.userName
+ token.password = this.data.password
+ this.loginPw(token)
}
- },
- complete () {
- that.setData({
- loading: false
- })
- }
- })
+ })
+ }
+
},
- getUserInfo() {
- var that = this
- userservice.getUserInfo(app.globalData.accessToken.userId, {
- success(data) {
- app.globalData.userInfo = data
- app.globalData.isLogin = true
- wx.setStorage({
- key: 'userInfo',
- data: data,
- success: (result) => {
- wx.switchTab({
- url: '/pages/home/home',
- })
- }
- })
- }
+ _onLoginFail(e) {
+ wx.showToast({
+ title: '璐︽埛鎴栧瘑鐮侀敊璇�',
+ duration: 1000,
+ icon: 'none',
})
},
gotoRegister() {
- wx.navigateTo({
- url: '/pages/m_user/userregistertype/userregistertype',
- success: (result) => {},
+ wx.showToast({
+ title: '鏆備笉寮�鏀炬敞鍐�',
+ duration: 1000,
+ icon: 'error',
+ success: (res) => {},
fail: (res) => {},
complete: (res) => {},
})
+ // wx.navigateTo({
+ // url: '/pages/m_user/userregistertype/userregistertype',
+ // success: (result) => {},
+ // fail: (res) => {},
+ // complete: (res) => {},
+ // })
}
})
\ No newline at end of file
--
Gitblit v1.9.3