alighasami/vant
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[bugfix] Tabbar: info not work when use icon slot (#1705)

Browse Source
This commit is contained in:
neverland
2018-08-27 21:06:18 +08:00
committed by GitHub
parent fe3eb10bd3
commit 30b3fad696
16 changed files with 78 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/tabbar/demo/index.vue
+1 -1
View File
@@ -11,7 +11,7 @@
<demo-block :title="$t('title2')">
<van-tabbar v-model="active2">
<van-tabbar-item icon="shop">
<van-tabbar-item info="3">
<span>{{ $t('custom') }}</span>
<img
slot="icon"
packages/tabbar/en-US.md
+1 -1
View File
@@ -35,7 +35,7 @@ Use `icon` slot to custom icon
```html
<van-tabbar v-model="active">
<van-tabbar-item icon="shop">
<van-tabbar-item info="3">
<span>Custom</span>
<img
slot="icon"
packages/tabbar/test/__snapshots__/demo.spec.js.snap
+9 -2
View File
@@ -9,6 +9,7 @@ exports[`renders demo correctly 1`] = `
<i class="van-icon van-icon-shop" style="color:undefined;font-size:undefined;">
<!---->
</i>
<!---->
</div>
<div class="van-tabbar-item__text">标签</div>
</div>
@@ -17,22 +18,25 @@ exports[`renders demo correctly 1`] = `
<i class="van-icon van-icon-chat" style="color:undefined;font-size:undefined;">
<!---->
</i>
<!---->
</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-records" style="color:undefined;font-size:undefined;">
<div class="van-icon__info">5</div>
<!---->
</i>
<div class="van-info">5</div>
</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-gold-coin" style="color:undefined;font-size:undefined;">
<div class="van-icon__info">20</div>
<!---->
</i>
<div class="van-info">20</div>
</div>
<div class="van-tabbar-item__text">标签</div>
</div>
@@ -43,6 +47,7 @@ exports[`renders demo correctly 1`] = `
<div class="van-tabbar-item">
<div class="van-tabbar-item__icon">
<img src="https://img.yzcdn.cn/public_files/2017/10/13/c547715be149dd3faa817e4a948b40c4.png">
<div class="van-info">3</div>
</div>
<div class="van-tabbar-item__text"><span>自定义</span></div>
</div>
@@ -51,6 +56,7 @@ exports[`renders demo correctly 1`] = `
<i class="van-icon van-icon-chat" style="color:undefined;font-size:undefined;">
<!---->
</i>
<!---->
</div>
<div class="van-tabbar-item__text">标签</div>
</div>
@@ -59,6 +65,7 @@ exports[`renders demo correctly 1`] = `
<i class="van-icon van-icon-records" style="color:undefined;font-size:undefined;">
<!---->
</i>
<!---->
</div>
<div class="van-tabbar-item__text">标签</div>
</div>
packages/tabbar/zh-CN.md
+1 -1
View File
@@ -37,7 +37,7 @@ export default {
```html
<van-tabbar v-model="active">
<van-tabbar-item icon="shop">
<van-tabbar-item info="3">
<span>自定义</span>
<img
slot="icon"