From 057199d5c5284a71e5d04e091492873ced412fa5 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期四, 21 三月 2024 09:28:54 +0800
Subject: [PATCH] 代码合并
---
packagePersonal/pages/userSetting/index.js | 71 +++++++++++++++++++++++++++--------
1 files changed, 54 insertions(+), 17 deletions(-)
diff --git a/packagePersonal/pages/userSetting/index.js b/packagePersonal/pages/userSetting/index.js
index 110615f..3f131a4 100644
--- a/packagePersonal/pages/userSetting/index.js
+++ b/packagePersonal/pages/userSetting/index.js
@@ -1,18 +1,22 @@
-// packagePersonal/pages/userSetting/index.js
+const app = getApp()
Page({
/**
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
data: {
-
+ userInfo: {},
+ defaultAvatarUrl: 'https://cdn-we-retail.ym.tencent.com/miniapp/usercenter/icon-user-center-avatar@2x.png',
+ visible: false
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
- onLoad(options) {
-
+ onLoad() {
+ if (wx.getStorageSync(app.config.tokenKey)) {
+ this.getUserInfo()
+ }
},
/**
@@ -28,19 +32,52 @@
onShow() {
},
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
- */
- onHide() {
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
- */
- onUnload() {
-
+ // 鑾峰彇鐧诲綍鐢ㄦ埛韬唤
+ getUserInfo() {
+ app.MG.identity.getCurrentAppUser().then(res => {
+ // 鐢ㄦ埛淇℃伅浼樺厛绾э細鏁欏笀璁よ瘉 > 寰俊 > 瀛︾敓锛堟敞鍐屾椂榛樿锛�
+ if (res) {
+ let defaultUser = {};
+ let teacherRole = res.roleLinks.find((item) => item.role.refCode == 'teacher')
+ let teacherInfos = res.infoList.find((item) => item.type == 'teacherInfo')
+ let secretData = res.secretList.find(i => i.type == 'LoginNameAndPassword')
+ let WeChatInfo = res.infoList.find((item) => item.type === "WeChat");
+ let phoneInfo = res.secretList.find((item) => item.type == 'MobilePhone')
+ let emailInfo = res.secretList.find((item) => item.type == 'EMail')
+ if (teacherRole && teacherInfos) {
+ defaultUser = {
+ ...teacherInfos,
+ fullName: teacherInfos.fullName,
+ icon: teacherInfos.icon,
+ userId: res.userId,
+ role: 'Teacher',
+ roleId: teacherRole.role.id,
+ phoneNumber: phoneInfo?.credential,
+ Email: emailInfo ? emailInfo.credential : JSON.parse(teacherInfos.data).email
+ }
+ } else if (WeChatInfo) {
+ defaultUser = {
+ ...WeChatInfo,
+ fullName: WeChatInfo.name,
+ icon: WeChatInfo.icon,
+ userId: res.userId,
+ phoneNumber: phoneInfo?.credential,
+ Email: emailInfo?.credential
+ }
+ } else if (secretData) {
+ defaultUser = {
+ fullName: secretData.credential,
+ icon: "",
+ userId: res.userId,
+ phoneNumber: phoneInfo?.credential,
+ Email: emailInfo?.credential
+ }
+ }
+ this.setData({
+ userInfo: defaultUser
+ })
+ }
+ });
},
/**
--
Gitblit v1.9.1