From 5bfb959c47017825c8cf7dc8570c55b04dab694c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 16:42:11 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into wxr6
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs
index 1299e74..92d6fe4 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs
@@ -18,8 +18,7 @@
string s = brandList[str].brandName;
strList.Add(s);
}
- var dicList = GetDateList(strList);
- JLCountrycode.CountryCodeView.Current.ShowSortSelection(Language.StringByID(StringId.xuanzehongwaipinpai), dicList, (countryName) =>
+ JLCountrycode.CountryCodeView.Current.ShowSortSelection("閫夋嫨绾㈠鍝佺墝", GetDateList(strList), (countryName) =>
{
var brandObj = brandList.Find((c) => c.brandName == countryName);
@@ -61,7 +60,6 @@
{
if (libraryList.Count < 40)
{
- //闄愬埗40涓簱锛�
libraryList.Add(library);
}
}
@@ -70,7 +68,7 @@
}
else
{
- PirMethod method = new PirMethod();
+ Method method = new Method();
method.ErrorShow(responsePackNew, "");
}
}, id, "鍝佺墝绾㈠鐮佸簱鍒楄〃");
--
Gitblit v1.8.0