From 34dd2d10cf26c86ed170a59aa36718f7c27f24d0 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 03 四月 2024 15:30:29 +0800
Subject: [PATCH] 图书详情bug修改，云学习无销售方法check禁用
---
pages/personalCenter/index.js | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/pages/personalCenter/index.js b/pages/personalCenter/index.js
index bbeb19f..8301703 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 = ''
}
@@ -195,11 +195,12 @@
let teacherRole = res.roleLinks.find((item) => item.role.refCode == 'teacher')
let teacherInfos = res.infoList.find((item) => item.type == 'teacherInfo')
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 ? JSON.parse(nickNameData.data).nickName : WeChatInfo.name,
- icon: nickNameData && 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 ? 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,
@@ -213,7 +214,7 @@
defaultUser = {
...WeChatInfo,
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,
+ icon: nickNameData && JSON.parse(nickNameData.data).icon != "" ? JSON.parse(nickNameData.data).icon : WeChatInfo.icon,
userId: res.userId,
userType: type,
role: 'Student',
@@ -221,6 +222,17 @@
this.setData({
currAuthStep: 3,
});
+ } else if (secretData) {
+ defaultUser = {
+ 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,
+ }
+ this.setData({
+ currAuthStep: 3,
+ });
}
this.setData({
userInfo: defaultUser
--
Gitblit v1.9.1