1127最新合并代码，合并嘉乐更新

wei

2020-11-27 e53a1951d6aa07ad22aad9816da4703496fcbccd

 HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/ChangeBindAccountPage.cs

@@ -18,7 +18,17 @@
        /// <summary>
        /// 
        /// </summary>
        Button btnTitle;
        /// <summary>
        /// 
        /// </summary>
        Button btnContent;

        /// <summary>
        /// 
        /// </summary>
        Action<string> action;

        /// <summary>
        /// 操作目标类型 1:邮箱，2:手机
        /// </summary>
@@ -26,16 +36,8 @@
        /// <summary>
        /// 是否为解绑验证
        /// </summary>
        public bool isUnbind;
        public bool IsUnbind;

        /// <summary>
        /// 
        /// </summary>
        Button btnTitle;
        /// <summary>
        /// 
        /// </summary>
        Button btnContent;

        /// <summary>
        /// ChangeBindAccountPage
@@ -101,7 +103,7 @@
                Y = Application.GetRealHeight(213),
                Gravity = Gravity.CenterHorizontal,
                Width = Application.GetRealWidth(220),
                Height = Application.GetRealHeight(44),
                Height = Application.GetRealWidth(44),
                BackgroundColor = CSS_Color.MainColor,
                TextAlignment = TextAlignment.Center,
                TextColor = CSS_Color.MainBackgroundColor,
@@ -148,12 +150,12 @@
        {
            if (optionType == 2)
            {
                btnTitle.TextID = isUnbind ? StringId.CurPhone : StringId.PhoneNumberVerification;
                btnTitle.TextID = IsUnbind ? StringId.CurPhone : StringId.PhoneNumberVerification;
                btnContent.Text =  UserInfo.Current.userMobileInfo;
            }
            else
            {
                btnTitle.TextID = isUnbind ? StringId.CurrentEmail : StringId.EmailVerification;
                btnTitle.TextID = IsUnbind ? StringId.CurrentEmail : StringId.EmailVerification;
                btnContent.Text =  UserInfo.Current.userEmailInfo;
            }
        }
@@ -232,7 +234,7 @@
                            {
                                button.BackgroundColor = CSS_Color.PromptingColor1;
                                var vcp = new ChangeBindVerificationCodePage();
                                vcp.isUnbind = isUnbind;
                                vcp.IsUnbind = IsUnbind;
                                MainPage.BasePageView.AddChidren(vcp);
                                vcp.LoadPage(action, titleId, optionType, time);
                                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;