From 72be4f06a683de33ddd563c8447c39f7f17e5b7d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 06 一月 2020 13:03:50 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs
index 37f8867..2acb36b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs
@@ -149,7 +149,7 @@
if (resultValue == null)
{
//鍑虹幇鏈煡閿欒,鏁版嵁涓㈠け
- string msg = Language.StringByID(R.MyInternationalizationString.uUnknownErrorAndDataLost);
+ string msg = Language.StringByID(R.MyInternationalizationString.uUnKnownError);
this.ShowMassage(ShowMsgType.Tip, msg);
return;
}
@@ -166,7 +166,7 @@
if (memberInfoRes == null)
{
//鍑虹幇鏈煡閿欒,鏁版嵁涓㈠け
- string msg = Language.StringByID(R.MyInternationalizationString.uUnknownErrorAndDataLost);
+ string msg = Language.StringByID(R.MyInternationalizationString.uUnKnownError);
this.ShowMassage(ShowMsgType.Tip, msg);
return;
}
@@ -176,7 +176,7 @@
//鎴愬憳娣诲姞鎴愬姛
var form = new AddMemberSuccessForm();
- form.AddForm(memberInfoRes);
+ form.AddForm(memberInfoRes, memberResult.DistributedMark);
form.FormCloseEvent += (() =>
{
this.CloseForm();
--
Gitblit v1.8.0