From e322d91c7325019710bfdb046c5fea673031455a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 29 七月 2020 11:53:01 +0800
Subject: [PATCH] 20200729

---
 HDL_ON/UI/UI1-Login/RegisterPageBLL.cs |   46 ++++++++++++++++++++++++++++++++--------------
 1 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs b/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
index f75b0ad..a5a1bc7 100644
--- a/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
@@ -68,10 +68,13 @@
             //閫夋嫨鎵嬫満娉ㄥ唽
             btnPhoneLogin.MouseUpEventHandler = (sender, e) =>
             {
-#if DEBUG
-                etAccount.Text = "17576024298";
-#endif
-
+                if(registerType == 0)
+                {
+                    return;
+                }
+                etAccount.Text = registerPhone;
+                etPassword.Text = "";
+                etRepeatPassword.Text = "";
                 #region 鍒囨崲閫変腑鎸夐挳
                 btnGetVerificationCode_Mail.Visible = false;
                 btnGetVerificationCode_Phone.Visible = true;
@@ -95,10 +98,11 @@
             //閫夋嫨閭娉ㄥ唽
             btnEmailLogin.MouseUpEventHandler = (sender, e) =>
             {
-
-#if DEBUG
-                etAccount.Text = "979412578@qq.com";
-#endif
+                if (registerType == 1)
+                    return;
+                etAccount.Text = registerEmail;
+                etPassword.Text = "";
+                etRepeatPassword.Text = "";
                 #region 鍒囨崲閫変腑鎸夐挳
                 btnGetVerificationCode_Mail.Visible = true;
                 btnGetVerificationCode_Phone.Visible = false;
@@ -204,6 +208,14 @@
                             }
                         }
                     }
+                    if(accountType ==0)
+                    {
+                        registerPhone = etAccount.Text.Trim();
+                    }
+                    else
+                    {
+                        registerEmail = etAccount.Text.Trim();
+                    }
                 }
             };
 
@@ -254,12 +266,8 @@
                 }
                 else
                 {
-                    if (etRepeatPassword.Text.Length == 0)
-                    {
-                        btnRepeatPasswordViewBottomLine.BackgroundColor = CSS_Color.DividingLineColor;
-                        btnRepeatPasswordViewBottomLine.Height = Application.GetRealHeight(1);
-                        return;
-                    }
+                    btnRepeatPasswordViewBottomLine.BackgroundColor = CSS_Color.DividingLineColor;
+                    btnRepeatPasswordViewBottomLine.Height = Application.GetRealHeight(1);
                     //鏍¢獙涓ゆ杈撳叆鐨勫瘑鐮佹槸鍚︿竴鑷�
                     if (etPassword.Text.Trim().Length > 5)
                     {
@@ -438,6 +446,16 @@
         {
             btnRegister.MouseUpEventHandler = (sender, e) =>
             {
+                if(etPassword.Text.Trim().Length > 13 || etPassword.Text.Trim().Length<6)
+                {
+                    new Tip()
+                    {
+                        CloseTime = 3,
+                        Direction = AMPopTipDirection.None,
+                        Text = Language.StringByID(StringId.PlsRegisterPassword)
+                    }.Show(bodyView);
+                    return;
+                }
                 if (btnRegister.IsSelected)
                 {
                     waitPage = new Loading();

--
Gitblit v1.8.0