From a715181089be0d31cd737a5367ffd02690b9d77f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 12 十一月 2020 13:36:01 +0800
Subject: [PATCH] 20201112

---
 HDL_ON/UI/UI1-Login/RegisterPageBLL.cs |   60 ++++++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs b/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
index c1a2485..d997321 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;
@@ -153,7 +157,7 @@
                                 btnGetVerificationCode_Phone.IsSelected = false;
                                 new Tip()
                                 {
-                                    CloseTime = 3,
+                                    CloseTime = 1,
                                     Text = Language.StringByID(StringId.PlsEntryCorrectMobilNeumber),
                                     Direction = AMPopTipDirection.None,
                                 }.Show(bodyView);
@@ -185,7 +189,7 @@
                                 btnGetVerificationCode_Mail.IsSelected = false;
                                 new Tip()
                                 {
-                                    CloseTime = 3,
+                                    CloseTime = 1,
                                     Text = Language.StringByID(StringId.PlsEntryCorrectEmailAddress),
                                     Direction = AMPopTipDirection.None,
                                 }.Show(bodyView);
@@ -204,6 +208,14 @@
                             }
                         }
                     }
+                    if(accountType ==0)
+                    {
+                        registerPhone = etAccount.Text.Trim();
+                    }
+                    else
+                    {
+                        registerEmail = etAccount.Text.Trim();
+                    }
                 }
             };
 
@@ -218,7 +230,11 @@
                 else
                 {
                     if (etPassword.Text.Length == 0)
+                    {
+                        btnPasswordViewBottomLine.BackgroundColor = CSS_Color.DividingLineColor;
+                        btnPasswordViewBottomLine.Height = Application.GetRealHeight(1);
                         return;
+                    }
                     //闇�瑕佽緭鍏�6浣嶄互涓婄殑瀵嗙爜
                     if (etPassword.Text.Length < 6 || etPassword.Text.Length > 13)
                     {
@@ -227,7 +243,7 @@
 
                         new Tip()
                         {
-                            CloseTime = 3,
+                            CloseTime = 1,
                             Direction = AMPopTipDirection.None,
                             Text = Language.StringByID(StringId.PlsRegisterPassword)
                         }.Show(bodyView);
@@ -250,8 +266,6 @@
                 }
                 else
                 {
-                    if (etRepeatPassword.Text.Length == 0)
-                        return;
                     btnRepeatPasswordViewBottomLine.BackgroundColor = CSS_Color.DividingLineColor;
                     btnRepeatPasswordViewBottomLine.Height = Application.GetRealHeight(1);
                     //鏍¢獙涓ゆ杈撳叆鐨勫瘑鐮佹槸鍚︿竴鑷�
@@ -263,7 +277,7 @@
                             btnRepeatPasswordViewBottomLine.Height = Application.GetRealHeight(2);
                             new Tip()
                             {
-                                CloseTime = 3,
+                                CloseTime = 1,
                                 Direction = AMPopTipDirection.None,
                                 Text = Language.StringByID(StringId.IncorrectRepeatPassword)
                             }.Show(bodyView);
@@ -391,7 +405,7 @@
                            switch (result.StateCode)
                            {
                                case "Exist":
-                                   tipString = Language.StringByID(StringId.AccountAlreadyExists);
+                                   tipString = Language.StringByID(StringId.AccountAlreadyUse);
                                    break;
                                case "SendFail":
                                    tipString = Language.StringByID(StringId.FailedToSendVerificationCode);
@@ -410,7 +424,7 @@
                            {
                                new Tip()
                                {
-                                   CloseTime = 3,
+                                   CloseTime = 1,
                                    Direction = AMPopTipDirection.None,
                                    Text = tipString
                                }.Show(bodyView);
@@ -432,6 +446,16 @@
         {
             btnRegister.MouseUpEventHandler = (sender, e) =>
             {
+                if(etPassword.Text.Trim().Length > 13 || etPassword.Text.Trim().Length<6)
+                {
+                    new Tip()
+                    {
+                        CloseTime = 1,
+                        Direction = AMPopTipDirection.None,
+                        Text = Language.StringByID(StringId.PlsRegisterPassword)
+                    }.Show(bodyView);
+                    return;
+                }
                 if (btnRegister.IsSelected)
                 {
                     waitPage = new Loading();
@@ -473,7 +497,7 @@
                         switch (validateSmsResult.StateCode)
                         {
                             case "Exist":
-                                erorrInfo = Language.StringByID(StringId.AccountAlreadyExists);
+                                erorrInfo = Language.StringByID(StringId.AccountAlreadyUse);
                                 break;
                             case "PwdNoConfirm":
                                 erorrInfo = Language.StringByID(StringId.IncorrectRepeatPassword);
@@ -497,7 +521,7 @@
                         {
                             new Tip()
                             {
-                                CloseTime = 3,
+                                CloseTime = 1,
                                 Direction = AMPopTipDirection.None,
                                 Text = erorrInfo,
                             }.Show(bodyView);

--
Gitblit v1.8.0