From c44b10e4447e84dbdfa9105edf460ef364a8f2b3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 19:53:35 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/UI/UI1-Login/RegisterPageBLL.cs | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs b/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
index 1c8ae6d..b6dc594 100644
--- a/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
@@ -604,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();
@@ -655,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