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 | 117 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 67 insertions(+), 50 deletions(-)
diff --git a/pages/personalCenter/index.js b/pages/personalCenter/index.js
index 486252c..6d450dd 100644
--- a/pages/personalCenter/index.js
+++ b/pages/personalCenter/index.js
@@ -1,6 +1,8 @@
-const app = getApp()
-const menuData = [
- {
+const app = getApp();
+import {
+ loginInfo
+} from '../../assets/js/login';
+const menuData = [{
title: '鎴戠殑璁㈠崟',
icon: '/static/images/personal/order.png',
url: '/packagePersonal/pages/myOrder/index',
@@ -49,8 +51,7 @@
type: 'publishBooks',
}
];
-const moreMenu = [
- {
+const moreMenu = [{
title: '鎴戠殑娑堟伅',
icon: '/static/images/personal/notification.png',
url: '/packagePersonal/pages/myMassage/index',
@@ -63,8 +64,7 @@
type: 'feedback',
}
];
-const moreMenu1 = [
- {
+const moreMenu1 = [{
title: '鍏充簬鎴戜滑',
icon: '/static/images/personal/about.png',
url: '/packagePersonal/pages/aboutUs/index?types=jsek_aboutUs',
@@ -77,8 +77,7 @@
type: 'contact',
}
];
-const userTypeList = [
- {
+const userTypeList = [{
lable: '涓亴鏁欏笀',
value: 'vocSchoolTeachers'
},
@@ -117,6 +116,13 @@
moreMenu,
moreMenu1,
visible: false,
+ baseRefresh: {
+ value: false
+ },
+ loadingProps: {
+ size: '50rpx',
+ },
+ scrollTop: 0,
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
@@ -129,19 +135,6 @@
barHeight: systInfo.statusBarHeight,
navBarHeight: navBarHeight,
});
- if (wx.getStorageSync(app.config.tokenKey)) {
- this.setData({
- currAuthStep: 2,
- });
- this.getUserInfo()
- } else {
- this.setData({
- currAuthStep: 1,
- });
- wx.navigateTo({
- url: "/pages/testLogin/index",
- });
- }
},
onShow() {
@@ -150,18 +143,37 @@
active: 4
})
}
+ // 妫�鏌ョ櫥褰曠姸鎬�
+ const token = wx.getStorageSync(app.config.tokenKey)
+ if (!token) {
+ loginInfo(app, (data) => {
+ if (data) {
+ this.setData({
+ currAuthStep: 2,
+ });
+ this.getUserInfo()
+ }
+ })
+ } else {
+ this.setData({
+ currAuthStep: 1,
+ });
+ this.getUserInfo()
+ }
},
/**
* 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
*/
onPullDownRefresh() {
+ this.setData({
+ 'baseRefresh.value': true,
+ })
this.getUserInfo()
},
/**
* 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
*/
- onReachBottom() {
- },
+ onReachBottom() {},
// 鑾峰彇鐧诲綍鐢ㄦ埛韬唤
getUserInfo() {
app.MG.identity.getCurrentAppUser().then(res => {
@@ -176,19 +188,18 @@
});
type = userTypeList.find((item) => item.value === this.data.userTypeActive)?.lable;
} else {
- type = '-'
+ 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')
let WeChatInfo = res.infoList.find((item) => item.type === "WeChat");
if (teacherRole && teacherInfos) {
defaultUser = {
...teacherInfos,
- nickName: nickNameData ? JSON.parse(nickNameData.data).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,
@@ -201,27 +212,26 @@
} else if (WeChatInfo) {
defaultUser = {
...WeChatInfo,
- nickName: nickNameData ? JSON.parse(nickNameData.data).nickName : WeChatInfo.name,
- icon: JSON.parse(nickNameData.data).icon ? 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
+ userType: type,
+ role: 'Student',
}
this.setData({
currAuthStep: 3,
});
- } else if (secretData) {
- defaultUser = {
- nickName: nickNameData ? JSON.parse(nickNameData.data).nickName : secretData.credential,
- icon: JSON.parse(nickNameData.data).icon ? JSON.parse(nickNameData.data).icon : "",
- userId: res.userId,
- userType: type
- }
}
this.setData({
userInfo: defaultUser
})
this.getTeacherInfo()
wx.setStorageSync(app.config.userInfoKey, JSON.stringify(this.data.userInfo));
+ setTimeout(() => {
+ this.setData({
+ 'baseRefresh.value': false,
+ })
+ }, 500);
}
});
},
@@ -269,21 +279,22 @@
});
},
tabUserTypeClick(e) {
- console.log(e)
- let { info } = e.currentTarget.dataset;
+ let {
+ info
+ } = e.currentTarget.dataset;
this.setData({
userTypeActive: info.value,
});
},
submit() {
let userTypeInfo = {
- requests: [
- {
- data: JSON.stringify({ userType: this.data.userTypeActive }),
- name: '鐢ㄦ埛绫诲瀷',
- type: 'userType'
- }
- ]
+ requests: [{
+ data: JSON.stringify({
+ userType: this.data.userTypeActive
+ }),
+ name: '鐢ㄦ埛绫诲瀷',
+ type: 'userType'
+ }]
}
app.MG.identity.setAppUserInfo(userTypeInfo).then((res) => {
if (res) {
@@ -308,7 +319,6 @@
//鐐瑰嚮鐩綍
toPages(item) {
- console.log(item)
let info = item.currentTarget.dataset.info
if (info.url) {
wx.navigateTo({
@@ -323,12 +333,19 @@
}
},
- onPageScroll(e) {
+ onScroll(e) {
this.setData({
- isWhite: e.scrollTop > 20 ? true : false
+ isWhite: e.detail.scrollTop > 10 ? true : false
})
+ const {
+ scrollTop
+ } = e.detail;
+ this.setData({
+ scrollTop
+ });
},
+
/**
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
--
Gitblit v1.9.1