From be4212081285227ee0f5eb080c2d4098a82c2ab9 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期四, 11 四月 2024 15:49:01 +0800
Subject: [PATCH] 样式，骨架屏

---
 packagePersonal/pages/userSetting/index.js |   86 ++++++++++++++++++++++++++++++++++++-------
 1 files changed, 72 insertions(+), 14 deletions(-)

diff --git a/packagePersonal/pages/userSetting/index.js b/packagePersonal/pages/userSetting/index.js
index 1fcc0ea..9752870 100644
--- a/packagePersonal/pages/userSetting/index.js
+++ b/packagePersonal/pages/userSetting/index.js
@@ -64,8 +64,8 @@
         if (teacherRole && teacherInfos) {
           defaultUser = {
             ...teacherInfos,
-            nickName: nickNameData ? JSON.parse(nickNameData.data).nickName : teacherInfos.name,
-            icon: nickNameData ? JSON.parse(nickNameData.data).icon : WeChatInfo.icon,
+            nickName: nickNameData ? JSON.parse(nickNameData.data).nickName : WeChatInfo ? WeChatInfo.name : '',
+            icon: nickNameData ? JSON.parse(nickNameData.data).icon : WeChatInfo ? WeChatInfo.icon : '',
             userId: res.userId,
             role: 'Teacher',
             roleId: teacherRole.role.id,
@@ -207,11 +207,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,
+          "userInfoForm.phone": e.detail.value,
+        });
+      }
+    } else {
       this.setData({
-        phoneError: !isPhoneNumber,
-        "userInfoForm.phone": e.detail.value,
+        phoneError: false,
       });
     }
   },
@@ -220,11 +226,19 @@
     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,
+        });
+      }
       this.setData({
-        emailError: !isPhoneNumber,
         "userInfoForm.email": e.detail.value,
+      });
+    } else {
+      this.setData({
+        emailError: false,
       });
     }
   },
@@ -287,14 +301,14 @@
   getSecond(time) {
     let timer = null
     if (!timer) {
-      let countDown = time;
       this.setData({
         countDown: time,
       });
+      let conut = this.data.countDown;
       timer = setInterval(() => {
-        countDown--
+        conut--
         this.setData({
-          countDown: countDown,
+          countDown: conut,
         });
         if (this.data.countDow == 0) {
           clearInterval(timer)
@@ -319,8 +333,6 @@
               icon: 'none',
               duration: 1000
             })
-            // 寮�鍚煭淇￠獙璇佸�掕鏃�
-            this.getSecond(60)
           } else {
             wx.showToast({
               title: '閭楠岃瘉鐮佸彂閫佸け璐�',
@@ -341,6 +353,14 @@
 
   confirmInfo() {
     if (this.data.editType == 'nickName') {
+      if (!this.data.userInfoForm.nickName) {
+        wx.showToast({
+          title: '璇疯緭鍏ユ樀绉�',
+          icon: 'none',
+          duration: 1000
+        })
+        return false;
+      }
       let userTypeInfo = {
         "requests": [{
           data: JSON.stringify({
@@ -366,6 +386,22 @@
       })
 
     } else if (this.data.editType == 'phone') {
+      if (!this.data.userInfoForm.phone) {
+        wx.showToast({
+          title: '璇疯緭鍏ユ墜鏈哄彿',
+          icon: 'none',
+          duration: 1000
+        })
+        return false;
+      }
+      if (!this.data.userInfoForm.code) {
+        wx.showToast({
+          title: '璇疯緭鍏ラ獙璇佺爜',
+          icon: 'none',
+          duration: 1000
+        })
+        return false;
+      }
       let query = {
         phoneNumber: this.data.userInfoForm.phone,
         phoneCaptcha: this.data.userInfoForm.code
@@ -377,12 +413,18 @@
             icon: 'none',
             duration: 1000
           })
+          this.setData({
+            countDown: 0,
+          });
         } else if (res == '姝ゆ墜鏈哄彿鐮佸凡琚叾瀹冭处鍙风粦瀹�') {
           wx.showToast({
             title: res + ',璇锋洿鎹㈠叾浠栨墜鏈哄彿銆�',
             icon: 'none',
             duration: 1000
           })
+          this.setData({
+            countDown: 0,
+          });
         } else {
           wx.showToast({
             title: res,
@@ -397,6 +439,22 @@
         }
       })
     } else if (this.data.editType == 'email') {
+      if (!this.data.userInfoForm.email) {
+        wx.showToast({
+          title: '璇疯緭鍏ラ偖绠�',
+          icon: 'none',
+          duration: 1000
+        })
+        return false;
+      }
+      if (!this.data.userInfoForm.code) {
+        wx.showToast({
+          title: '璇疯緭鍏ラ獙璇佺爜',
+          icon: 'none',
+          duration: 1000
+        })
+        return false;
+      }
       let query = {
         eMail: this.data.userInfoForm.email,
         captcha: this.data.userInfoForm.code

--
Gitblit v1.9.1