From 366de5b4636679392a1e3d2984fc23bd5eaa5ac3 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期二, 27 八月 2024 17:48:03 +0800
Subject: [PATCH] wenti
---
pages/personalCenter/index.js | 186 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 142 insertions(+), 44 deletions(-)
diff --git a/pages/personalCenter/index.js b/pages/personalCenter/index.js
index 190cc96..930b345 100644
--- a/pages/personalCenter/index.js
+++ b/pages/personalCenter/index.js
@@ -1,6 +1,9 @@
-const app = getApp()
-const menuData = [
- {
+const app = getApp();
+import moment from 'moment'
+import {
+ loginInfo
+} from '../../assets/js/login';
+const menuData = [{
title: '鎴戠殑璁㈠崟',
icon: '/static/images/personal/order.png',
url: '/packagePersonal/pages/myOrder/index',
@@ -49,8 +52,7 @@
type: 'publishBooks',
}
];
-const moreMenu = [
- {
+const moreMenu = [{
title: '鎴戠殑娑堟伅',
icon: '/static/images/personal/notification.png',
url: '/packagePersonal/pages/myMassage/index',
@@ -63,8 +65,7 @@
type: 'feedback',
}
];
-const moreMenu1 = [
- {
+const moreMenu1 = [{
title: '鍏充簬鎴戜滑',
icon: '/static/images/personal/about.png',
url: '/packagePersonal/pages/aboutUs/index?types=jsek_aboutUs',
@@ -77,8 +78,7 @@
type: 'contact',
}
];
-const userTypeList = [
- {
+const userTypeList = [{
lable: '涓亴鏁欏笀',
value: 'vocSchoolTeachers'
},
@@ -103,6 +103,7 @@
data: {
barHeight: '',
navBarHeight: '',
+ scoll: false,
isWhite: false,
userInfo: {},
currAuthStep: 1,
@@ -119,7 +120,13 @@
visible: false,
baseRefresh: {
value: false
- }
+ },
+ loadingProps: {
+ size: '10rpx',
+ },
+ scrollTop: 0,
+ visibleIntegral: false,
+ recordList: []
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
@@ -132,25 +139,32 @@
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() {
if (typeof this.getTabBar === 'function' && this.getTabBar()) {
this.getTabBar().setData({
active: 4
})
+ }
+ // 妫�鏌ョ櫥褰曠姸鎬�
+ const token = wx.getStorageSync(app.config.tokenKey)
+ if (!token) {
+ loginInfo(app, (data) => {
+ if (data) {
+ this.setData({
+ currAuthStep: 2,
+ });
+ this.getUserInfo()
+ this.getIntegral()
+ }
+ })
+ } else {
+ this.setData({
+ currAuthStep: 3,
+ });
+ this.getUserInfo()
+ this.getIntegral()
}
},
/**
@@ -161,12 +175,13 @@
'baseRefresh.value': true,
})
this.getUserInfo()
+ this.getIntegral()
+ wx.stopPullDownRefresh()
},
/**
* 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
*/
- onReachBottom() {
- },
+ onReachBottom() {},
// 鑾峰彇鐧诲綍鐢ㄦ埛韬唤
getUserInfo() {
app.MG.identity.getCurrentAppUser().then(res => {
@@ -179,21 +194,21 @@
this.setData({
userTypeActive: JSON.parse(userTypeData.data).userType,
});
- type = userTypeList.find((item) => item.value === this.data.userTypeActive)?.lable;
+ type = this.data.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");
+ let secretData = res.secretList.find(i => i.type == 'LoginNameAndPassword')
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 ? WeChatInfo.name : '',
+ icon: nickNameData && JSON.parse(nickNameData.data).icon != "" ? JSON.parse(nickNameData.data).icon : WeChatInfo ? WeChatInfo.icon : '',
userId: res.userId,
role: 'Teacher',
roleId: teacherRole.role.id,
@@ -206,8 +221,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',
@@ -217,12 +232,15 @@
});
} else if (secretData) {
defaultUser = {
- nickName: nickNameData ? JSON.parse(nickNameData.data).nickName : secretData.credential,
- icon: nickNameData ? JSON.parse(nickNameData.data).icon : "",
+ nickName: nickNameData && JSON.parse(nickNameData.data).nickName ? JSON.parse(nickNameData.data).nickName : secretData.credential,
+ icon: nickNameData && JSON.parse(nickNameData.data).icon != "" ? JSON.parse(nickNameData.data).icon : "",
userId: res.userId,
+ role: "Student",
userType: type,
- role: 'Student',
}
+ this.setData({
+ currAuthStep: 3,
+ });
}
this.setData({
userInfo: defaultUser
@@ -281,20 +299,22 @@
});
},
tabUserTypeClick(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) {
@@ -317,6 +337,69 @@
});
},
+ getIntegral() {
+ app.MG.store
+ .getUserWallet({
+ type: 'integral'
+ })
+ .then((res) => {
+ this.setData({
+ integral: res.balance,
+ });
+ })
+ },
+ getIntegralList() {
+ app.MG.store
+ .getWalletHistory({
+ Size: 999,
+ Start: 0,
+ sort: {
+ type: 'Desc',
+ field: 'CreateDate'
+ },
+ type: 'integral'
+ })
+ .then((res) => {
+ if (res.datas.length > 0) {
+ res.datas.forEach((element) => {
+ element.createDate = moment(element.createDate).format('YYYY-MM-DD HH:mm:ss')
+ if (element.refType == 'sign') {
+ element.type = '姣忔棩鐧诲綍'
+ }
+ if (element.refType == 'Reward') {
+ element.type = '涓婁紶璧勬簮濂栧姳'
+ }
+ if (element.refType == 'OrderCoinBonus') {
+ element.type = '璁㈠崟鏀粯濂栧姳'
+ }
+ if (element.refType == 'Order' && element.value < 0) {
+ element.type = '璁㈠崟鏀粯鎶垫墸'
+ }
+ if (element.refType == 'Order' && element.value > 0) {
+ element.type = '璁㈠崟鍙栨秷閫�鍥�'
+ }
+ if (element.refType == 'AdminRecharge') {
+ element.type = '绠＄悊鍛樺厖鍊�'
+ }
+ })
+ this.setData({
+ recordList: res.datas,
+ visibleIntegral: true
+ });
+ }
+ })
+ },
+ onVisibleIntegralChange(e) {
+ this.setData({
+ visibleIntegral: e.detail.visible,
+ });
+ },
+ onClose() {
+ this.setData({
+ visibleIntegral: false,
+ });
+ },
+
//鐐瑰嚮鐩綍
toPages(item) {
let info = item.currentTarget.dataset.info
@@ -334,11 +417,26 @@
},
onScroll(e) {
+ if (this.data.scoll) {
+ if (e.detail.scrollTop < 20) {
+ this.data.scoll = false
+ this.isChange(false);
+ }
+ } else {
+ if (e.detail.scrollTop > 20) {
+ this.data.scoll = true
+ this.isChange(true);
+ }
+ }
+ },
+
+ isChange(data) {
this.setData({
- isWhite: e.detail.scrollTop > 10 ? true : false
+ isWhite: data
})
},
+
/**
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
--
Gitblit v1.9.1