From 1a0a7f736c6d2e7129e7591d40bed67ec7c0f09a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 05 二月 2021 10:47:42 +0800
Subject: [PATCH] 2021-02-05 1.编译冲突修改

---
 HDL_ON/UI/UI1-Login/LoginPage.cs |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 15b6e52..8c22dc5 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -192,11 +192,11 @@
                 //return;
                 if (b)
                 {
-                    etAccount.Text = "13415629083";// "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568 
+                    etAccount.Text = "18778381374";// "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568 
                 }
                 else
                 {
-                    etAccount.Text = "13375012446";//13375012446
+                    etAccount.Text = "13375012446";//13375012446//13602944661//tzy 18778381374
                 }
                 b = !b;
                 etPassword.Text = "123456";
@@ -526,9 +526,13 @@
             {
                 Height = Application.GetRealHeight(28),
                 Width = Application.GetRealWidth(28),
-                X = Application.GetRealWidth(82),
+                X = Application.GetRealWidth(22),
             };
             frameRow.AddChidren(agreeView);
+            if(Language.CurrentLanguage == "Chinese")
+            {
+                agreeView.X = Application.GetRealWidth(82);
+            }
             //鍚屾剰鍥炬爣鎸夐挳
             var agreeBtn = new Button()
             {

--
Gitblit v1.8.0