From 5e3f75bbcb08ba20b93d5de3ecbb810d78b6b1c0 Mon Sep 17 00:00:00 2001
From: rex <rexkaneki@gmail.com>
Date: Fri, 9 Nov 2018 10:06:05 +0800
Subject: [PATCH] =?UTF-8?q?[bugfix]=20Badge:=20active=20=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E5=9C=A8=20mpvue=20=E4=B8=AD=E4=B8=8D=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#877
---
 packages/badge-group/index.ts | 5 +++--
 packages/common/utils.ts      | 7 ++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/badge-group/index.ts b/packages/badge-group/index.ts
index 1553dc3b..7e7ca429 100644
--- a/packages/badge-group/index.ts
+++ b/packages/badge-group/index.ts
@@ -1,4 +1,5 @@
 import { VantComponent } from '../common/component';
+import { isNumber } from '../common/utils';
 
 VantComponent({
   relation: {
@@ -31,11 +32,11 @@ VantComponent({
   },
 
   methods: {
-    setActive(badge: Weapp.Component) {
+    setActive(badge: Weapp.Component | number) {
       let { active } = this.data;
       const { badges } = this;
 
-      if (badge) {
+      if (badge && !isNumber(badge)) {
         active = badges.indexOf(badge);
       }
 
diff --git a/packages/common/utils.ts b/packages/common/utils.ts
index 89073303..765c483d 100644
--- a/packages/common/utils.ts
+++ b/packages/common/utils.ts
@@ -7,7 +7,12 @@ function isObj(x: any): boolean {
   return x !== null && (type === 'object' || type === 'function');
 }
 
+function isNumber(value) {
+  return /^\d+$/.test(value);
+}
+
 export {
   isObj,
-  isDef
+  isDef,
+  isNumber
 };