From 64898e1900c2fd26dc27d4ae676179869ed2065d Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Tue, 10 Apr 2018 17:35:10 +0800
Subject: [PATCH] [Improvement] support Number type info (#845)

---
 docs/markdown/en-US/badge.md             | 2 +-
 docs/markdown/en-US/goods-action.md      | 2 +-
 docs/markdown/en-US/icon.md              | 2 +-
 docs/markdown/en-US/tabbar.md            | 2 +-
 docs/markdown/zh-CN/badge.md             | 2 +-
 docs/markdown/zh-CN/goods-action.md      | 2 +-
 docs/markdown/zh-CN/icon.md              | 2 +-
 docs/markdown/zh-CN/tabbar.md            | 2 +-
 packages/badge/index.vue                 | 7 +++++--
 packages/goods-action-mini-btn/index.vue | 2 +-
 packages/icon/index.vue                  | 9 +++++++--
 packages/tabbar-item/index.vue           | 7 +++++--
 12 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/docs/markdown/en-US/badge.md b/docs/markdown/en-US/badge.md
index fe75fe0a9..f40989f2c 100644
--- a/docs/markdown/en-US/badge.md
+++ b/docs/markdown/en-US/badge.md
@@ -47,5 +47,5 @@ export default {
 | Attribute | Description | Type | Default | Accepted Values |
 |-----------|-----------|-----------|-------------|-------------|
 | title | Content | `String` | `''` | - |
-| info | Info Message | `String` | `''` | - |
+| info | Info Message | `String | Number` | `''` | - |
 | url | Link | `String` | - | - |
diff --git a/docs/markdown/en-US/goods-action.md b/docs/markdown/en-US/goods-action.md
index 0d082ca75..508c7359e 100644
--- a/docs/markdown/en-US/goods-action.md
+++ b/docs/markdown/en-US/goods-action.md
@@ -61,7 +61,7 @@ Use `info` prop to show messages in upper right corner of icon
 | text | Button text | `String` | - | - |
 | icon | Icon | `String` | - | - |
 | icon-class | Icon class name | `String` | `''` | - |
-| info | Info message | `String` | - | - |
+| info | Info message | `String | Number` | - | - |
 | url | Link | `String` | - | - |
 | to | Target route of the link, same as to of `vue-router` | `String | Object` | - | - |
 | replace | If true, the navigation will not leave a history record | `String` | `false` | - |
diff --git a/docs/markdown/en-US/icon.md b/docs/markdown/en-US/icon.md
index f08ca6fd9..a8819b142 100644
--- a/docs/markdown/en-US/icon.md
+++ b/docs/markdown/en-US/icon.md
@@ -49,7 +49,7 @@ import 'vant/lib/vant-css/icon-local.css';
 | Attribute | Description | Type | Default | Accepted Values |
 |-----------|-----------|-----------|-------------|-------------|
 | name | Icon name | `String` | `''` | - |
-| info | Info message | `String` | `''` | - |
+| info | Info message | `String | Number` | `''` | - |
 
 ### Event
 
diff --git a/docs/markdown/en-US/tabbar.md b/docs/markdown/en-US/tabbar.md
index c923b6942..831add3cd 100644
--- a/docs/markdown/en-US/tabbar.md
+++ b/docs/markdown/en-US/tabbar.md
@@ -78,7 +78,7 @@ export default {
 |-----------|-----------|-----------|-------------|-------------|
 | icon | Icon name | `String` | - | Names from Icon Component |
 | dot | Whether to show red dot | `Boolean` | - | - |
-| info | Info message | `String` | - | - |
+| info | Info message | `String | Number` | - | - |
 | url | Link | `String` | - | - |
 | to | Target route of the link, same as to of `vue-router` | `String | Object` | - | - |
 | replace | If true, the navigation will not leave a history record | `String` | `false` | - |
diff --git a/docs/markdown/zh-CN/badge.md b/docs/markdown/zh-CN/badge.md
index bd808a555..4a8e0f4ac 100644
--- a/docs/markdown/zh-CN/badge.md
+++ b/docs/markdown/zh-CN/badge.md
@@ -48,5 +48,5 @@ export default {
 | 参数 | 说明 | 类型 | 默认值 | 可选值 |
 |-----------|-----------|-----------|-------------|-------------|
 | title | 内容 | `String` | `''` | - |
-| info | 提示消息 | `String` | `''` | - |
+| info | 提示消息 | `String | Number` | `''` | - |
 | url | 跳转链接 | `String` | - | - |
diff --git a/docs/markdown/zh-CN/goods-action.md b/docs/markdown/zh-CN/goods-action.md
index 428b5518b..e8370ab27 100644
--- a/docs/markdown/zh-CN/goods-action.md
+++ b/docs/markdown/zh-CN/goods-action.md
@@ -61,7 +61,7 @@ export default {
 | text | 按钮文字 | `String` | - | - |
 | icon | 图标 | `String` | - | Icon 组件支持的所有图标 |
 | icon-class | 图标额外类名 | `String` | `''` | - |
-| info | 图标右上角提示信息 | `String` | - | - |
+| info | 图标右上角提示信息 | `String | Number` | - | - |
 | url | 跳转链接 | `String` | - | - |
 | to | 路由跳转对象，同 `vue-router` 的 to | `String | Object` | - | - |
 | replace | 跳转时是否替换当前 history | `String` | `false` | - |
diff --git a/docs/markdown/zh-CN/icon.md b/docs/markdown/zh-CN/icon.md
index 4eb1f29e1..1d30fdee4 100644
--- a/docs/markdown/zh-CN/icon.md
+++ b/docs/markdown/zh-CN/icon.md
@@ -50,7 +50,7 @@ import 'vant/lib/vant-css/icon-local.css';
 | 参数 | 说明 | 类型 | 默认值 | 可选值 |
 |-----------|-----------|-----------|-------------|-------------|
 | name | 图标名称 | `String` | `''` | - |
-| info | 图标右上角文字提示 | `String` | `''` | - |
+| info | 图标右上角文字提示 | `String | Number` | `''` | - |
 
 ### Event
 
diff --git a/docs/markdown/zh-CN/tabbar.md b/docs/markdown/zh-CN/tabbar.md
index d633fd315..59fdc9c2e 100644
--- a/docs/markdown/zh-CN/tabbar.md
+++ b/docs/markdown/zh-CN/tabbar.md
@@ -82,7 +82,7 @@ export default {
 |-----------|-----------|-----------|-------------|-------------|
 | icon | 图标名称 | `String` | - | Icon 组件中可用的类型 |
 | dot | 是否显示小红点 | `Boolean` | - | - |
-| info | 图标右上角提示信息 | `String` | - | - |
+| info | 图标右上角提示信息 | `String | Number` | - | - |
 | url | 跳转链接 | `String` | - | - |
 | to | 路由跳转对象，同 `vue-router` 的 to | `String | Object` | - | - |
 | replace | 跳转时是否替换当前 history | `String` | `false` | - |
diff --git a/packages/badge/index.vue b/packages/badge/index.vue
index aab91c821..7e6419d2d 100644
--- a/packages/badge/index.vue
+++ b/packages/badge/index.vue
@@ -1,19 +1,20 @@
 <template>
   <a class="van-badge van-hairline" :class="{ 'van-badge--select': isSelect }" :href="url" @click="onClick">
-    <div v-if="info" class="van-badge__info">{{ info }}</div>
+    <div v-if="isDef(info)" class="van-badge__info">{{ info }}</div>
     {{ title }}
   </a>
 </template>
 
 <script>
 import create from '../utils/create';
+import { isDef } from '../utils';
 
 export default create({
   name: 'badge',
 
   props: {
     url: String,
-    info: String,
+    info: [String, Number],
     title: String
   },
 
@@ -28,6 +29,8 @@ export default create({
   },
 
   methods: {
+    isDef,
+
     onClick() {
       this.$emit('click', this.$parent.badges.indexOf(this));
     }
diff --git a/packages/goods-action-mini-btn/index.vue b/packages/goods-action-mini-btn/index.vue
index cf2ec4bca..e0117e413 100644
--- a/packages/goods-action-mini-btn/index.vue
+++ b/packages/goods-action-mini-btn/index.vue
@@ -17,7 +17,7 @@ export default create({
   props: {
     url: String,
     text: String,
-    info: String,
+    info: [String, Number],
     icon: String,
     iconClass: String
   },
diff --git a/packages/icon/index.vue b/packages/icon/index.vue
index 8fb17ab9f..055792ab9 100644
--- a/packages/icon/index.vue
+++ b/packages/icon/index.vue
@@ -1,11 +1,12 @@
 <template>
   <i class="van-icon" :class="`van-icon-${name}`" v-on="$listeners">
     <slot />
-    <div v-if="info" class="van-icon__info">{{ info }}</div>
+    <div v-if="isDef(info)" class="van-icon__info">{{ info }}</div>
   </i>
 </template>
 
 <script>
+import { isDef } from '../utils';
 import create from '../utils/create-basic';
 
 export default create({
@@ -13,7 +14,11 @@ export default create({
 
   props: {
     name: String,
-    info: String
+    info: [String, Number]
+  },
+
+  methods: {
+    isDef
   }
 });
 </script>
diff --git a/packages/tabbar-item/index.vue b/packages/tabbar-item/index.vue
index bfa2ec3f6..4e8815764 100644
--- a/packages/tabbar-item/index.vue
+++ b/packages/tabbar-item/index.vue
@@ -4,7 +4,7 @@
       <slot name="icon" :active="active">
         <icon v-if="icon" :name="icon" />
       </slot>
-      <div v-if="info" class="van-icon__info">{{ info }}</div>
+      <div v-if="isDef(info)" class="van-icon__info">{{ info }}</div>
     </div>
     <div class="van-tabbar-item__text">
       <slot :active="active"/>
@@ -13,6 +13,7 @@
 </template>
 
 <script>
+import { isDef } from '../utils';
 import create from '../utils/create';
 import RouterLink from '../mixins/router-link';
 
@@ -24,7 +25,7 @@ export default create({
   props: {
     icon: String,
     dot: Boolean,
-    info: String
+    info: [String, Number]
   },
 
   data() {
@@ -42,6 +43,8 @@ export default create({
   },
 
   methods: {
+    isDef,
+
     onClick(event) {
       this.$parent.onChange(this.$parent.items.indexOf(this));
       this.$emit('click', event);