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/userlogin/userlogin.js | 116 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 79 insertions(+), 37 deletions(-)
diff --git a/pages/m_user/userlogin/userlogin.js b/pages/m_user/userlogin/userlogin.js
index 5c60b43..de0231e 100644
--- a/pages/m_user/userlogin/userlogin.js
+++ b/pages/m_user/userlogin/userlogin.js
@@ -1,22 +1,40 @@
// pages/m_user/userlogin/userlogin.js
+import b_login from '../behaviors/b_login'
+
const $f = require("../../../service//baserequest")
const userservice = require("../../../service/userservice")
const app = getApp()
Page({
-
+ behaviors: [b_login],
/**
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
data: {
- bgPath: $f.baseIconUrl + 'userlogin-1.png'
+ bgPath: $f.baseIconUrl + 'userlogin-1.png',
+ agree: false,
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad: function (options) {
-
+ wx.getStorage({
+ key: 'agree',
+ success: (res) => {
+ this.setData({
+ agree: res.data
+ })
+ }
+ })
+ wx.getStorage({
+ key: 'userProfile',
+ success: (res) => {
+ this.setData({
+ userProfile: res.data
+ })
+ },
+ })
},
/**
@@ -34,24 +52,28 @@
},
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) => {},
- // })
+ if (!this.waitAgree()) return
- that.login()
- }
- })
+ if (app.globalData.userProfile) {
+ this.loginPw(app.globalData.userProfile)
+ }else {
+ wx.getUserProfile({
+ lang: 'zh_CN',
+ desc: '鐢ㄤ簬鏄剧ず锛屾彁绀虹敤鎴峰綋鍓嶅凡鐧诲綍',
+ success:(res)=> {
+ console.log(res);
+ wx.setStorage({
+ data: res.userInfo,
+ key: 'userProfile',
+ })
+ this.loginPw(res.userInfo)
+
+ // that.login()
+ }
+ })
+ }
+
+
},
login() {
@@ -115,30 +137,50 @@
})
},
- getUserInfo() {
- 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) {
+ this.gotoLogin(function () {
+ wx.showToast({
+ title: '鏈粦瀹氳处鍙�',
+ duration: 1000,
+ icon: 'none',
+ })
})
},
- gotoLogin() {
+ gotoLogin(toast) {
+ if (!this.waitAgree()) return
wx.navigateTo({
url: '/pages/m_user/userloginpw/userloginpw',
- success: (result) => {},
+ success: (result) => {
+ if (typeof toast === 'function') {
+ toast()
+ }
+ },
fail: (res) => {},
complete: (res) => {},
})
+ },
+
+ checkboxChange(e) {
+ var a = !this.data.agree
+ this.setData({
+ agree: a
+ })
+ wx.setStorage({
+ key: 'agree',
+ data: a
+ })
+ },
+
+ waitAgree() {
+ if (this.data.agree) {
+ return true
+ } else {
+ wx.showToast({
+ title: '璇峰厛鍚屾剰璇存槑',
+ icon: 'none'
+ })
+ return false
+ }
}
})
\ No newline at end of file
--
Gitblit v1.9.3