From c3d81e837e6350b431583c5cdcc1e0e09b4376c0 Mon Sep 17 00:00:00 2001 From: QYF-GitLab1 <1940665526@qq.com> Date: 星期三, 18 十二月 2024 16:45:47 +0800 Subject: [PATCH] 111 --- assets/js/login.js | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/assets/js/login.js b/assets/js/login.js index 434466c..37380d0 100644 --- a/assets/js/login.js +++ b/assets/js/login.js @@ -1,10 +1,12 @@ import { setSessionGuid } from "./userAction" - +const app = getApp(); +import MG from './middleGround/WebMiddleGroundApi'; +import config from './config'; export const loginInfo = (app, callback) => { - if (app.config.appId == 27) { + if (config.appId == 27) { wx.navigateTo({ url: "/pages/testLogin/index", }); @@ -13,9 +15,9 @@ success: (res) => { wx.getUserInfo({ success: (infoRes) => { - app.MG.identity.checkWeChatAppAccount({ + MG.identity.checkWeChatAppAccount({ code: res.code, - appCode: app.config.appRefCode, + appCode: config.appRefCode, encryptedData: infoRes.encryptedData, iv: infoRes.iv }).then(loginRes => { @@ -42,20 +44,24 @@ } else { wx.login({ success: (res) => { - app.MG.identity.loginByWeChatAppCode({ + MG.identity.loginByWeChatAppCode({ code: res.code, - appRefCode: app.config.appRefCode, + appRefCode: config.appRefCode, platform: "WeChatAppCustom", encryptedData: infoRes.encryptedData, iv: infoRes.iv }).then(res => { if (res && res.status == "Ok") { // 鍌ㄥ瓨token - wx.setStorageSync(app.config.tokenKey, res.token); + wx.setStorageSync(config.tokenKey, res.token); // 鑾峰彇鐢ㄦ埛淇℃伅 getUserInfo(app, callback, res.token) // 璁板綍鐧诲綍缁熻 setSessionGuid() + //鐧诲綍璁板綍绉垎 + MG.app.creatUserBehavior({ + refCode: "sign" + }) } else { console.log(res); callback(false) @@ -84,10 +90,9 @@ }) } } - // 鑾峰彇鐧诲綍鐢ㄦ埛韬唤 const getUserInfo = (app, callback, token) => { - app.MG.identity.getCurrentAppUser().then(res => { + MG.identity.getCurrentAppUser().then(res => { // 鐢ㄦ埛淇℃伅浼樺厛绾э細鏁欏笀璁よ瘉 > 寰俊 > 瀛︾敓锛堟敞鍐屾椂榛樿锛� if (res) { let defaultUser = {}; @@ -119,7 +124,7 @@ defaultUser.phoneNumber = phoneNumber.credential } - wx.setStorageSync(app.config.userInfoKey, JSON.stringify(defaultUser)); + wx.setStorageSync(config.userInfoKey, JSON.stringify(defaultUser)); } callback(token); }); -- Gitblit v1.9.1