From 09905b43ec2a249ef0e6057d148b8620cfaa1506 Mon Sep 17 00:00:00 2001
From: yiming <m13691596795@163.com>
Date: 星期二, 26 三月 2024 10:47:38 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
pages/personalCenter/index.js | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/pages/personalCenter/index.js b/pages/personalCenter/index.js
index 486252c..ff34677 100644
--- a/pages/personalCenter/index.js
+++ b/pages/personalCenter/index.js
@@ -117,6 +117,9 @@
moreMenu,
moreMenu1,
visible: false,
+ baseRefresh: {
+ value: false
+ }
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
@@ -142,7 +145,6 @@
url: "/pages/testLogin/index",
});
}
-
},
onShow() {
if (typeof this.getTabBar === 'function' && this.getTabBar()) {
@@ -155,6 +157,9 @@
* 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
*/
onPullDownRefresh() {
+ this.setData({
+ 'baseRefresh.value': true,
+ })
this.getUserInfo()
},
/**
@@ -202,9 +207,10 @@
defaultUser = {
...WeChatInfo,
nickName: nickNameData ? JSON.parse(nickNameData.data).nickName : WeChatInfo.name,
- icon: JSON.parse(nickNameData.data).icon ? JSON.parse(nickNameData.data).icon : WeChatInfo.icon,
+ icon: nickNameData ? JSON.parse(nickNameData.data).icon : WeChatInfo.icon,
userId: res.userId,
- userType: type
+ userType: type,
+ role: 'Student',
}
this.setData({
currAuthStep: 3,
@@ -212,9 +218,10 @@
} else if (secretData) {
defaultUser = {
nickName: nickNameData ? JSON.parse(nickNameData.data).nickName : secretData.credential,
- icon: JSON.parse(nickNameData.data).icon ? JSON.parse(nickNameData.data).icon : "",
+ icon: nickNameData ? JSON.parse(nickNameData.data).icon : "",
userId: res.userId,
- userType: type
+ userType: type,
+ role: 'Student',
}
}
this.setData({
@@ -222,6 +229,11 @@
})
this.getTeacherInfo()
wx.setStorageSync(app.config.userInfoKey, JSON.stringify(this.data.userInfo));
+ setTimeout(() => {
+ this.setData({
+ 'baseRefresh.value': false,
+ })
+ }, 500);
}
});
},
@@ -323,7 +335,7 @@
}
},
- onPageScroll(e) {
+ onScroll(e) {
this.setData({
isWhite: e.scrollTop > 20 ? true : false
})
--
Gitblit v1.9.1