From 9f916f98c6cc6827c84da18fbc9a5e2cacbefc0a Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期二, 02 四月 2024 16:20:08 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
packageDomain/pages/teacherCertification/index.js | 46 ++++++++++++++++++++++++++++++++--------------
1 files changed, 32 insertions(+), 14 deletions(-)
diff --git a/packageDomain/pages/teacherCertification/index.js b/packageDomain/pages/teacherCertification/index.js
index afaf20a..28fa09f 100644
--- a/packageDomain/pages/teacherCertification/index.js
+++ b/packageDomain/pages/teacherCertification/index.js
@@ -112,7 +112,7 @@
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,
+ icon: nickNameData && JSON.parse(nickNameData.data).icon != "" ? JSON.parse(nickNameData.data).icon : WeChatInfo.icon,
userId: res.userId,
role: 'Teacher',
roleId: teacherRole.role.id,
@@ -122,7 +122,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,
}
}
@@ -326,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,
});
}
},
@@ -339,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,
});
}
},
@@ -351,11 +363,17 @@
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,
});
}
},
--
Gitblit v1.9.1