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

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

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

@@ -151,12 +151,12 @@
        /// <summary>

        /// 发送验证码到邮箱

        /// </summary>

        private async void SendCodeToEmail(BottomClickButton btnNext, string Email)

        private void SendCodeToEmail(BottomClickButton btnNext, string Email)

        {

            var sendCodePra = new SendCodePra();

            sendCodePra.Account = Email;



            bool falge = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/RegisterSendVerCode", false, sendCodePra);

            bool falge = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/RegisterSendVerCode", false, sendCodePra);

            if (falge == false)

            {

                return;

@@ -213,7 +213,7 @@
        /// 验证验证码

        /// </summary>

        /// <returns></returns>

        private async void CheckVerificationCode(string code)

        private void CheckVerificationCode(string code)

        {

            if (this.canCheckCode == false)

            {

@@ -226,7 +226,7 @@
            checkCodePra.Code = code;

            checkCodePra.Account = newEmail;



            bool flage = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/ValidatorCode", false, checkCodePra);

            bool flage = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/ValidatorCode", false, checkCodePra);

            if (flage == false)

            {

                //验证码错误，请重新输入

@@ -242,12 +242,12 @@
        /// <summary>

        /// 变更邮箱

        /// </summary>

        private async void SaveNewEmail()

        private void SaveNewEmail()

        {

            var pra = new SaveNewEmailPra();

            pra.Account = this.newEmail;



            bool flage = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/BindAccount", false, pra);

            bool flage = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/BindAccount", false, pra);

            if (flage == false)

            {

                //绑定邮箱失败