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

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

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

@@ -120,11 +120,11 @@
        /// <summary>

        /// 发送验证码到邮箱

        /// </summary>

        private async void SendCodeToEmail(BottomClickButton btnNext)

        private void SendCodeToEmail(BottomClickButton btnNext)

        {

            var sendCodePra = new SendCodePra();



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

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

            if (falge == false)

            {

                return;

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

        /// </summary>

        /// <returns></returns>

        private async void CheckVerificationCode(string code)

        private void CheckVerificationCode(string code)

        {

            if (this.canCheckCode == false)

            {

@@ -190,7 +190,7 @@
            var checkCodePra = new CheckCodePra();

            checkCodePra.Code = code;



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

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

            if (flage == false)

            {

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