From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1

---
 HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs
old mode 100755
new mode 100644
index 1c7dcff..e659d9c
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs
@@ -90,12 +90,10 @@
                         //璁剧疆鐢ㄦ埛鏄电О
                         if (string.IsNullOrEmpty(mInfo.nickName))
                         {
-                            mInfo.nickName = mInfo.UserName;
+                            mInfo.nickName = mInfo.memberName;
                         }
                         //璁剧疆鐢ㄦ埛澶村儚璺緞
                         CheckIfDownloadHeadImage(mInfo);
-
-
                     }
                     catch (Exception ex)
                     {
@@ -118,6 +116,7 @@
             Application.RunOnMainThread(() =>
             {
                 waitPage?.Hide();
+                waitPage?.RemoveFromParent();
             });
             return result;
         }
@@ -218,7 +217,7 @@
                     })
                     { IsBackground = true }.Start();
                 };
-                new PublicAssmebly().LoadDialog_EditParater(StringId.ModifyMemberNickname, mInfo.nickName, callBack, StringId.HouseNameCannotBeEmpty, 0, new List<string>());
+                new PublicAssmebly().LoadDialog_EditParater(StringId.ModifyMemberNickname, mInfo.nickName, callBack, StringId.NicknameCannotBeEmpty, 0, new List<string>());
             };
             btn1.MouseUpEventHandler = eventHandler;
             btn2.MouseUpEventHandler = eventHandler;

--
Gitblit v1.8.0