From 3a246cf9130d0a3fff881aeaaec7a3134032ee6e Mon Sep 17 00:00:00 2001
From: handongxun <handongxun@dcloud.io>
Date: Thu, 12 May 2022 16:20:03 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20vue2=20web=20tabbar=20iconfont=20selecte?=
 =?UTF-8?q?dColor=E6=97=A0=E6=95=88=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BB=85?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7=E4=BC=A0=E5=85=A5=E7=9A=84?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/platforms/h5/components/app/tabBar.vue | 2 +-
 src/platforms/h5/service/api/ui/tab-bar.js | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/platforms/h5/components/app/tabBar.vue b/src/platforms/h5/components/app/tabBar.vue
index 04dc86580..e62521018 100644
--- a/src/platforms/h5/components/app/tabBar.vue
+++ b/src/platforms/h5/components/app/tabBar.vue
@@ -44,7 +44,7 @@
             <div
               v-if="item.iconfont"
               :style="{
-                color:selectedIndex === index ? selectedColor : color,
+                color:selectedIndex === index ? item.iconfont.selectedColor : item.iconfont.color,
                 fontSize: item.iconfont.fontSize || iconWidth
               }"
               class="uni-tabbar__iconfont"
diff --git a/src/platforms/h5/service/api/ui/tab-bar.js b/src/platforms/h5/service/api/ui/tab-bar.js
index 294c8cecb..a97db85ba 100644
--- a/src/platforms/h5/service/api/ui/tab-bar.js
+++ b/src/platforms/h5/service/api/ui/tab-bar.js
@@ -8,6 +8,8 @@ const setTabBarStyleProps = ['color', 'selectedColor', 'backgroundColor', 'borde
 
 const setTabBarBadgeProps = ['badge', 'redDot']
 
+const setTabBarIconfontStyles = ['text', 'selectedText', 'fontSize', 'color', 'selectedColor']
+
 function setTabBar (type, args = {}) {
   const app = getApp()
 
@@ -43,7 +45,11 @@ function setTabBar (type, args = {}) {
       case 'hideTabBar':
         app.$children[0].hideTabBar = true
         break
-      case 'setTabBarItem': {
+      case 'setTabBarItem': {
+        if (args.iconfont) {
+          setProperties(tabBar.list[index].iconfont, setTabBarIconfontStyles, args.iconfont)
+          args.iconfont = tabBar.list[index].iconfont
+        }
         setProperties(tabBar.list[index], setTabBarItemProps, args)
         const pagePath = args.pagePath
         const route = pagePath && __uniRoutes.find(({ path }) => path === pagePath)
-- 
GitLab