From b45a01a8bee4a9bff5f9c248ead301b8675d1099 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 28 十月 2022 17:22:35 +0800
Subject: [PATCH] 2022.10.28
---
pages/m_user/userlogin/userlogin.js | 164 ++++++++++++++++++++++++++++--------------------------
1 files changed, 85 insertions(+), 79 deletions(-)
diff --git a/pages/m_user/userlogin/userlogin.js b/pages/m_user/userlogin/userlogin.js
index de0231e..c4509fb 100644
--- a/pages/m_user/userlogin/userlogin.js
+++ b/pages/m_user/userlogin/userlogin.js
@@ -1,8 +1,7 @@
// pages/m_user/userlogin/userlogin.js
import b_login from '../behaviors/b_login'
+import $f from "../../../service//baserequest"
-const $f = require("../../../service//baserequest")
-const userservice = require("../../../service/userservice")
const app = getApp()
Page({
@@ -41,7 +40,7 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
*/
onReady: function () {
- // this.login()
+
},
/**
@@ -52,89 +51,58 @@
},
loginWx() {
+ var that = this
if (!this.waitAgree()) return
-
if (app.globalData.userProfile) {
- this.loginPw(app.globalData.userProfile)
- }else {
+ wx.requestSubscribeMessage({
+ tmplIds: [
+ '6JQFOJ12yBvKfRg_duSdwKiH5_J3LpICmz3Li-L1Cr8',
+ 'zPNMzF5WsshniJyl83DD-lDZtNvx7JyqLbKgqDl0qvU',
+ 'dqREi7vAd03OOirTgBGcm5aCihZJKBjVpiA8Kbu4B8w'
+ ],
+ success(res) {
+ console.log(res);
+ },
+ fail(e) {
+ console.log(e);
+ },
+ complete() {
+ that.loginPw(app.globalData.userProfile)
+ }
+ })
+ } else {
wx.getUserProfile({
lang: 'zh_CN',
desc: '鐢ㄤ簬鏄剧ず锛屾彁绀虹敤鎴峰綋鍓嶅凡鐧诲綍',
- success:(res)=> {
+ success: (res) => {
console.log(res);
wx.setStorage({
data: res.userInfo,
key: 'userProfile',
})
this.loginPw(res.userInfo)
-
- // that.login()
+ },
+ complete() {
+ wx.requestSubscribeMessage({
+ tmplIds: [
+ '6JQFOJ12yBvKfRg_duSdwKiH5_J3LpICmz3Li-L1Cr8',
+ 'zPNMzF5WsshniJyl83DD-lDZtNvx7JyqLbKgqDl0qvU',
+ 'dqREi7vAd03OOirTgBGcm5aCihZJKBjVpiA8Kbu4B8w'
+ ],
+ success(res) {
+ console.log(res);
+ },
+ fail(e) {
+ console.log(e);
+ },
+ complete() {
+ }
+ })
}
})
}
-
- },
- login() {
- //鑾峰彇缂撳瓨鐨勭敤鎴疯处鎴峰瘑鐮�
- var that = this
- wx.getStorage({
- key: 'accessToken',
- 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) {
- 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
- })
- wx.hideLoading()
- }
- })
- },
- fail(e) { //鑾峰彇澶辫触
- //鍚庡彴鏌ヨ寰俊鏄惁缁戝畾璐﹀彿锛屾湭缁戝畾鍒欒烦杞敞鍐岀晫闈�
- wx.navigateTo({
- url: '/pages/m_user/userregistercompany/userregistercompany',
- success: (result) => {},
- fail: (res) => {},
- complete: (res) => {},
- })
- }
- })
},
_onLoginFail(e) {
@@ -149,15 +117,30 @@
gotoLogin(toast) {
if (!this.waitAgree()) return
- wx.navigateTo({
- url: '/pages/m_user/userloginpw/userloginpw',
- success: (result) => {
- if (typeof toast === 'function') {
- toast()
- }
+ wx.requestSubscribeMessage({
+ tmplIds: [
+ '6JQFOJ12yBvKfRg_duSdwKiH5_J3LpICmz3Li-L1Cr8',
+ 'zPNMzF5WsshniJyl83DD-lDZtNvx7JyqLbKgqDl0qvU',
+ 'dqREi7vAd03OOirTgBGcm5aCihZJKBjVpiA8Kbu4B8w'
+ ],
+ success(res) {
+ console.log(res);
},
- fail: (res) => {},
- complete: (res) => {},
+ fail(e) {
+ console.log(e);
+ },
+ complete() {
+ wx.navigateTo({
+ url: '/pages/m_user/userloginpw/userloginpw',
+ success: (result) => {
+ if (typeof toast === 'function') {
+ toast()
+ }
+ },
+ fail: (res) => {},
+ complete: (res) => {},
+ })
+ }
})
},
@@ -177,10 +160,33 @@
return true
} else {
wx.showToast({
- title: '璇峰厛鍚屾剰璇存槑',
+ title: '闃呰骞跺悓鎰忔潯娆�',
icon: 'none'
})
return false
}
+ },
+
+ gotoAgreement() {
+ wx.showLoading({
+ title: ' 鎵撳紑涓�',
+ mask: true,
+ })
+ wx.downloadFile({
+ url: app.globalData.agreement,
+ success: function (res) {
+ wx.hideLoading()
+ const filePath = res.tempFilePath
+ wx.openDocument({
+ filePath: filePath,
+ success: function (res) {
+ console.log('鎵撳紑鏂囨。鎴愬姛')
+ },
+ fail(error) {
+ console.log(error);
+ }
+ })
+ }
+ })
}
})
\ No newline at end of file
--
Gitblit v1.9.3