From b633f8f1c92f44913e3ddc82259e6cd3881f9324 Mon Sep 17 00:00:00 2001
From: liuxiaohang <283700113@qq.com>
Date: Fri, 13 Nov 2020 14:57:06 +0800
Subject: [PATCH] =?UTF-8?q?fix(h5):=20=20iconPath=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=8C=E5=85=BC=E5=AE=B9=E5=8D=8F=E8=AE=AE=E5=A4=B4=E5=92=8C?=
 =?UTF-8?q?=E6=97=A0=E5=8D=8F=E8=AE=AE=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../h5/components/app/customTabBar.vue        | 56 ++++++++++---------
 src/platforms/h5/components/app/tabBar.vue    |  5 ++
 2 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/src/platforms/h5/components/app/customTabBar.vue b/src/platforms/h5/components/app/customTabBar.vue
index 19255a124..449b5e6ad 100644
--- a/src/platforms/h5/components/app/customTabBar.vue
+++ b/src/platforms/h5/components/app/customTabBar.vue
@@ -1,43 +1,43 @@
 <template>
-  <uni-tabbar
-    v-if="hasTabBar"
-    v-show="showTabBar"
+  <uni-tabbar
+    v-if="hasTabBar"
+    v-show="showTabBar"
   >
-    <div
+    <div
       :style="{'flex-direction':direction==='vertical'?'column':'row',backgroundColor:tabBarOptions.backgroundColor}"
-      class="uni-tabbar"
+      class="uni-tabbar"
     >
-      <div
-        v-for="(item,index) in tabBarOptions.list"
-        :key="item.pagePath"
-        class="uni-tabbar__item"
-        @click="_switchTab(item,index)"
+      <div
+        v-for="(item,index) in tabBarOptions.list"
+        :key="item.pagePath"
+        class="uni-tabbar__item"
+        @click="_switchTab(item,index)"
       >
         <div class="uni-tabbar__bd">
-          <div
-            v-if="showIcon && item.iconPath"
-            :class="{'uni-tabbar__icon__diff':!item.text}"
-            class="uni-tabbar__icon"
+          <div
+            v-if="showIcon && item.iconPath"
+            :class="{'uni-tabbar__icon__diff':!item.text}"
+            class="uni-tabbar__icon"
           >
             <img :src="_getRealPath(selectedIndex===index?item.selectedIconPath:item.iconPath)">
-            <div
-              v-if="item.redDot"
-              :class="{'uni-tabbar__badge':!!item.badge}"
-              class="uni-tabbar__reddot"
+            <div
+              v-if="item.redDot"
+              :class="{'uni-tabbar__badge':!!item.badge}"
+              class="uni-tabbar__reddot"
             >
               {{ item.badge }}
             </div>
           </div>
-          <div
-            v-if="item.text"
+          <div
+            v-if="item.text"
             :style="{color:selectedIndex===index?tabBarOptions.selectedColor:tabBarOptions.color,fontSize:showIcon&&item.iconPath?'10px':'14px'}"
-            class="uni-tabbar__label"
+            class="uni-tabbar__label"
           >
             {{ item.text }}
-            <div
-              v-if="item.redDot&&(!showIcon || !item.iconPath)"
-              :class="{'uni-tabbar__badge':!!item.badge}"
-              class="uni-tabbar__reddot"
+            <div
+              v-if="item.redDot&&(!showIcon || !item.iconPath)"
+              :class="{'uni-tabbar__badge':!!item.badge}"
+              class="uni-tabbar__reddot"
             >
               {{ item.badge }}
             </div>
@@ -104,7 +104,9 @@ export default {
   },
   methods: {
     _getRealPath (filePath) {
-      if (filePath.indexOf('/') !== 0) {
+      const SCHEME_RE = /^([a-z-]+:)?\/\//i
+      const DATA_RE = /^data:.*,.*/
+      if (!(SCHEME_RE.test(filePath) || DATA_RE.test(filePath)) && filePath.indexOf('/') !== 0) {
         filePath = '/' + filePath
       }
       return getRealPath(filePath)
@@ -133,4 +135,4 @@ export default {
 </script>
 
 <style>
-</style>
+</style>
diff --git a/src/platforms/h5/components/app/tabBar.vue b/src/platforms/h5/components/app/tabBar.vue
index 4bb0e6ae6..d93e74c86 100644
--- a/src/platforms/h5/components/app/tabBar.vue
+++ b/src/platforms/h5/components/app/tabBar.vue
@@ -228,6 +228,11 @@ export default {
   },
   methods: {
     _getRealPath (filePath) {
+      const SCHEME_RE = /^([a-z-]+:)?\/\//i
+      const DATA_RE = /^data:.*,.*/
+      if (!(SCHEME_RE.test(filePath) || DATA_RE.test(filePath)) && filePath.indexOf('/') !== 0) {
+        filePath = '/' + filePath
+      }
       return getRealPath(filePath)
     },
     _switchTab ({
-- 
GitLab