From 0b523220931d70aa752c3beaca5ed32ca85511c5 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期四, 28 三月 2024 11:36:05 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
assets/js/login.js | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/assets/js/login.js b/assets/js/login.js
index c7cb7c9..3767405 100644
--- a/assets/js/login.js
+++ b/assets/js/login.js
@@ -1,4 +1,6 @@
-import { setSessionGuid } from "./userAction"
+import {
+ setSessionGuid
+} from "./userAction"
export const loginInfo = (app, callback) => {
@@ -28,7 +30,6 @@
}
url += "?" + option
}
- debugger
console.log(url);
wx.navigateTo({
url: "/pages/bindInfo/index?page=" + encodeURIComponent(url),
@@ -49,7 +50,7 @@
// 鑾峰彇鐢ㄦ埛淇℃伅
getUserInfo(app, callback, res.token)
// 璁板綍鐧诲綍缁熻
- // setSessionGuid()
+ setSessionGuid()
} else {
console.log(res);
callback(false)
@@ -85,12 +86,12 @@
let defaultUser = {};
let WeChatInfo = res.infoList.find((item) => item.type === "WeChat");
let phoneNumber = res.secretList.find(i => i.type == 'MobilePhone')
-
if (WeChatInfo) {
defaultUser = {
nickName: WeChatInfo.name,
avatarUrl: WeChatInfo.icon,
- weChatId: WeChatInfo.id
+ weChatId: WeChatInfo.id,
+ userId: res.userId,
}
}
if (phoneNumber) {
--
Gitblit v1.9.1