From 9b87c4bb4224496c33e8a31ff80de0b43023dec5 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Wed, 1 Nov 2023 09:52:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E5=A1=AB?=
 =?UTF-8?q?=E5=86=99=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/user-base/user-base.vue | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/components/user-base/user-base.vue b/components/user-base/user-base.vue
index 75412a9c..bff8b175 100644
--- a/components/user-base/user-base.vue
+++ b/components/user-base/user-base.vue
@@ -103,7 +103,7 @@
                         user.avatar = '';
                     }
                     // 状态
-                    var status = user == null ? false : (user.avatar || null) == null || (user.nickname || null) == null ? true : false;
+                    var status = user == null ? false : ((user.avatar || null) == null || (user.nickname || null) == null ? true : false);
                     // 间隔时间
                     var cache_time = parseInt(uni.getStorageSync(this.cache_key) || 0);
                     var current_time = Date.parse(new Date()) / 1000;
@@ -162,13 +162,8 @@
                             if (data.code == 0) {
                                 self.setData({
                                     user_avatar: data.data,
+                                    form_submit_disabled_status: ((self.user.nickname || null) == null && (self.nickname || null) == null)
                                 });
-                                console.log('nickname2', self.nickname);
-                                if (self.nickname) {
-                                    self.setData({
-                                        form_submit_disabled_status: false,
-                                    });
-                                }
                             } else {
                                 app.globalData.showToast(data.msg);
                             }
@@ -191,12 +186,16 @@
                         fields: 'avatar',
                         msg: '请上传头像',
                     });
+                } else {
+                    delete form_data['avatar'];
                 }
                 if ((this.user.nickname || null) == null) {
                     validation.push({
                         fields: 'nickname',
                         msg: '请填写昵称',
                     });
+                } else {
+                    delete form_data['nickname'];
                 }
                 if (app.globalData.fields_check(e.detail.value, validation)) {
                     // 数据保存
@@ -233,21 +232,16 @@
             },
             // 输入框值监听
             on_input_name(event) {
-                if (event.detail.value) {
+                if (event.detail.value != '') {
                     this.setData({
                         nickname: event.detail.value,
+                        form_submit_disabled_status: ((this.user.avatar || null) == null && (this.user_avatar || null) == null)
+                    });
+                } else {
+                    this.setData({
+                        form_submit_disabled_status: true,
                     });
-                    console.log('nickname', this.nickname);
-                    if (this.user_avatar) {
-                        this.setData({
-                            form_submit_disabled_status: false,
-                        });
-                        return;
-                    }
                 }
-                this.setData({
-                    form_submit_disabled_status: true,
-                });
             },
         },
     };