From eb51679c618d5027070fbd6f3c0519f0f17e7d7d Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 23 十一月 2020 10:07:53 +0800
Subject: [PATCH] Merge branch 'CJL' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into CJL

---
 HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs |   29 ++++++++++++++++++++++++++---
 1 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs b/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs
index cb3b9b2..1d03af1 100644
--- a/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs
+++ b/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs
@@ -153,6 +153,16 @@
         /// 1:閭
         /// </summary>
         int registerType;
+        /// <summary>
+        /// 鎵嬫満鍖哄彿
+        /// </summary>
+        string phoneZoneCode = "86";
+
+        /// <summary>
+        /// 
+        /// </summary>
+        string registerPhone;
+        string registerEmail;
         #endregion
         public ForgetPasswordPage(Action<string> action)
         {
@@ -178,7 +188,7 @@
                 Y = Application.GetRealHeight(112),
                 Width = Application.GetRealWidth(120),
                 Height = Application.GetRealHeight(40),
-                TextID = StringId.LoginByPhone,
+                TextID = StringId.PhoneNumberAccount,
                 TextColor = CSS_Color.MainColor,
                 TextAlignment = TextAlignment.CenterLeft,
                 TextSize = CSS_FontSize.EmphasisFontSize_Secondary,
@@ -191,7 +201,7 @@
                 Y = Application.GetRealHeight(112),
                 Width = Application.GetRealWidth(100),
                 Height = Application.GetRealHeight(40),
-                TextID = StringId.LoginByEmail,
+                TextID = StringId.EmailAccount,
                 TextColor = CSS_Color.PromptingColor1,
                 TextAlignment = TextAlignment.Center,
                 TextSize = CSS_FontSize.TextFontSize,
@@ -215,9 +225,22 @@
                 X = Application.GetRealWidth(9),
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = CSS_Color.FirstLevelTitleColor,
-                Text = "+86",
+                Text = "+" + phoneZoneCode,
                 TextSize = CSS_FontSize.TextFontSize,
             };
+
+            //璺宠浆鍥藉鍖哄彿閫夋嫨鐣岄潰
+            EventHandler<MouseEventArgs> eHandler = (sender, e) => {
+                JLCountrycode.CountryCodeView.Current.Show((countryName, code) => {
+                    if (!string.IsNullOrEmpty(code))
+                    {
+                        phoneZoneCode = code;
+                        btnGlobalRoaming.Text = "+" + phoneZoneCode;
+                    }
+                });
+            };
+            btnGlobalRoaming.MouseUpEventHandler += eHandler;
+
             if (accountType == 0)
             {
                 accountView.AddChidren(btnGlobalRoaming);

--
Gitblit v1.8.0