From db7fdd2cd77a20876d534ae020477b39b5f74faa Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期三, 17 四月 2024 18:33:28 +0800
Subject: [PATCH] 字

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

diff --git a/packagePersonal/pages/userSetting/index.js b/packagePersonal/pages/userSetting/index.js
index 5a6bcc3..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
@@ -107,7 +117,7 @@
         editType: info,
         "userInfoForm.captcha": "",
         "userInfoForm.code": "",
-        "userInfoForm.nickName": ''
+        "userInfoForm.nickName": this.data.userInfo.nickName,
       });
     }
     this.getImgCapcha()
@@ -301,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)
@@ -413,18 +423,12 @@
             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,

--
Gitblit v1.9.1