From 4b5f1f7ed3460df9465e5071a59b8105cbc9146e Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期五, 29 三月 2024 14:35:30 +0800
Subject: [PATCH] 修改
---
assets/js/login.js | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/assets/js/login.js b/assets/js/login.js
index c7cb7c9..1ddfc12 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)
@@ -83,14 +84,26 @@
// 鐢ㄦ埛淇℃伅浼樺厛绾э細鏁欏笀璁よ瘉 > 寰俊 > 瀛︾敓锛堟敞鍐屾椂榛樿锛�
if (res) {
let defaultUser = {};
+ let nickNameData = res.infoList.find((item) => item.type == 'nickName')
let WeChatInfo = res.infoList.find((item) => item.type === "WeChat");
+ let teacherRole = res.roleLinks.find((item) => item.role.refCode == 'teacher')
+ let teacherInfos = res.infoList.find((item) => item.type == 'teacherInfo')
let phoneNumber = res.secretList.find(i => i.type == 'MobilePhone')
-
- if (WeChatInfo) {
+ if (teacherRole && teacherInfos) {
defaultUser = {
- nickName: WeChatInfo.name,
- avatarUrl: WeChatInfo.icon,
- weChatId: WeChatInfo.id
+ ...teacherInfos,
+ nickName: nickNameData && JSON.parse(nickNameData.data).nickName ? JSON.parse(nickNameData.data).nickName : WeChatInfo.name,
+ icon: nickNameData && JSON.parse(nickNameData.data).icon ? JSON.parse(nickNameData.data).icon : WeChatInfo.icon,
+ userId: res.userId,
+ role: 'Teacher',
+ roleId: teacherRole.role.id,
+ }
+ } else if (WeChatInfo) {
+ defaultUser = {
+ nickName: nickNameData && JSON.parse(nickNameData.data).nickName ? JSON.parse(nickNameData.data).nickName : WeChatInfo.name,
+ icon: nickNameData && JSON.parse(nickNameData.data).icon ? JSON.parse(nickNameData.data).icon : WeChatInfo.icon,
+ weChatId: WeChatInfo.id,
+ userId: res.userId,
}
}
if (phoneNumber) {
--
Gitblit v1.9.1