From 10db09788d74b441a2efd85f5d4614e944b07bb3 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期二, 26 三月 2024 20:07:11 +0800
Subject: [PATCH] 问题修改
---
pages/personalCenter/index.js | 91 +++++++++++++++++++++++++++++++++++----------
1 files changed, 71 insertions(+), 20 deletions(-)
diff --git a/pages/personalCenter/index.js b/pages/personalCenter/index.js
index 1cfeaa4..190cc96 100644
--- a/pages/personalCenter/index.js
+++ b/pages/personalCenter/index.js
@@ -117,7 +117,9 @@
moreMenu,
moreMenu1,
visible: false,
-
+ baseRefresh: {
+ value: false
+ }
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
@@ -143,15 +145,21 @@
url: "/pages/testLogin/index",
});
}
-
},
onShow() {
-
+ if (typeof this.getTabBar === 'function' && this.getTabBar()) {
+ this.getTabBar().setData({
+ active: 4
+ })
+ }
},
/**
* 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
*/
onPullDownRefresh() {
+ this.setData({
+ 'baseRefresh.value': true,
+ })
this.getUserInfo()
},
/**
@@ -168,12 +176,15 @@
let userTypeData = res.infoList.find((item) => item.type == 'userType')
let type = "";
if (userTypeData) {
- this.data.userTypeActive = JSON.parse(userTypeData.data).userType;
+ this.setData({
+ userTypeActive: JSON.parse(userTypeData.data).userType,
+ });
type = userTypeList.find((item) => item.value === this.data.userTypeActive)?.lable;
} else {
type = '-'
}
let defaultUser = {};
+ let nickNameData = res.infoList.find((item) => item.type == 'nickName')
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')
@@ -181,8 +192,8 @@
if (teacherRole && teacherInfos) {
defaultUser = {
...teacherInfos,
- fullName: teacherInfos.fullName,
- icon: teacherInfos.icon,
+ nickName: nickNameData ? JSON.parse(nickNameData.data).nickName : teacherInfos.name,
+ icon: nickNameData ? JSON.parse(nickNameData.data).icon : WeChatInfo ? WeChatInfo.icon : '',
userId: res.userId,
role: 'Teacher',
roleId: teacherRole.role.id,
@@ -195,20 +206,22 @@
} else if (WeChatInfo) {
defaultUser = {
...WeChatInfo,
- fullName: WeChatInfo.name,
- icon: WeChatInfo.icon,
+ nickName: nickNameData ? JSON.parse(nickNameData.data).nickName : WeChatInfo.name,
+ icon: nickNameData ? JSON.parse(nickNameData.data).icon : WeChatInfo.icon,
userId: res.userId,
- userType: type
+ userType: type,
+ role: 'Student',
}
this.setData({
currAuthStep: 3,
});
} else if (secretData) {
defaultUser = {
- fullName: secretData.credential,
- icon: "",
+ nickName: nickNameData ? JSON.parse(nickNameData.data).nickName : secretData.credential,
+ icon: nickNameData ? JSON.parse(nickNameData.data).icon : "",
userId: res.userId,
- userType: type
+ userType: type,
+ role: 'Student',
}
}
this.setData({
@@ -216,6 +229,11 @@
})
this.getTeacherInfo()
wx.setStorageSync(app.config.userInfoKey, JSON.stringify(this.data.userInfo));
+ setTimeout(() => {
+ this.setData({
+ 'baseRefresh.value': false,
+ })
+ }, 500);
}
});
},
@@ -251,14 +269,46 @@
},
//淇敼鐢ㄦ埛绫诲瀷
editUserType() {
- this.setData({
- visible: true,
- });
+ if (!this.data.visible) {
+ this.setData({
+ visible: true,
+ });
+ }
},
onVisibleChange(e) {
this.setData({
visible: e.detail.visible,
});
+ },
+ tabUserTypeClick(e) {
+ let { info } = e.currentTarget.dataset;
+ this.setData({
+ userTypeActive: info.value,
+ });
+ },
+ submit() {
+ let userTypeInfo = {
+ requests: [
+ {
+ data: JSON.stringify({ userType: this.data.userTypeActive }),
+ name: '鐢ㄦ埛绫诲瀷',
+ type: 'userType'
+ }
+ ]
+ }
+ app.MG.identity.setAppUserInfo(userTypeInfo).then((res) => {
+ if (res) {
+ wx.showToast({
+ title: "淇敼鎴愬姛",
+ icon: 'success',
+ duration: 1000,
+ })
+ this.getUserInfo()
+ this.setData({
+ visible: false,
+ });
+ }
+ })
},
//璁剧疆
gotoUserEditPage() {
@@ -269,7 +319,6 @@
//鐐瑰嚮鐩綍
toPages(item) {
- console.log(item)
let info = item.currentTarget.dataset.info
if (info.url) {
wx.navigateTo({
@@ -284,14 +333,16 @@
}
},
+ onScroll(e) {
+ this.setData({
+ isWhite: e.detail.scrollTop > 10 ? true : false
+ })
+ },
+
/**
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
onShareAppMessage() {
},
- //璺宠浆鍏充簬鎴戜滑鍜岃仈绯绘垜浠�
- onAboutUS() {
- console.log(111);
- }
})
\ No newline at end of file
--
Gitblit v1.9.1