From a9abe435bdc23bda340c84f45deb363eccf907a7 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期二, 02 四月 2024 10:06:17 +0800
Subject: [PATCH] 个人中心
---
pages/personalCenter/index.wxss | 2 +-
packageDomain/pages/teacherCertification/index.js | 4 ++++
pages/personalCenter/index.js | 11 ++++++-----
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/packageDomain/pages/teacherCertification/index.js b/packageDomain/pages/teacherCertification/index.js
index 4a146d5..afaf20a 100644
--- a/packageDomain/pages/teacherCertification/index.js
+++ b/packageDomain/pages/teacherCertification/index.js
@@ -225,6 +225,10 @@
}
}
+ } else {
+ that.setData({
+ skeletonLoding: false,
+ });
}
} catch (error) {}
})
diff --git a/pages/personalCenter/index.js b/pages/personalCenter/index.js
index b54d1de..9fa904c 100644
--- a/pages/personalCenter/index.js
+++ b/pages/personalCenter/index.js
@@ -156,7 +156,7 @@
})
} else {
this.setData({
- currAuthStep: 1,
+ currAuthStep: 3,
});
this.getUserInfo()
}
@@ -186,7 +186,7 @@
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 = ''
}
@@ -224,10 +224,11 @@
});
} else if (secretData) {
defaultUser = {
- nickName: secretData.credential,
- 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"
+ role: "Student",
+ userType: type,
}
this.setData({
currAuthStep: 3,
diff --git a/pages/personalCenter/index.wxss b/pages/personalCenter/index.wxss
index b198e26..88ce583 100644
--- a/pages/personalCenter/index.wxss
+++ b/pages/personalCenter/index.wxss
@@ -149,7 +149,7 @@
background: #fff;
border-top-left-radius: 16rpx;
border-top-right-radius: 16rpx;
- margin-bottom: 100rpx;
+ margin-bottom: calc(env(safe-area-inset-bottom) + 88rpx);
}
.block .header {
--
Gitblit v1.9.1