From 2bec9c838d2d688025698de8ec1de401ffd7dd1f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 11 八月 2020 14:13:55 +0800
Subject: [PATCH] 20200811

---
 HDL_ON/UI/UI1-Login/RegisterPage.cs |   31 ++++++++++++++++++++++++++-----
 1 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/HDL_ON/UI/UI1-Login/RegisterPage.cs b/HDL_ON/UI/UI1-Login/RegisterPage.cs
index a8bd49a..1192e72 100644
--- a/HDL_ON/UI/UI1-Login/RegisterPage.cs
+++ b/HDL_ON/UI/UI1-Login/RegisterPage.cs
@@ -119,7 +119,11 @@
         /// <summary>
         /// 鑾峰彇楠岃瘉鐮佹寜閽�
         /// </summary>
-        Button btnGetVerificationCode;
+        Button btnGetVerificationCode_Phone;
+        /// <summary>
+        /// 鑾峰彇楠岃瘉鐮佹寜閽�
+        /// </summary>
+        Button btnGetVerificationCode_Mail;
         /// <summary>
         /// 楠岃瘉鐮佸瓙鍖哄煙搴曢儴鍒嗗壊绾�
         /// </summary>
@@ -160,6 +164,9 @@
         /// 1:閭
         /// </summary>
         int registerType;
+
+        string registerPhone;
+        string registerEmail;
         #endregion
         public RegisterPage()
         {
@@ -195,7 +202,7 @@
                 Y = Application.GetRealHeight(112),
                 Width = Application.GetRealWidth(120),
                 Height = Application.GetRealHeight(40),
-                TextID = StringId.LoginByPhone,
+                TextID = StringId.RegisterByPhone,
                 TextColor = CSS_Color.MainColor,
                 TextAlignment = TextAlignment.CenterLeft,
                 TextSize = CSS_FontSize.EmphasisFontSize_Secondary,
@@ -208,7 +215,7 @@
                 Y = Application.GetRealHeight(112),
                 Width = Application.GetRealWidth(100),
                 Height = Application.GetRealHeight(40),
-                TextID = StringId.LoginByEmail,
+                TextID = StringId.RegisterByEmail,
                 TextColor = CSS_Color.PromptingColor1,
                 TextAlignment = TextAlignment.Center,
                 TextSize = CSS_FontSize.TextFontSize,
@@ -460,7 +467,7 @@
             };
             verificationCodeView.AddChidren(etVerificationCode);
 
-            btnGetVerificationCode = new Button()
+            btnGetVerificationCode_Phone = new Button()
             {
                 X = Application.GetRealWidth(219),
                 Width = Application.GetRealWidth(100),
@@ -470,7 +477,20 @@
                 TextAlignment = TextAlignment.CenterRight,
                 TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
             };
-            verificationCodeView.AddChidren(btnGetVerificationCode);
+            verificationCodeView.AddChidren(btnGetVerificationCode_Phone);
+
+            btnGetVerificationCode_Mail = new Button()
+            {
+                X = Application.GetRealWidth(219),
+                Width = Application.GetRealWidth(100),
+                TextID = StringId.GetVerificationCode,
+                SelectedTextColor = CSS_Color.MainColor,
+                TextColor = CSS_Color.PromptingColor1,
+                TextAlignment = TextAlignment.CenterRight,
+                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+                Visible = false
+            };
+            verificationCodeView.AddChidren(btnGetVerificationCode_Mail);
 
             btnVerificationCodeViewBottomLine = new Button()
             {
@@ -584,6 +604,7 @@
                     var loginThread = LoadThread_Login(account, password);
                     waitPage = new Loading();
                     new PublicAssmebly().LoadPage_WaitPage(loginThread, bodyView, waitPage);
+                    dialog.Close();
                 });
             })
             { IsBackground = true }.Start();

--
Gitblit v1.8.0