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/ForgetPasswordPage.cs | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs b/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs
index 23c449e..9dfb338 100644
--- a/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs
+++ b/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs
@@ -200,7 +200,7 @@
Application.HideSoftInput();
};
- new TopViewDiv(this, bodyView, Language.StringByID(StringId.ForgetPassword)).LoadTopView(backAction);
+ new TopViewDiv(this, bodyView, Language.StringByID(StringId.ModifyPassword)).LoadTopView(backAction);
//new PublicAssmebly().LoadTopView(this, bodyView, Language.StringByID(StringId.ForgetPassword));
#region 淇敼鏂瑰紡閫夋嫨
@@ -229,6 +229,13 @@
TextSize = CSS_FontSize.TextFontSize,
};
bodyView.AddChidren(btnEmailLogin);
+
+ bodyView.AddChidren(btnEmailLogin);
+ if (Language.CurrentLanguage != "Chinese")
+ {
+ btnPhoneLogin.Width = Application.GetRealWidth(180);
+ btnEmailLogin.Width = Application.GetRealWidth(180);
+ }
#endregion
#region 璐﹀彿濉啓
--
Gitblit v1.8.0