Merge branch 'dev-tzy' into dev-2020xm

xm

2020-06-19 eb5a57942bae8eb57fd7fb61124c247bebb67e8e

 Home0618/Shared/Phone/UserCenter/Password/CheckNewEmailForm.cs

@@ -116,6 +116,9 @@
            btnOk.CanClick = false;

            btnOk.ButtonClickEvent += (sender, e) =>

            {

                //清空输入的值

                btnCodeControl.ClearInputValue();



                this.btnErrorMsg.Visible = false;

                //检测邮箱的地址

                if (this.CheckEmail(txtValue.Text.Trim()) == false)