From 4bc1c36faeec2f90e5acfa836732e49fe0b245e9 Mon Sep 17 00:00:00 2001
From: yiming <m13691596795@163.com>
Date: 星期五, 12 四月 2024 20:47:03 +0800
Subject: [PATCH] 云学习11

---
 packagePersonal/pages/userSetting/index.js |   73 ++++++++++++++++++++++++++++++------
 1 files changed, 61 insertions(+), 12 deletions(-)

diff --git a/packagePersonal/pages/userSetting/index.js b/packagePersonal/pages/userSetting/index.js
index 6e9de7b..33ac09a 100644
--- a/packagePersonal/pages/userSetting/index.js
+++ b/packagePersonal/pages/userSetting/index.js
@@ -10,7 +10,7 @@
   data: {
     userInfo: {},
     defaultAvatarUrl: 'https://cdn-we-retail.ym.tencent.com/miniapp/usercenter/icon-user-center-avatar@2x.png',
-    userInfoBox: false,
+
     editType: '',
     userInfoForm: {
       icon: '',
@@ -24,6 +24,8 @@
     emailError: false,
     imgCode: '',
     countDown: 0,
+    userInfoBox: false,
+    height: '', //灞忓箷楂樺害
   },
 
   /**
@@ -46,7 +48,15 @@
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
    */
   onShow() {
-
+    var that = this;
+    // 鍔ㄦ�佽幏鍙栧睆骞曢珮搴�
+    wx.getSystemInfo({
+      success: (result) => {
+        that.setData({
+          height: result.windowHeight
+        });
+      },
+    })
   },
   // 鑾峰彇鐧诲綍鐢ㄦ埛韬唤
   getUserInfo() {
@@ -75,8 +85,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
@@ -90,7 +100,6 @@
             Email: emailInfo?.credential
           }
         }
-
         this.setData({
           userInfo: defaultUser
         })
@@ -108,7 +117,7 @@
         editType: info,
         "userInfoForm.captcha": "",
         "userInfoForm.code": "",
-        "userInfoForm.nickName": ''
+        "userInfoForm.nickName": this.data.userInfo.nickName,
       });
     }
     this.getImgCapcha()
@@ -232,9 +241,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,
@@ -300,14 +311,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)
@@ -332,8 +343,6 @@
               icon: 'none',
               duration: 1000
             })
-            // 寮�鍚煭淇¢獙璇佸�掕鏃�
-            this.getSecond(60)
           } else {
             wx.showToast({
               title: '閭楠岃瘉鐮佸彂閫佸け璐�',
@@ -354,6 +363,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({
@@ -379,6 +396,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
@@ -410,6 +443,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