From fe3b2466c68b5db70d38e78039703add3b8b1dfe Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 31 十二月 2020 19:29:43 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferMemberInfoForm.cs | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferMemberInfoForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferMemberInfoForm.cs
index efb3e92..22b4535 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferMemberInfoForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferMemberInfoForm.cs
@@ -83,7 +83,8 @@
btnName.Gravity = Gravity.CenterHorizontal;
btnName.TextAlignment = TextAlignment.Center;
btnName.TextSize = 16;
- btnName.Text = memberResult.MemberName;
+ //濡傛灉瀹冩湰韬氨娌″悕瀛楃殑璇濓紝鎶婁粬鐨処D浣滀负鏄电О
+ btnName.Text = string.IsNullOrEmpty(memberResult.UserName) == true ? memberResult.Account : memberResult.UserName;
bodyFrameLayout.AddChidren(btnName);
//璇风‘璁よ处鍙锋槸鍚︽纭畕0}濡傛纭鐐瑰嚮纭
@@ -110,8 +111,8 @@
bodyFrameLayout.AddChidren(btnOk);
btnOk.ButtonClickEvent += (sender, e) =>
{
- if (this.memberResult.Account == HdlUserCenterResourse.UserInfo.UserPhone
- || this.memberResult.Account == HdlUserCenterResourse.UserInfo.UserEmail)
+ if (this.memberResult.Account == UserCenterResourse.UserInfo.Phone
+ || this.memberResult.Account == UserCenterResourse.UserInfo.Email)
{
if (this.TransferDiv == 1)
{
--
Gitblit v1.8.0