From 6e580804d74d7a6fb118b6ba381e88aa81f267c7 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 15 三月 2021 15:30:23 +0800
Subject: [PATCH] Merge branch 'temp-wxr' into dev-tzy

---
 HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddThirdPartyBrandListpage.cs |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddThirdPartyBrandListpage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddThirdPartyBrandListpage.cs
index f9674d8..9841ea0 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddThirdPartyBrandListpage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddThirdPartyBrandListpage.cs
@@ -26,6 +26,7 @@
             {
                 Y = Application.GetRealHeight(64),
                 Height = Application.GetRealHeight(667 - 64),
+                VerticalScrollBarEnabled = false,
             };
             bodyView.AddChidren(contentView);
 
@@ -76,6 +77,7 @@
                     Height = Application.GetRealWidth(32),
                     Radius = (uint)Application.GetRealWidth(4),
                     BackgroundColor = CSS_Color.PromptingColor1
+                    //ImagePath = "tuya_logo.png"
                 };
                 row.AddChidren(btnIcon);
                 Button btnRight = new Button()
@@ -99,7 +101,7 @@
                 };
                 row.AddChidren(btnName);
                 //涓嬭浇绗笁鏂瑰搧鐗宨con
-                ImageUtlis.Current.Load3tyBrandIconImages(brand.brandIcon, btnIcon);
+                ImageUtlis.Current.Load3tyBrandIconImages(brand.brandName, brand.brandIcon, btnIcon);
             }
 
         }

--
Gitblit v1.8.0