From a6e9a6511aa289ea16da6623d63bef133906c2e1 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期四, 28 三月 2024 14:20:44 +0800
Subject: [PATCH] geren
---
packageDomain/pages/teacherCertification/index.js | 3 ---
pages/personalCenter/index.js | 38 ++++++++++++++++++--------------------
2 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/packageDomain/pages/teacherCertification/index.js b/packageDomain/pages/teacherCertification/index.js
index 4079d7d..fecb15f 100644
--- a/packageDomain/pages/teacherCertification/index.js
+++ b/packageDomain/pages/teacherCertification/index.js
@@ -54,9 +54,6 @@
//鑾峰彇鑱岀О
this.getpositionalTitle();
this.getAgreement();
- if (wx.getStorageSync(app.config.tokenKey)) {
- this.getUserRole()
- }
// 妫�鏌ョ櫥褰曠姸鎬�
const token = wx.getStorageSync(app.config.tokenKey)
if (!token) {
diff --git a/pages/personalCenter/index.js b/pages/personalCenter/index.js
index a6682bd..0d20c2e 100644
--- a/pages/personalCenter/index.js
+++ b/pages/personalCenter/index.js
@@ -1,4 +1,7 @@
-const app = getApp()
+const app = getApp();
+import {
+ loginInfo
+} from '../../assets/js/login';
const menuData = [{
title: '鎴戠殑璁㈠崟',
icon: '/static/images/personal/order.png',
@@ -132,18 +135,22 @@
barHeight: systInfo.statusBarHeight,
navBarHeight: navBarHeight,
});
- if (wx.getStorageSync(app.config.tokenKey)) {
- this.setData({
- currAuthStep: 2,
- });
- this.getUserInfo()
+ // 妫�鏌ョ櫥褰曠姸鎬�
+ 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,
});
- wx.navigateTo({
- url: "/pages/testLogin/index",
- });
+ this.getUserInfo()
}
},
onShow() {
@@ -180,18 +187,17 @@
});
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,
+ nickName: teacherInfos.name,
icon: nickNameData ? JSON.parse(nickNameData.data).icon : WeChatInfo ? WeChatInfo.icon : '',
userId: res.userId,
role: 'Teacher',
@@ -214,14 +220,6 @@
this.setData({
currAuthStep: 3,
});
- } else if (secretData) {
- defaultUser = {
- nickName: nickNameData ? JSON.parse(nickNameData.data).nickName : secretData.credential,
- icon: nickNameData ? JSON.parse(nickNameData.data).icon : "",
- userId: res.userId,
- userType: type,
- role: 'Student',
- }
}
this.setData({
userInfo: defaultUser
--
Gitblit v1.9.1