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 | 77 +++++++++++++++++++++++++++++++-------
1 files changed, 62 insertions(+), 15 deletions(-)
diff --git a/pages/m_user/userlogin/userlogin.js b/pages/m_user/userlogin/userlogin.js
index ddd88f8..c4509fb 100644
--- a/pages/m_user/userlogin/userlogin.js
+++ b/pages/m_user/userlogin/userlogin.js
@@ -40,7 +40,7 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
*/
onReady: function () {
-
+
},
/**
@@ -51,26 +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)
+ },
+ complete() {
+ wx.requestSubscribeMessage({
+ tmplIds: [
+ '6JQFOJ12yBvKfRg_duSdwKiH5_J3LpICmz3Li-L1Cr8',
+ 'zPNMzF5WsshniJyl83DD-lDZtNvx7JyqLbKgqDl0qvU',
+ 'dqREi7vAd03OOirTgBGcm5aCihZJKBjVpiA8Kbu4B8w'
+ ],
+ success(res) {
+ console.log(res);
+ },
+ fail(e) {
+ console.log(e);
+ },
+ complete() {
+ }
+ })
}
})
}
-
+
},
_onLoginFail(e) {
@@ -85,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) => {},
+ })
+ }
})
},
@@ -113,7 +160,7 @@
return true
} else {
wx.showToast({
- title: '璇峰厛鍚屾剰璇存槑',
+ title: '闃呰骞跺悓鎰忔潯娆�',
icon: 'none'
})
return false
--
Gitblit v1.9.3