From 43379d20b3300f0732e6488b7f0c9a6a44ab23e5 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Tue, 29 Oct 2019 20:29:37 +0800
Subject: [PATCH] docs(Tabbar): fix incorrect icon url (#4869)

---
 src/tabbar/README.md                          |  6 +-
 src/tabbar/README.zh-CN.md                    |  6 +-
 src/tabbar/demo/index.vue                     | 61 ++++---------------
 .../test/__snapshots__/demo.spec.js.snap      | 30 +++------
 4 files changed, 25 insertions(+), 78 deletions(-)

diff --git a/src/tabbar/README.md b/src/tabbar/README.md
index 47eb7f284..51cc9faf0 100644
--- a/src/tabbar/README.md
+++ b/src/tabbar/README.md
@@ -75,7 +75,7 @@ Use `icon` slot to custom icon
     <img
       slot="icon"
       slot-scope="props"
-      :src="props.active ? icon.active : icon.normal"
+      :src="props.active ? icon.active : icon.inactive"
     >
   </van-tabbar-item>
   <van-tabbar-item icon="search">Tab</van-tabbar-item>
@@ -89,8 +89,8 @@ export default {
     return {
       active: 0,
       icon: {
-        normal: '//img.yzcdn.cn/icon-normal.png',
-        active: '//img.yzcdn.cn/icon-active.png'
+        active: 'https://img.yzcdn.cn/vant/user-active.png',
+        inactive: 'https://img.yzcdn.cn/vant/user-inactive.png'
       }
     }
   }
diff --git a/src/tabbar/README.zh-CN.md b/src/tabbar/README.zh-CN.md
index e47e43a2d..e2552ef9d 100644
--- a/src/tabbar/README.zh-CN.md
+++ b/src/tabbar/README.zh-CN.md
@@ -81,7 +81,7 @@ export default {
     <img
       slot="icon"
       slot-scope="props"
-      :src="props.active ? icon.active : icon.normal"
+      :src="props.active ? icon.active : icon.inactive"
     >
   </van-tabbar-item>
   <van-tabbar-item icon="search">标签</van-tabbar-item>
@@ -95,8 +95,8 @@ export default {
     return {
       active: 0,
       icon: {
-        normal: '//img.yzcdn.cn/icon-normal.png',
-        active: '//img.yzcdn.cn/icon-active.png'
+        active: 'https://img.yzcdn.cn/vant/user-active.png',
+        inactive: 'https://img.yzcdn.cn/vant/user-inactive.png'
       }
     }
   }
diff --git a/src/tabbar/demo/index.vue b/src/tabbar/demo/index.vue
index 39d522a57..c30966a86 100644
--- a/src/tabbar/demo/index.vue
+++ b/src/tabbar/demo/index.vue
@@ -11,54 +11,19 @@
 
     <demo-block :title="$t('matchByName')">
       <van-tabbar v-model="activeName">
-        <van-tabbar-item
-          name="home"
-          icon="home-o"
-        >
-          {{ $t('tab') }}
-        </van-tabbar-item>
-        <van-tabbar-item
-          name="search"
-          icon="search"
-        >
-          {{ $t('tab') }}
-        </van-tabbar-item>
-        <van-tabbar-item
-          name="friends"
-          icon="friends-o"
-        >
-          {{ $t('tab') }}
-        </van-tabbar-item>
-        <van-tabbar-item
-          name="setting"
-          icon="setting-o"
-        >
-          {{ $t('tab') }}
-        </van-tabbar-item>
+        <van-tabbar-item name="home" icon="home-o">{{ $t('tab') }}</van-tabbar-item>
+        <van-tabbar-item name="search" icon="search">{{ $t('tab') }}</van-tabbar-item>
+        <van-tabbar-item name="friends" icon="friends-o">{{ $t('tab') }}</van-tabbar-item>
+        <van-tabbar-item name="setting" icon="setting-o">{{ $t('tab') }}</van-tabbar-item>
       </van-tabbar>
     </demo-block>
 
     <demo-block :title="$t('badge')">
       <van-tabbar v-model="active2">
         <van-tabbar-item icon="home-o">{{ $t('tab') }}</van-tabbar-item>
-        <van-tabbar-item
-          icon="search"
-          dot
-        >
-          {{ $t('tab') }}
-        </van-tabbar-item>
-        <van-tabbar-item
-          icon="friends-o"
-          info="5"
-        >
-          {{ $t('tab') }}
-        </van-tabbar-item>
-        <van-tabbar-item
-          icon="setting-o"
-          info="20"
-        >
-          {{ $t('tab') }}
-        </van-tabbar-item>
+        <van-tabbar-item icon="search" dot>{{ $t('tab') }}</van-tabbar-item>
+        <van-tabbar-item icon="friends-o" info="5">{{ $t('tab') }}</van-tabbar-item>
+        <van-tabbar-item icon="setting-o" info="20">{{ $t('tab') }}</van-tabbar-item>
       </van-tabbar>
     </demo-block>
 
@@ -67,7 +32,7 @@
         <van-tabbar-item info="3">
           <span>{{ $t('custom') }}</span>
           <template #icon="{ active }">
-            <img :src="active ? icon.active : icon.normal">
+            <img :src="active ? icon.active : icon.inactive">
           </template>
         </van-tabbar-item>
         <van-tabbar-item icon="search">{{ $t('tab') }}</van-tabbar-item>
@@ -76,11 +41,7 @@
     </demo-block>
 
     <demo-block :title="$t('customColor')">
-      <van-tabbar
-        v-model="active4"
-        active-color="#07c160"
-        inactive-color="#000"
-      >
+      <van-tabbar v-model="active4" active-color="#07c160" inactive-color="#000">
         <van-tabbar-item icon="home-o">{{ $t('tab') }}</van-tabbar-item>
         <van-tabbar-item icon="search">{{ $t('tab') }}</van-tabbar-item>
         <van-tabbar-item icon="friends-o">{{ $t('tab') }}</van-tabbar-item>
@@ -115,8 +76,8 @@ export default {
       active4: 0,
       activeName: 'home',
       icon: {
-        normal: 'https://img.yzcdn.cn/public_files/2017/10/13/c547715be149dd3faa817e4a948b40c4.png',
-        active: 'https://img.yzcdn.cn/public_files/2017/10/13/793c77793db8641c4c325b7f25bf130d.png'
+        active: 'https://img.yzcdn.cn/vant/user-active.png',
+        inactive: 'https://img.yzcdn.cn/vant/user-inactive.png'
       }
     };
   }
diff --git a/src/tabbar/test/__snapshots__/demo.spec.js.snap b/src/tabbar/test/__snapshots__/demo.spec.js.snap
index fa27d8154..08cf7c656 100644
--- a/src/tabbar/test/__snapshots__/demo.spec.js.snap
+++ b/src/tabbar/test/__snapshots__/demo.spec.js.snap
@@ -41,36 +41,28 @@ exports[`renders demo correctly 1`] = `
             <!----></i>
           <!---->
         </div>
-        <div class="van-tabbar-item__text">
-          标签
-        </div>
+        <div class="van-tabbar-item__text">标签</div>
       </div>
       <div class="van-tabbar-item">
         <div class="van-tabbar-item__icon"><i class="van-icon van-icon-search">
             <!----></i>
           <!---->
         </div>
-        <div class="van-tabbar-item__text">
-          标签
-        </div>
+        <div class="van-tabbar-item__text">标签</div>
       </div>
       <div class="van-tabbar-item">
         <div class="van-tabbar-item__icon"><i class="van-icon van-icon-friends-o">
             <!----></i>
           <!---->
         </div>
-        <div class="van-tabbar-item__text">
-          标签
-        </div>
+        <div class="van-tabbar-item__text">标签</div>
       </div>
       <div class="van-tabbar-item">
         <div class="van-tabbar-item__icon"><i class="van-icon van-icon-setting-o">
             <!----></i>
           <!---->
         </div>
-        <div class="van-tabbar-item__text">
-          标签
-        </div>
+        <div class="van-tabbar-item__text">标签</div>
       </div>
     </div>
   </div>
@@ -88,34 +80,28 @@ exports[`renders demo correctly 1`] = `
             <!----></i>
           <div class="van-info van-info--dot"></div>
         </div>
-        <div class="van-tabbar-item__text">
-          标签
-        </div>
+        <div class="van-tabbar-item__text">标签</div>
       </div>
       <div class="van-tabbar-item">
         <div class="van-tabbar-item__icon"><i class="van-icon van-icon-friends-o">
             <!----></i>
           <div class="van-info">5</div>
         </div>
-        <div class="van-tabbar-item__text">
-          标签
-        </div>
+        <div class="van-tabbar-item__text">标签</div>
       </div>
       <div class="van-tabbar-item">
         <div class="van-tabbar-item__icon"><i class="van-icon van-icon-setting-o">
             <!----></i>
           <div class="van-info">20</div>
         </div>
-        <div class="van-tabbar-item__text">
-          标签
-        </div>
+        <div class="van-tabbar-item__text">标签</div>
       </div>
     </div>
   </div>
   <div>
     <div class="van-hairline--top-bottom van-tabbar van-tabbar--fixed" style="z-index: 1;">
       <div class="van-tabbar-item van-tabbar-item--active">
-        <div class="van-tabbar-item__icon"><img src="https://img.yzcdn.cn/public_files/2017/10/13/793c77793db8641c4c325b7f25bf130d.png">
+        <div class="van-tabbar-item__icon"><img src="https://img.yzcdn.cn/vant/user-active.png">
           <div class="van-info">3</div>
         </div>
         <div class="van-tabbar-item__text"><span>自定义</span></div>