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 |   65 ++++++++++++++++++++++++--------
 1 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/packageDomain/pages/teacherCertification/index.js b/packageDomain/pages/teacherCertification/index.js
index 9ed9576..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,
   },
 
   /**
@@ -99,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')
@@ -109,8 +111,8 @@
         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,
@@ -120,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,
           }
         }
@@ -185,6 +187,7 @@
             topicId: resData.id,
             topicMessageList: resData.cmsItemDataList,
             teachText: info.positionalTitle,
+            skeletonLoding: false,
           })
           if (resData.feedBack != null) {
             that.setData({
@@ -222,6 +225,10 @@
             }
           }
 
+        } else {
+          that.setData({
+            skeletonLoding: false,
+          });
         }
       } catch (error) {}
     })
@@ -319,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,
       });
     }
   },
@@ -332,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,
       });
     }
   },
@@ -344,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