From f00c1cca98455a036548672d28e7e8ad13729a21 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期四, 11 四月 2024 21:57:27 +0800
Subject: [PATCH] 问题修改

---
 packagePersonal/pages/userSetting/index.js |   62 +++++++++++++++++++++++++++----
 1 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/packagePersonal/pages/userSetting/index.js b/packagePersonal/pages/userSetting/index.js
index fee72d8..c09c9fa 100644
--- a/packagePersonal/pages/userSetting/index.js
+++ b/packagePersonal/pages/userSetting/index.js
@@ -75,8 +75,8 @@
         } else if (WeChatInfo) {
           defaultUser = {
             ...WeChatInfo,
-            nickName: nickNameData ? JSON.parse(nickNameData.data).nickName : WeChatInfo.name,
-            icon: 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.name,
+            icon: nickNameData && JSON.parse(nickNameData.data).icon ? JSON.parse(nickNameData.data).icon : WeChatInfo.icon,
             userId: res.userId,
             phoneNumber: phoneInfo?.credential,
             Email: emailInfo?.credential
@@ -231,9 +231,11 @@
       if (emailError === isPhoneNumber) {
         this.setData({
           emailError: !isPhoneNumber,
-          "userInfoForm.email": e.detail.value,
         });
       }
+      this.setData({
+        "userInfoForm.email": e.detail.value,
+      });
     } else {
       this.setData({
         emailError: false,
@@ -299,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)
@@ -331,8 +333,6 @@
               icon: 'none',
               duration: 1000
             })
-            // 寮�鍚煭淇￠獙璇佸�掕鏃�
-            this.getSecond(60)
           } else {
             wx.showToast({
               title: '閭楠岃瘉鐮佸彂閫佸け璐�',
@@ -353,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({
@@ -378,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
@@ -389,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,
@@ -409,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