From 8c1bf42c5fca66625b59728006bd47bae0b6a3ad Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 23 十一月 2020 10:18:16 +0800
Subject: [PATCH] Revert "Merge branch 'CJL' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into CJL"
---
HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/AccountBindInfoPage.cs | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/AccountBindInfoPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/AccountBindInfoPage.cs
index d1a0a8d..cc2daf6 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/AccountBindInfoPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/AccountBindInfoPage.cs
@@ -4,6 +4,9 @@
namespace HDL_ON.UI
{
+ /// <summary>
+ /// 宸茬粦瀹氭墜鏈烘垨鑰呴偖绠辩殑椤甸潰
+ /// </summary>
public partial class AccountBindInfoPage : FrameLayout
{
FrameLayout bodyView;
@@ -27,7 +30,7 @@
/// </summary>
/// <param name="act">鍒锋柊缁戝畾淇℃伅鏂规硶</param>
/// <param name="option">淇淇℃伅鐨勭被鍨�:1:閭锛�2:鎵嬫満</param>
- public void LoadPage(Action<string> act,int ot,int tId)
+ public void LoadPage(Action<string> act, int ot, int tId)
{
action = act;
optionType = ot;
@@ -50,7 +53,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.SubheadingFontSize,
TextAlignment = TextAlignment.CenterLeft,
- TextID = optionType == 1 ? StringId.CurrentEmail : StringId.CurPhone,
+ TextID = optionType == 1 ? StringId.CurrentEmail : StringId.CurPhone,
};
rowView.AddChidren(btnTitle);
@@ -60,7 +63,7 @@
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.TextFontSize,
TextAlignment = TextAlignment.CenterRight,
- Text = optionType == 1 ? MainPage.LoginUser.userEmailInfo : MainPage.LoginUser.userMobileInfo,
+ Text = optionType == 1 ? UserInfo.Current.userEmailInfo : UserInfo.Current.userMobileInfo,
};
rowView.AddChidren(btnContent);
@@ -82,7 +85,8 @@
};
bodyView.AddChidren(btnChangeBind);
- if( (!string.IsNullOrEmpty(MainPage.LoginUser.userMobileInfo) && optionType == 1) || (!string.IsNullOrEmpty(MainPage.LoginUser.userMobileInfo) && optionType == 2))
+ //鍚屾椂缁戝畾閭鎴栬�呮墜鏈烘墠鏄剧ず"鏇存崲楠岃瘉鏂瑰紡"
+ if (!string.IsNullOrEmpty( UserInfo.Current.userMobileInfo) && !string.IsNullOrEmpty( UserInfo.Current.userEmailInfo))
{
Button btnUnbind = new Button()
{
@@ -111,16 +115,18 @@
/// </summary>
void LoadEvent_SkipChangeBandAccountInfo(Button button)
{
- EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
+ EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
+ {
var cbe = new ChangeBindAccountPage();
+ cbe.isUnbind = false;
MainPage.BasePageView.AddChidren(cbe);
if (optionType == 1)
{
- cbe.LoadPage(action, optionType, StringId.ModifyBindingEmail, StringId.CurrentEmail);
+ cbe.LoadPage(action, optionType, StringId.ModifyBindingEmail);
}
- else if(optionType == 2)
+ else if (optionType == 2)
{
- cbe.LoadPage(action, optionType, StringId.ModifyBindingPhone, StringId.CurPhone);
+ cbe.LoadPage(action, optionType, StringId.ModifyBindingPhone);
}
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
@@ -132,16 +138,18 @@
/// </summary>
void LoadEvent_SkipDelBandAccountInfo(Button button)
{
- EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
+ EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
+ {
var cbe = new ChangeBindAccountPage();
+ cbe.isUnbind = true;//鏄惁涓鸿В缁戞爣璁�
MainPage.BasePageView.AddChidren(cbe);
if (optionType == 1)
{
- cbe.LoadPage(action, optionType, StringId.UnbindEmail, StringId.CurrentEmail);
+ cbe.LoadPage(action, optionType, StringId.UnbindEmail);
}
- else if(optionType == 2)
+ else if (optionType == 2)
{
- cbe.LoadPage(action, optionType, StringId.UnbindPhone, StringId.CurPhone);
+ cbe.LoadPage(action, optionType, StringId.UnbindPhone);
}
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
--
Gitblit v1.8.0