From 3d73fb33c46aada16a6060adcd4ea14bb33b6b2a Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期二, 09 四月 2024 10:39:11 +0800
Subject: [PATCH] 详情页tabs样式优化，答题添加页面退出拦截，合并代码
---
packageDomain/pages/teacherCertification/index.js | 104 +++++++++++++++++++++++++++++++++------------------
1 files changed, 67 insertions(+), 37 deletions(-)
diff --git a/packageDomain/pages/teacherCertification/index.js b/packageDomain/pages/teacherCertification/index.js
index 4079d7d..54a37ef 100644
--- a/packageDomain/pages/teacherCertification/index.js
+++ b/packageDomain/pages/teacherCertification/index.js
@@ -45,6 +45,7 @@
editState: true,
reasonTxt: "",
reasonTxtShow: false,
+ skeletonLoding: true,
},
/**
@@ -54,9 +55,6 @@
//鑾峰彇鑱岀О
this.getpositionalTitle();
this.getAgreement();
- if (wx.getStorageSync(app.config.tokenKey)) {
- this.getUserRole()
- }
// 妫�鏌ョ櫥褰曠姸鎬�
const token = wx.getStorageSync(app.config.tokenKey)
if (!token) {
@@ -102,7 +100,8 @@
if (res) {
this.getType()
this.setData({
- userId: res.userId
+ userId: res.userId,
+ skeletonLoding: true,
})
let nickNameData = res.infoList.find((item) => item.type == 'nickName')
let teacherRole = res.roleLinks.find((item) => item.role.refCode == 'teacher')
@@ -112,8 +111,8 @@
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,
@@ -122,11 +121,10 @@
} 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,
}
-
}
wx.setStorageSync(app.config.userInfoKey, JSON.stringify(defaultUser));
}
@@ -137,15 +135,16 @@
app.MG.resource.getCmsTypeByRefCode({
refCodes: ['jsek_teacherCertification']
}).then((res) => {
- console.log(res)
this.setData({
worksInfo: res[0].cmsTypeLinks[0].children,
})
this.newGetTeacherInfo()
})
+
},
//鑾峰彇鏁欏笀鐘舵��
newGetTeacherInfo() {
+ let that = this;
const data = {
start: 0,
size: 10,
@@ -158,22 +157,22 @@
}
app.MG.ugc.getTopicMessageList(data).then((res) => {
try {
- this.setData({
+ that.setData({
imgPics: [],
})
- const resData = res.datas.find((i) => i.appUserCreator.userId === this.data.userId)
+ const resData = res.datas.find((i) => i.appUserCreator.userId === that.data.userId)
if (resData) {
if (resData.state == 'WaitAudit') {
- this.setData({
+ that.setData({
editState: false,
})
} else {
- this.setData({
+ that.setData({
editState: true,
})
}
- let info = getTopicMsgCmsItemFile(this.data.worksInfo, resData.cmsItemDataList)
- this.setData({
+ let info = getTopicMsgCmsItemFile(that.data.worksInfo, resData.cmsItemDataList)
+ that.setData({
'teacherInfo.fullName': info.fullName,
'teacherInfo.schoolName': info.schoolName,
'teacherInfo.positionalTitle': info.positionalTitle,
@@ -188,16 +187,17 @@
topicId: resData.id,
topicMessageList: resData.cmsItemDataList,
teachText: info.positionalTitle,
+ skeletonLoding: false,
})
if (resData.feedBack != null) {
- this.setData({
+ that.setData({
reasonTxt: JSON.parse(resData.feedBack).reason,
})
}
- if (this.data.teacherInfo.relevantCertificates.length > 0) {
+ if (that.data.teacherInfo.relevantCertificates.length > 0) {
let arr = [];
- if (typeof this.data.teacherInfo.relevantCertificates == 'object') {
- this.data.teacherInfo.relevantCertificates.forEach((ele) => {
+ if (typeof that.data.teacherInfo.relevantCertificates == 'object') {
+ that.data.teacherInfo.relevantCertificates.forEach((ele) => {
let imgObj = {
md5: ele.file.md5,
linkType: 'LinkFile',
@@ -206,25 +206,29 @@
imgUrl: ele.file.imgUrl
}
arr.push(imgObj);
- this.setData({
+ that.setData({
imgPics: arr,
});
})
} else {
let imgObj = {
- md5: this.data.teacherInfo.relevantCertificates,
+ md5: that.data.teacherInfo.relevantCertificates,
linkType: 'LinkFile',
linkProtectType: 'Public',
- url: app.config.requestCtx + `/file/GetPreViewImage?md5=` + this.data.teacherInfo.relevantCertificates,
- imgUrl: app.config.requestCtx + `/file/GetPreViewImage?md5=` + this.data.teacherInfo.relevantCertificates,
+ url: app.config.requestCtx + `/file/GetPreViewImage?md5=` + that.data.teacherInfo.relevantCertificates,
+ imgUrl: app.config.requestCtx + `/file/GetPreViewImage?md5=` + that.data.teacherInfo.relevantCertificates,
}
arr.push(imgObj);
- this.setData({
+ that.setData({
imgPics: arr,
});
}
}
+ } else {
+ that.setData({
+ skeletonLoding: false,
+ });
}
} catch (error) {}
})
@@ -322,11 +326,17 @@
const {
phoneError
} = this.data;
- const isPhoneNumber = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(e.detail.value);
- if (phoneError === isPhoneNumber) {
+ if (e.detail.value) {
+ const isPhoneNumber = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(e.detail.value);
+ if (phoneError === isPhoneNumber) {
+ this.setData({
+ phoneError: !isPhoneNumber,
+ "teacherInfo.phone": e.detail.value,
+ });
+ }
+ } else {
this.setData({
- phoneError: !isPhoneNumber,
- "teacherInfo.phone": e.detail.value,
+ phoneError: false,
});
}
},
@@ -335,11 +345,17 @@
const {
telphoneError
} = this.data;
- const isPhoneNumber = /^0\d{2}-\d{8}$|^0\d{3}-\d{7}$/.test(e.detail.value);
- if (telphoneError === isPhoneNumber) {
+ if (e.detail.value) {
+ const isPhoneNumber = /^0\d{2}-\d{8}$|^0\d{3}-\d{7}$/.test(e.detail.value);
+ if (telphoneError === isPhoneNumber) {
+ this.setData({
+ telphoneError: !isPhoneNumber,
+ "teacherInfo.telphone": e.detail.value,
+ });
+ }
+ } else {
this.setData({
- telphoneError: !isPhoneNumber,
- "teacherInfo.telphone": e.detail.value,
+ telphoneError: false,
});
}
},
@@ -347,17 +363,31 @@
const {
emailError
} = this.data;
- const isPhoneNumber = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/.test(e.detail.value);
- if (emailError === isPhoneNumber) {
+ if (e.detail.value) {
+ const isPhoneNumber = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/.test(e.detail.value);
+ if (emailError === isPhoneNumber) {
+ this.setData({
+ emailError: !isPhoneNumber,
+ "teacherInfo.email": e.detail.value,
+ });
+ }
+ } else {
this.setData({
- emailError: !isPhoneNumber,
- "teacherInfo.email": e.detail.value,
+ emailError: false,
});
}
},
// 涓婁紶鍥剧墖浜嬩欢
chooseImg(e) {
var that = this;
+ if (that.data.imgPics.length == 4) {
+ wx.showToast({
+ title: "宸ヤ綔璇佹枃浠朵笉瓒呰繃5涓紒",
+ icon: 'none',
+ duration: 1000,
+ })
+ return
+ }
wx.chooseMedia({
count: 1,
sizeType: ['original', 'compressed'], // 鍙互鎸囧畾鏄師鍥捐繕鏄帇缂╁浘锛岄粯璁や簩鑰呴兘鏈�
--
Gitblit v1.9.1