[Improvement] support Number type info (#845)

This commit is contained in:
neverland
2018-04-10 17:35:10 +08:00
committed by GitHub
parent d3f6042650
commit 64898e1900
12 changed files with 26 additions and 15 deletions
+5 -2
View File
@@ -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));
}
+1 -1
View File
@@ -17,7 +17,7 @@ export default create({
props: {
url: String,
text: String,
info: String,
info: [String, Number],
icon: String,
iconClass: String
},
+7 -2
View File
@@ -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>
+5 -2
View File
@@ -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);