From 0f2e0147e8990e913d16d99bc1b94fb6bc53abd7 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 03 十二月 2020 15:35:42 +0800
Subject: [PATCH] 2020-12-03-1

---
 HDL_ON/UI/UI1-Login/RegisterPageBLL.cs |   38 ++++++++++++++++++++++++++++----------
 1 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs b/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
index dc42b58..b6dc594 100644
--- a/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
@@ -69,7 +69,7 @@
             //閫夋嫨鎵嬫満娉ㄥ唽
             btnPhoneLogin.MouseUpEventHandler = (sender, e) =>
             {
-                if(registerType == 0)
+                if (registerType == 0)
                 {
                     return;
                 }
@@ -207,7 +207,7 @@
                             }
                         }
                     }
-                    if(accountType ==0)
+                    if (accountType == 0)
                     {
                         registerPhone = etAccount.Text.Trim();
                     }
@@ -385,7 +385,7 @@
                             {
                                 //鐭俊鍙戦�侀棿闅�60s
                                 (sender as Button).IsSelected = false;
-                             
+
                             });
                             //2.1 寮�濮嬪�掕鏃�
                             new Thread(() =>
@@ -425,11 +425,13 @@
                                 IMessageCommon.Current.ShowErrorInfoAlter(resultObj.Code);
                             }
 
-                        }else if (result.Code.ToUpper() == StateCode.SUCCESS)
+                        }
+                        else if (result.Code.ToUpper() == StateCode.SUCCESS)
                         {
                             //3.鎻愮ず璐﹀彿宸插瓨鍦紝鏃犳硶閲嶅娉ㄥ唽
                             Utlis.ShowAlertOnMainThread(Language.StringByID(StringId.AccountAlreadyUse));
-                        } else
+                        }
+                        else
                         {
                             //4.鎻愮ず鍏跺畠寮傚父閿欒
                             IMessageCommon.Current.ShowErrorInfoAlter(result.Code);
@@ -494,7 +496,7 @@
         {
             btnRegister.MouseUpEventHandler = (sender, e) =>
             {
-                if(etPassword.Text.Trim().Length > 13 || etPassword.Text.Trim().Length<6)
+                if (etPassword.Text.Trim().Length > 13 || etPassword.Text.Trim().Length < 6)
                 {
                     new Tip()
                     {
@@ -602,15 +604,19 @@
         /// </summary>
         void LoadEvent_Server()
         {
+            //鍒ゆ柇涔嬪墠鏄惁閫夋嫨杩�
+            if (UserInfo.Current.GlobalRegion != null && !string.IsNullOrEmpty(UserInfo.Current.GlobalRegion.regionUrl))
+            {
+
+                SetServerText();
+            }
+
             EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
             {
                 Action selectAction = () =>
                 {
                     //鏈嶅姟鍣ㄩ�夋嫨杩囨爣璁颁负true
-                    isSelectServer = true;
-                    ShowServerBottomLineState(false);
-                    btnServerText.TextColor = CSS_Color.FirstLevelTitleColor;
-                    btnServerText.Text = UserInfo.Current.GlobalRegion.regionName;
+                    SetServerText();
                 };
                 new SelectServerDialog(selectAction).LoadPage();
 
@@ -653,5 +659,17 @@
                 btnServerBottomLine.Height = Application.GetRealHeight(1);
             }
         }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        void SetServerText()
+        {
+            //鏈嶅姟鍣ㄩ�夋嫨杩囨爣璁颁负true
+            isSelectServer = true;
+            ShowServerBottomLineState(false);
+            btnServerText.TextColor = CSS_Color.FirstLevelTitleColor;
+            btnServerText.Text = UserInfo.Current.GlobalRegion.regionName;
+        }
     }
 }
\ No newline at end of file

--
Gitblit v1.8.0