From 422e4db118f8ed42fe4295506201c8810e16fa21 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Mon, 30 Oct 2017 06:52:27 -0500
Subject: [PATCH] [bugfix] Tabbar cann't display info when use icon slot (#269)

* [bugfix] CouponList always show empty info

* [bugfix] add click feedback of buttons in components

* [Doc] add custom theme document

* [new feature] Notice bar support more props

* [bugfix] PullRefresh test cases

* [bugfix] unused NoticeBar style

* [bugfix] Swipe width calc error

* [Doc] english document of all action components

* [Doc] change document site path to /zanui/vant

* [Doc] fix

* [bugfix] uploader style error

* [bugfix] tabs document demo

* [new feature] Cell support vue-router target route

* [bugfix] add cell test cases

* update yarn.lock

* [bugfix] Tabbar cann't display info when use icon slot
---
 packages/tabbar-item/index.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/tabbar-item/index.vue b/packages/tabbar-item/index.vue
index 7b77393bd..122c3062f 100644
--- a/packages/tabbar-item/index.vue
+++ b/packages/tabbar-item/index.vue
@@ -2,10 +2,9 @@
   <div :class="['van-tabbar-item', { 'van-tabbar-item--active': active }]" @click="onClick">
     <div :class="['van-tabbar-item__icon', { 'van-tabbar-item__icon-dot': dot }]">
       <slot name="icon">
-        <van-icon v-if="icon" :name="icon">
-          <div v-if="info" class="van-tabbar-item__info">{{ info }}</div>
-        </van-icon>
+        <van-icon v-if="icon" :name="icon" />
       </slot>
+      <div v-if="info" class="van-tabbar-item__info">{{ info }}</div>
     </div>
     <div class="van-tabbar-item__text">
       <slot></slot>