From 6ef2013f2aa6e6abadfccdad3b69fd8ddc5d0edb Mon Sep 17 00:00:00 2001
From: handongxun <handongxun@dcloud.io>
Date: Fri, 29 Apr 2022 17:23:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20h5=20tabbar=20iconfont=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=98=AF=E5=90=A6=E9=85=8D=E7=BD=AE=E5=AD=97=E4=BD=93?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=20=E5=92=8C=20=E9=BB=98=E8=AE=A4=E5=AD=97?=
 =?UTF-8?q?=E4=BD=93=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/platforms/h5/components/app/tabBar.vue | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/platforms/h5/components/app/tabBar.vue b/src/platforms/h5/components/app/tabBar.vue
index 6efbf8048..04dc86580 100644
--- a/src/platforms/h5/components/app/tabBar.vue
+++ b/src/platforms/h5/components/app/tabBar.vue
@@ -45,7 +45,7 @@
               v-if="item.iconfont"
               :style="{
                 color:selectedIndex === index ? selectedColor : color,
-                fontSize: item.iconfont.fontSize || fontSize
+                fontSize: item.iconfont.fontSize || iconWidth
               }"
               class="uni-tabbar__iconfont"
             >
@@ -360,12 +360,15 @@ export default {
         this.$set(item, 'visible', true)
       }
     })
-    loadFontFace({
-      options: {
-        family: UNI_TABBAR_ICON_FONT,
-        source: `url("${this.iconfontSrc}")`
-      }
-    })
+
+    if (this.iconfontSrc) {
+      loadFontFace({
+        options: {
+          family: UNI_TABBAR_ICON_FONT,
+          source: `url("${this.iconfontSrc}")`
+        }
+      })
+    }
   },
   beforeCreate () {
     this.__path__ = this.$route.path
-- 
GitLab