From 7ff70bc7c9460c395b59952d55df6e5d6a12a718 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 15 二月 2023 16:27:32 +0800
Subject: [PATCH] Merge branch 'Dev-Wxr'

---
 HDL_ON/UI/UI2/4-PersonalCenter/CancelAccountPage.cs |   20 ++++----------------
 1 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/CancelAccountPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/CancelAccountPage.cs
index c64c35c..d50a49e 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/CancelAccountPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/CancelAccountPage.cs
@@ -135,8 +135,9 @@
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextSize = CSS_FontSize.TextFontSize,
                 PlaceholderTextColor = CSS_Color.PromptingColor1,
-                PlaceholderText = Language.StringByID(StringId.PlsEntryPhoneNumber),
+                PlaceholderText = UserInfo.Current.AccountString,// Language.StringByID(StringId.PlsEntryPhoneNumber),
                 TextAlignment = TextAlignment.CenterLeft,
+                Enable = false
             };
             accountView.AddChidren(etAccount);
 
@@ -196,7 +197,7 @@
             var btnLogin = new Button()
             {
                 Gravity = Gravity.CenterHorizontal,
-                Y = Application.GetRealHeight(403),
+                Y = Application.GetRealHeight(353),
                 Width = Application.GetRealWidth(220),
                 Height = Application.GetRealWidth(44),
                 Radius = (uint)Application.GetRealWidth(22),
@@ -209,22 +210,9 @@
             };
             bodyView.AddChidren(btnLogin);
 
-            string account = "";
-            etAccount.TextChangeEventHandler = (sender, e) =>
-            {
-                account = etAccount.Text.Trim();
-                if (account.Length > 0 && etPassword.Text.Trim().Length > 0)
-                {
-                    btnLogin.IsSelected = true;
-                }
-                else
-                {
-                    btnLogin.IsSelected = false;
-                }
-            };
             etPassword.TextChangeEventHandler += (sender, e) =>
             {
-                if (etAccount.Text.Trim().Length > 0 && etPassword.Text.Trim().Length > 0)
+                if ( etPassword.Text.Trim().Length > 0)
                 {
                     btnLogin.IsSelected = true;
                 }

--
Gitblit v1.8.0