Merge branch 'wxr-2.1' into wxr-2.0

wxr

2023-09-06 c2348ebb81ca12b72eee6fbe9eee47925c1a5b07

 HDL_ON/UI/UI1-Login/LoginPage.cs

@@ -311,7 +311,6 @@
                    //etAccount.Text = "18244942707";
                    //etAccount.Text = "13143792049";
                    etAccount.Text = "18688414428";//天河3楼
                    //etAccount.Text = "18244942707";
                    //etAccount.Text = "13418062953";
                    etAccount.Text = "13138683659";
                    //etAccount.Text = "15217626103";
@@ -326,6 +325,7 @@
                    etAccount.Text = "pjh@hdlchina.com.cn";
                    //etAccount.Text = "12345678904";//2.0 测试  萤石
                    etAccount.Text = "18316672920";
                    etAccount.Text = "18244942707";
                }
                else
                {
@@ -386,7 +386,7 @@
            };
#endif

#region 登录方式选择
            #region 登录方式选择
            btnPhoneLogin = new Button()
            {
                X = Application.GetRealWidth(28),