From 4b5f1f7ed3460df9465e5071a59b8105cbc9146e Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期五, 29 三月 2024 14:35:30 +0800
Subject: [PATCH] 修改
---
pages/personalCenter/index.js | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/pages/personalCenter/index.js b/pages/personalCenter/index.js
index 0d20c2e..6d450dd 100644
--- a/pages/personalCenter/index.js
+++ b/pages/personalCenter/index.js
@@ -135,6 +135,14 @@
barHeight: systInfo.statusBarHeight,
navBarHeight: navBarHeight,
});
+
+ },
+ onShow() {
+ if (typeof this.getTabBar === 'function' && this.getTabBar()) {
+ this.getTabBar().setData({
+ active: 4
+ })
+ }
// 妫�鏌ョ櫥褰曠姸鎬�
const token = wx.getStorageSync(app.config.tokenKey)
if (!token) {
@@ -151,13 +159,6 @@
currAuthStep: 1,
});
this.getUserInfo()
- }
- },
- onShow() {
- if (typeof this.getTabBar === 'function' && this.getTabBar()) {
- this.getTabBar().setData({
- active: 4
- })
}
},
/**
@@ -197,8 +198,8 @@
if (teacherRole && teacherInfos) {
defaultUser = {
...teacherInfos,
- nickName: teacherInfos.name,
- icon: nickNameData ? JSON.parse(nickNameData.data).icon : WeChatInfo ? WeChatInfo.icon : '',
+ 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,
@@ -211,8 +212,8 @@
} else if (WeChatInfo) {
defaultUser = {
...WeChatInfo,
- nickName: nickNameData ? JSON.parse(nickNameData.data).nickName : WeChatInfo.name,
- icon: nickNameData ? JSON.parse(nickNameData.data).icon : WeChatInfo.icon,
+ 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,
userType: type,
role: 'Student',
--
Gitblit v1.9.1