From ed3bfb7462d44747230437717e8673a5192f833f Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 20:34:51 +0800
Subject: [PATCH] 2020-11-30-2

---
 HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
index 91a039c..5f5ff8a 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
@@ -54,7 +54,7 @@
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextSize = CSS_FontSize.TextFontSize,
-                Text = memberInfo.nickName + "(" + memberInfo.Account + ")",
+                Text = memberInfo.Nickname + "(" + memberInfo.UserName + ")",
             };
             headPortraitView.AddChidren(btnMemberName);
 
@@ -136,7 +136,7 @@
                 int addCount = 0;
                 foreach (var sd in memberInfo.CurResidenceShareDate)
                 {
-                    if (room.GetRoomFunctions(false).Find((obj) => obj.sid == sd.fileName) != null)
+                    if (room.GetRoomFunctions(false).Find((obj) => obj.sid == sd.ShareName) != null)
                     {
                         addCount++;
                     }
@@ -145,7 +145,7 @@
                 for(int i= 0;i< memberInfo.CurResidenceShareDate.Count;)
                 {
                     var sd = memberInfo.CurResidenceShareDate[i];
-                    if (DB_ResidenceData.functionList.GetAllFunction().Find((obj) => obj.sid == sd.fileName) == null)
+                    if (DB_ResidenceData.functionList.GetAllFunction().Find((obj) => obj.sid == sd.ShareName) == null)
                     {
                         new DAL.Server.HttpServerRequest().DeleteShareData(sd);
                         memberInfo.CurResidenceShareDate.Remove(sd);
@@ -226,8 +226,7 @@
             btnDelMember = new Button()
             {
                 Y = Application.GetRealHeight(617),
-                //Height = MainPage.Increase ? Application.GetRealHeight(70) : Application.GetRealHeight(50),
-                Height = Application.GetRealHeight(50),
+                Height = MainPage.Increase ? Application.GetRealHeight(70) : Application.GetRealHeight(50),
                 TextAlignment = TextAlignment.Center,
                 TextSize = CSS_FontSize.SubheadingFontSize,
                 TextColor = CSS_Color.WarningColor,

--
Gitblit v1.8.0