From 387383a243879bf8c63a4611e2ed2c5a519e218d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 20 十一月 2020 18:14:29 +0800
Subject: [PATCH] Merge branch 'CJL'

---
 HDL_ON/UI/UI1-Login/LoginPage.cs |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 4691fc3..b8f1b69 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -150,6 +150,10 @@
         /// </summary>
         string registerPhone;
         string registerEmail;
+        /// <summary>
+        /// 鎵嬫満鍖哄彿
+        /// </summary>
+        string phoneZoneCode = "86";
 
         /// <summary>
         /// 鍔犺浇瑙嗗浘
@@ -181,7 +185,7 @@
             btnIcon.MouseUpEventHandler += (sender, e) =>
             {
 #if DEBUG
-                etAccount.Text = "464027401@qq.com";
+                etAccount.Text = "464027401@qq.com"; //"2791308028@qq.com";// 
                 etPassword.Text = "qqqqqq";
                 btnLogin.IsSelected = true;
 #endif
@@ -230,11 +234,27 @@
                 Width = Application.GetRealWidth(65),
                 TextAlignment = TextAlignment.Center,
                 TextColor = CSS_Color.FirstLevelTitleColor,
-                Text = "+86",
+                Text = "+" + phoneZoneCode,
                 TextSize = CSS_FontSize.TextFontSize,
+                Enable = true,
             };
+
+            //璺宠浆鍥藉鍖哄彿閫夋嫨鐣岄潰
+            EventHandler<MouseEventArgs> eHandler = (sender, e) => {
+                JLCountrycode.CountryCodeView.Current.Show((countryName, code) => {
+                    if (!string.IsNullOrEmpty(code))
+                    {
+                        phoneZoneCode = code;
+                        btnGlobalRoaming.Text = "+" + phoneZoneCode;
+                    }
+                });
+            };
+            btnGlobalRoaming.MouseUpEventHandler += eHandler;
+
             if (loginType == 0)
+            {
                 accountView.AddChidren(btnGlobalRoaming);
+            }
 
             btnDividingLineVertical_AccountView = new Button()
             {

--
Gitblit v1.8.0