diff --git a/dist/area/index.js b/dist/area/index.js
index 5ab503a7..7db2585d 100644
--- a/dist/area/index.js
+++ b/dist/area/index.js
@@ -83,7 +83,7 @@ VantComponent({
         return result;
       }
 
-      var list = this.data.areaList[type + "_list"] || {};
+      var list = this.data.areaList && this.data.areaList[type + "_list"] || {};
       result = Object.keys(list).map(function (code) {
         return {
           code: code,
@@ -113,7 +113,7 @@ VantComponent({
       return 0;
     },
     setValues: function setValues() {
-      var code = this.code || Object.keys(this.data.areaList.county_list || {})[0] || '';
+      var code = this.code || this.data.areaList && Object.keys(this.data.areaList.county_list || {})[0] || '';
       var province = this.getList('province');
       var city = this.getList('city', code.slice(0, 2));
       this.setData({
diff --git a/dist/area/index.wxml b/dist/area/index.wxml
index a558ed74..0012f99d 100644
--- a/dist/area/index.wxml
+++ b/dist/area/index.wxml
@@ -1,5 +1,5 @@
 <view class="van-picker">
-  <view class="van-picker__toolbar">
+  <view class="van-picker__toolbar van-hairline--bottom">
     <view class="van-picker__cancel" bindtap="onCancel">取消</view>
     <view class="van-picker__title">{{ title }}</view>
     <view class="van-picker__confirm" bindtap="onConfirm">确定</view>
diff --git a/dist/area/index.wxss b/dist/area/index.wxss
index 071e7031..e1dbacc1 100644
--- a/dist/area/index.wxss
+++ b/dist/area/index.wxss
@@ -1 +1 @@
-@import '../common/index.wxss';.van-picker{-webkit-text-size-adjust:100%;position:relative;overflow:hidden;background-color:#fff;-webkit-user-select:none;user-select:none}.van-picker__toolbar{display:-webkit-flex;display:flex;-webkit-justify-content:space-between;justify-content:space-between;height:40px;font-size:16px;line-height:40px}.van-picker__cancel,.van-picker__confirm{padding:0 15px;color:#38f}.van-picker__cancel:active,.van-picker__confirm:active{background-color:#e8e8e8}.van-picker__title{max-width:50%;text-align:center}.van-picker__columns{position:relative}.van-picker__loading{display:-webkit-flex;display:flex;z-index:4;position:absolute;top:0;right:0;bottom:0;left:0;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;background-color:rgba(255,255,255,.9)}.van-picker-column{-webkit-flex:1;flex:1;overflow:hidden;font-size:16px;text-align:center}.van-picker-column__item{padding:0 5px;color:#999}.van-picker-column__item--selected{color:#000}.van-picker-column__item--disabled{opacity:.3}
\ No newline at end of file
+@import '../common/index.wxss';.van-picker{-webkit-text-size-adjust:100%;position:relative;overflow:hidden;background-color:#fff;-webkit-user-select:none;user-select:none}.van-picker__toolbar{display:-webkit-flex;display:flex;-webkit-justify-content:space-between;justify-content:space-between;height:44px;line-height:44px}.van-picker__cancel,.van-picker__confirm{color:#38f;padding:0 15px;font-size:14px}.van-picker__cancel:active,.van-picker__confirm:active{background-color:#e8e8e8}.van-picker__title{max-width:50%;font-size:16px;font-weight:500;text-align:center}.van-picker__columns{position:relative}.van-picker__loading{display:-webkit-flex;display:flex;z-index:4;position:absolute;top:0;right:0;bottom:0;left:0;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;background-color:rgba(255,255,255,.9)}.van-picker-column{-webkit-flex:1;flex:1;overflow:hidden;font-size:16px;text-align:center}.van-picker-column__item{padding:0 5px;color:#999}.van-picker-column__item--selected{font-weight:500;color:#333}.van-picker-column__item--disabled{opacity:.3}
\ No newline at end of file
diff --git a/dist/button/index.js b/dist/button/index.js
index 029eee5b..de514fdc 100644
--- a/dist/button/index.js
+++ b/dist/button/index.js
@@ -2,10 +2,12 @@ import { VantComponent } from '../common/component';
 import { button } from '../mixins/button';
 import { openType } from '../mixins/open-type';
 VantComponent({
+  classes: ['loading-class'],
   mixins: [button, openType],
   props: {
     plain: Boolean,
     block: Boolean,
+    round: Boolean,
     square: Boolean,
     loading: Boolean,
     disabled: Boolean,
@@ -23,13 +25,15 @@ VantComponent({
       var _this$data = this.data,
           type = _this$data.type,
           size = _this$data.size,
+          block = _this$data.block,
           plain = _this$data.plain,
-          disabled = _this$data.disabled,
-          loading = _this$data.loading,
+          round = _this$data.round,
           square = _this$data.square,
-          block = _this$data.block;
+          loading = _this$data.loading,
+          disabled = _this$data.disabled;
       return this.classNames("van-button--" + type, "van-button--" + size, {
         'van-button--block': block,
+        'van-button--round': round,
         'van-button--plain': plain,
         'van-button--square': square,
         'van-button--loading': loading,
diff --git a/dist/button/index.wxml b/dist/button/index.wxml
index 8e99a568..6ee5b74a 100644
--- a/dist/button/index.wxml
+++ b/dist/button/index.wxml
@@ -1,8 +1,6 @@
 <button
   class="custom-class van-button {{ classes }}"
   id="{{ id }}"
-  disabled="{{ disabled }}"
-  hover-class="button-hover"
   open-type="{{ openType }}"
   app-parameter="{{ appParameter }}"
   hover-stop-propagation="{{ hoverStopPropagation }}"
diff --git a/dist/button/index.wxss b/dist/button/index.wxss
index a331b49c..cf187884 100644
--- a/dist/button/index.wxss
+++ b/dist/button/index.wxss
@@ -1 +1 @@
-@import '../common/index.wxss';.van-button{position:relative;padding:0;display:inline-block;height:44px;line-height:42px;border-radius:3px;box-sizing:border-box;font-size:16px;text-align:center;vertical-align:middle;-webkit-appearance:none;-webkit-text-size-adjust:100%}.van-button::after{content:" ";position:absolute;top:50%;left:50%;opacity:0;width:100%;height:100%;border:inherit;border-color:#000;background-color:#000;border-radius:inherit;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}.van-button:active::after{opacity:.3}.van-button--unclickable::after{display:none}.van-button--default{color:#333;background-color:#fff;border:1px solid #eee}.van-button--primary{color:#fff;background-color:#4b0;border:1px solid #4b0}.van-button--danger{color:#fff;background-color:#f44;border:1px solid #f44}.van-button--warning{color:#fff;background-color:#f85;border:1px solid #f85}.van-button--plain{background-color:#fff}.van-button--plain.van-button--primary{color:#4b0}.van-button--plain.van-button--danger{color:#f44}.van-button--plain.van-button--warning{color:#f85}.van-button--large{width:100%;height:50px;line-height:48px}.van-button--normal{padding:0 15px;font-size:14px}.van-button--small{height:30px;padding:0 8px;min-width:60px;font-size:12px;line-height:28px}.van-button--mini{display:inline-block;width:50px;height:22px;line-height:20px;font-size:10px}.van-button--mini+.van-button--mini{margin-left:5px}.van-button--block{width:100%;display:block}.van-button--square{border-radius:0}.van-button--disabled{color:#999;background-color:#e8e8e8;border:1px solid #eee}
\ No newline at end of file
+@import '../common/index.wxss';.van-button{position:relative;padding:0;display:inline-block;height:44px;line-height:42px;border-radius:2px;box-sizing:border-box;font-size:16px;text-align:center;vertical-align:middle;-webkit-appearance:none;-webkit-text-size-adjust:100%}.van-button::after{content:" ";position:absolute;top:50%;left:50%;opacity:0;width:100%;height:100%;border:inherit;border-color:#000;background-color:#000;border-radius:inherit;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}.van-button:active::after{opacity:.3}.van-button--unclickable::after{display:none}.van-button--default{color:#333;background-color:#fff;border:1px solid #eee}.van-button--primary{color:#fff;background-color:#4b0;border:1px solid #4b0}.van-button--danger{color:#fff;background-color:#f44;border:1px solid #f44}.van-button--warning{color:#fff;background-color:#ff976a;border:1px solid #ff976a}.van-button--plain{background-color:#fff}.van-button--plain.van-button--primary{color:#4b0}.van-button--plain.van-button--danger{color:#f44}.van-button--plain.van-button--warning{color:#ff976a}.van-button--large{width:100%;height:50px;line-height:48px}.van-button--normal{padding:0 15px;font-size:14px}.van-button--small{height:30px;padding:0 8px;min-width:60px;font-size:12px;line-height:28px}.van-button--mini{display:inline-block;width:50px;height:22px;line-height:20px;font-size:10px}.van-button--mini+.van-button--mini{margin-left:5px}.van-button--block{width:100%;display:block}.van-button--round{border-radius:10em}.van-button--square{border-radius:0}.van-button--disabled{opacity:.5}
\ No newline at end of file
diff --git a/dist/card/index.js b/dist/card/index.js
index 44ac3249..2ea58c46 100644
--- a/dist/card/index.js
+++ b/dist/card/index.js
@@ -2,15 +2,32 @@ import { VantComponent } from '../common/component';
 VantComponent({
   classes: ['thumb-class', 'title-class', 'price-class', 'desc-class', 'num-class'],
   props: {
+    tag: String,
     num: String,
     desc: String,
     thumb: String,
     title: String,
     price: String,
     centered: Boolean,
+    thumbLink: String,
+    linkType: {
+      type: String,
+      value: 'navigateTo'
+    },
     currency: {
       type: String,
       value: '¥'
     }
+  },
+  methods: {
+    onClickThumb: function onClickThumb() {
+      var thumbLink = this.data.thumbLink;
+
+      if (thumbLink) {
+        wx[this.data.linkType]({
+          url: thumbLink
+        });
+      }
+    }
   }
 });
\ No newline at end of file
diff --git a/dist/card/index.json b/dist/card/index.json
index 467ce294..e9174076 100644
--- a/dist/card/index.json
+++ b/dist/card/index.json
@@ -1,3 +1,6 @@
 {
-  "component": true
+  "component": true,
+  "usingComponents": {
+    "van-tag": "../tag/index"
+  }
 }
diff --git a/dist/card/index.wxml b/dist/card/index.wxml
index ce82622b..d7dba72c 100644
--- a/dist/card/index.wxml
+++ b/dist/card/index.wxml
@@ -1,7 +1,15 @@
 <view class="custom-class van-card {{ centered ? 'van-card--center' : '' }}">
-  <view class="van-card__thumb">
+  <view class="van-card__thumb" bind:tap="onClickThumb">
     <image wx:if="{{ thumb }}" src="{{ thumb }}" class="van-card__img thumb-class" />
     <slot wx:else name="thumb" />
+    <van-tag
+      wx:if="{{ tag }}"
+      mark
+      type="danger"
+      custom-class="van-card__tag"
+    >
+      {{ tag }}
+    </van-tag>
   </view>
   <view class="van-card__content">
     <view wx:if="{{ title || price || price === 0 }}" class="van-card__row">
diff --git a/dist/card/index.wxss b/dist/card/index.wxss
index 5c5482a7..5c2d5e48 100644
--- a/dist/card/index.wxss
+++ b/dist/card/index.wxss
@@ -1 +1 @@
-@import '../common/index.wxss';.van-card{color:#333;height:100px;font-size:16px;background:#fafafa;position:relative;box-sizing:border-box;padding:5px 15px 5px 115px}.van-card--center,.van-card__thumb{-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center}.van-card__thumb{top:5px;left:15px;width:90px;height:90px;position:absolute}.van-card__img{border:none;max-width:100%;max-height:100%}.van-card,.van-card__row,.van-card__thumb{display:-webkit-flex;display:flex}.van-card__content{width:100%}.van-card__content--center{height:90px;-webkit-align-items:center;align-items:center}.van-card__desc,.van-card__title{line-height:20px;word-break:break-all}.van-card__title{max-height:40px}.van-card__desc{color:#666;font-size:12px;max-height:20px}.van-card__num,.van-card__price{-webkit-flex:1;flex:1;min-width:80px;line-height:20px;text-align:right}.van-card__price{font-size:14px}.van-card__num{color:#666;font-size:12px}.van-card__footer{right:15px;bottom:5px;position:absolute}.van-card__footer .van-button{margin-left:5px}
\ No newline at end of file
+@import '../common/index.wxss';.van-card{color:#333;height:100px;font-size:12px;background:#fafafa;position:relative;box-sizing:border-box;padding:5px 15px 5px 115px}.van-card--center,.van-card__thumb{-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center}.van-card__thumb{top:5px;left:15px;width:90px;height:90px;position:absolute}.van-card__img{border:none;max-width:100%;max-height:100%}.van-card,.van-card__row,.van-card__thumb{display:-webkit-flex;display:flex}.van-card__content{width:100%}.van-card__content--center{height:90px;-webkit-align-items:center;align-items:center}.van-card__desc,.van-card__title{line-height:20px;word-break:break-all}.van-card__title{max-height:40px}.van-card__desc{max-height:20px;color:#666}.van-card__num,.van-card__price{-webkit-flex:1;flex:1;min-width:80px;line-height:20px;text-align:right}.van-card__num{color:#666}.van-card__tag{position:absolute;top:2px;left:0}.van-card__tag{position:absolute;top:2px;left:0}.van-card__footer{right:15px;bottom:5px;position:absolute}.van-card__footer .van-button{margin-left:5px}
\ No newline at end of file
diff --git a/dist/checkbox-group/index.js b/dist/checkbox-group/index.js
index 053187db..31030eb2 100644
--- a/dist/checkbox-group/index.js
+++ b/dist/checkbox-group/index.js
@@ -1,5 +1,6 @@
 import { VantComponent } from '../common/component';
 VantComponent({
+  field: true,
   relation: {
     name: 'checkbox',
     type: 'descendant',
diff --git a/dist/checkbox/index.js b/dist/checkbox/index.js
index 5995c2b7..1049520d 100644
--- a/dist/checkbox/index.js
+++ b/dist/checkbox/index.js
@@ -1,12 +1,12 @@
 import { VantComponent } from '../common/component';
 VantComponent({
+  field: true,
   relation: {
     name: 'checkbox-group',
     type: 'ancestor'
   },
   classes: ['icon-class', 'label-class'],
   props: {
-    name: null,
     value: null,
     disabled: Boolean,
     labelDisabled: Boolean,
diff --git a/dist/field/index.wxss b/dist/field/index.wxss
index 235ce760..39fa31a4 100644
--- a/dist/field/index.wxss
+++ b/dist/field/index.wxss
@@ -1 +1 @@
-@import '../common/index.wxss';.van-field__body{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center}.van-field__body--textarea{min-height:24px}.van-field__input{border:0;margin:0;padding:0;width:100%;height:24px;resize:none;display:block;text-align:left;min-height:24px;line-height:inherit;box-sizing:border-box;background-color:transparent}.van-field__input--disabled{opacity:1;color:#666;background-color:transparent}.van-field__input--center{text-align:center}.van-field__input--right{text-align:right}.van-field__clear-root{height:24px}.van-field__button,.van-field__clear,.van-field__icon-container{-webkit-flex-shrink:0;flex-shrink:0}.van-field__clear,.van-field__icon-container{padding:0 10px;line-height:inherit;margin-right:-10px;vertical-align:middle}.van-field__clear{color:#c9c9c9}.van-field__icon-container{color:#999}.van-field__icon{display:block;font-size:16px;line-height:inherit}.van-field__button{padding-left:10px}.van-field__error-message{color:#f44;font-size:12px;text-align:left}.van-field--error{color:#f44}
\ No newline at end of file
+@import '../common/index.wxss';.van-field__body{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center}.van-field__body--textarea{min-height:24px}.van-field__input{border:0;margin:0;padding:0;width:100%;height:24px;resize:none;display:block;text-align:left;min-height:24px;line-height:inherit;box-sizing:border-box;background-color:transparent}.van-field__input--disabled{opacity:1;color:#666;background-color:transparent}.van-field__input--center{text-align:center}.van-field__input--right{text-align:right}.van-field__clear-root{height:24px}.van-field__button,.van-field__clear,.van-field__icon-container{-webkit-flex-shrink:0;flex-shrink:0}.van-field__clear,.van-field__icon-container{padding:0 10px;line-height:inherit;margin-right:-10px;vertical-align:middle}.van-field__clear{color:#c9c9c9;font-size:16px}.van-field__icon-container{color:#999}.van-field__icon{display:block;font-size:16px;line-height:inherit}.van-field__button{padding-left:10px}.van-field__error-message{color:#f44;font-size:12px;text-align:left}.van-field--error{color:#f44}
\ No newline at end of file
diff --git a/dist/nav-bar/index.wxss b/dist/nav-bar/index.wxss
index c9b3f243..6be0c4be 100644
--- a/dist/nav-bar/index.wxss
+++ b/dist/nav-bar/index.wxss
@@ -1 +1 @@
-@import '../common/index.wxss';.van-nav-bar{height:46px;position:relative;-webkit-user-select:none;user-select:none;text-align:center;line-height:46px;background-color:#fff}.van-nav-bar__arrow{color:#38f;vertical-align:middle;-webkit-transform:rotate(180deg);transform:rotate(180deg)}.van-nav-bar__arrow+.van-nav-bar__text{margin-left:-20px;padding-left:25px}.van-nav-bar--fixed{top:0;left:0;width:100%;position:fixed}.van-nav-bar__title{margin:0 auto;max-width:60%;font-size:16px}.van-nav-bar__left,.van-nav-bar__right{bottom:0;font-size:14px;position:absolute}.van-nav-bar__left{left:15px}.van-nav-bar__right{right:15px}.van-nav-bar__text{color:#38f;margin:0 -15px;padding:0 15px;display:inline-block;vertical-align:middle}.van-nav-bar__text:active{background-color:#e8e8e8}
\ No newline at end of file
+@import '../common/index.wxss';.van-nav-bar{height:46px;position:relative;-webkit-user-select:none;user-select:none;text-align:center;line-height:46px;background-color:#fff}.van-nav-bar__arrow{color:#38f;vertical-align:middle;-webkit-transform:rotate(180deg);transform:rotate(180deg)}.van-nav-bar__arrow+.van-nav-bar__text{margin-left:-20px;padding-left:25px}.van-nav-bar--fixed{top:0;left:0;width:100%;position:fixed}.van-nav-bar__title{margin:0 auto;max-width:60%;font-size:16px;font-weight:500}.van-nav-bar__left,.van-nav-bar__right{bottom:0;font-size:14px;position:absolute}.van-nav-bar__left{left:15px}.van-nav-bar__right{right:15px}.van-nav-bar__text{color:#38f;margin:0 -15px;padding:0 15px;display:inline-block;vertical-align:middle}.van-nav-bar__text:active{background-color:#e8e8e8}
\ No newline at end of file
diff --git a/dist/notice-bar/index.js b/dist/notice-bar/index.js
index 9304483f..872ccb53 100644
--- a/dist/notice-bar/index.js
+++ b/dist/notice-bar/index.js
@@ -1,6 +1,6 @@
 import { VantComponent } from '../common/component';
-var FONT_COLOR = '#f60';
-var BG_COLOR = '#fff7cc';
+var FONT_COLOR = '#ed6a0c';
+var BG_COLOR = '#fffbe8';
 VantComponent({
   props: {
     text: {
diff --git a/dist/notice-bar/index.wxml b/dist/notice-bar/index.wxml
index 46e81d2c..a4ed4b31 100644
--- a/dist/notice-bar/index.wxml
+++ b/dist/notice-bar/index.wxml
@@ -8,7 +8,7 @@
     <image src="{{ leftIcon }}" />
   </view>
   <view class="van-notice-bar__content-wrap">
-    <view class="van-notice-bar__content" animation="{{ animationData }}">
+    <view class="van-notice-bar__content {{ scrollable ? '' : 'van-ellipsis' }}" animation="{{ animationData }}">
       {{ text }}
     </view>
   </view>
diff --git a/dist/notice-bar/index.wxss b/dist/notice-bar/index.wxss
index 0024ff04..5429212a 100644
--- a/dist/notice-bar/index.wxss
+++ b/dist/notice-bar/index.wxss
@@ -1 +1 @@
-@import '../common/index.wxss';.van-notice-bar{display:-webkit-flex;display:flex;padding:9px 10px;font-size:12px;line-height:1.5}.van-notice-bar--within-icon{position:relative;padding-right:30px}.van-notice-bar__left-icon{height:18px;min-width:20px;padding-top:1px;box-sizing:border-box}.van-notice-bar__left-icon>image{width:16px;height:16px}.van-notice-bar__right-icon{position:absolute;top:10px;right:10px;font-size:15px;line-height:1}.van-notice-bar__content-wrap{position:relative;-webkit-flex:1;flex:1;height:18px;overflow:hidden}.van-notice-bar__content{position:absolute;white-space:nowrap}
\ No newline at end of file
+@import '../common/index.wxss';.van-notice-bar{display:-webkit-flex;display:flex;height:40px;padding:0 15px;font-size:14px;line-height:24px;-webkit-align-items:center;align-items:center}.van-notice-bar--within-icon{position:relative;padding-right:40px}.van-notice-bar__left-icon{height:18px;min-width:20px;box-sizing:border-box}.van-notice-bar__left-icon>image{width:16px;height:16px}.van-notice-bar__right-icon{position:absolute;top:10px;right:15px;font-size:16px}.van-notice-bar__content-wrap{-webkit-flex:1;flex:1;height:24px;overflow:hidden;position:relative}.van-notice-bar__content{position:absolute;white-space:nowrap}.van-notice-bar__content.van-ellipsis{max-width:100%}
\ No newline at end of file
diff --git a/dist/radio-group/index.js b/dist/radio-group/index.js
index aab92a33..66e86e22 100644
--- a/dist/radio-group/index.js
+++ b/dist/radio-group/index.js
@@ -1,5 +1,6 @@
 import { VantComponent } from '../common/component';
 VantComponent({
+  field: true,
   relation: {
     name: 'radio',
     type: 'descendant',
diff --git a/dist/radio/index.js b/dist/radio/index.js
index 47687634..77837afd 100644
--- a/dist/radio/index.js
+++ b/dist/radio/index.js
@@ -1,5 +1,6 @@
 import { VantComponent } from '../common/component';
 VantComponent({
+  field: true,
   relation: {
     name: 'radio-group',
     type: 'ancestor'
diff --git a/dist/submit-bar/index.wxss b/dist/submit-bar/index.wxss
index 27211936..72e3084a 100644
--- a/dist/submit-bar/index.wxss
+++ b/dist/submit-bar/index.wxss
@@ -1 +1 @@
-@import '../common/index.wxss';.van-submit-bar{z-index:100;position:fixed;bottom:0;left:0;width:100%;-webkit-user-select:none;user-select:none}.van-submit-bar__tip{padding:10px;background-color:#fff7cc;color:#f85;font-size:12px;line-height:18px}.van-submit-bar__bar{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;height:50px;background-color:#fff;font-size:14px}.van-submit-bar__text{-webkit-flex:1;flex:1;color:#333;font-weight:500;text-align:right}.van-submit-bar__price{padding-right:12px;color:#f44}.van-submit-bar__button button{width:110px}.van-submit-bar__button--disabled button{border:none!important}
\ No newline at end of file
+@import '../common/index.wxss';.van-submit-bar{z-index:100;position:fixed;bottom:0;left:0;width:100%;-webkit-user-select:none;user-select:none}.van-submit-bar__tip{padding:10px;background-color:#fff7cc;color:#ff976a;font-size:12px;line-height:18px}.van-submit-bar__bar{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;height:50px;background-color:#fff;font-size:14px}.van-submit-bar__text{-webkit-flex:1;flex:1;color:#333;font-weight:500;text-align:right}.van-submit-bar__price{padding-right:12px;color:#f44}.van-submit-bar__button button{width:110px}.van-submit-bar__button--disabled button{border:none!important}
\ No newline at end of file
diff --git a/dist/tabs/index.js b/dist/tabs/index.js
index 94cc1994..79311f8a 100644
--- a/dist/tabs/index.js
+++ b/dist/tabs/index.js
@@ -40,6 +40,10 @@ VantComponent({
       type: Number,
       value: 0.2
     },
+    zIndex: {
+      type: Number,
+      value: 99
+    },
     swipeThreshold: {
       type: Number,
       value: 4
diff --git a/dist/tabs/index.wxml b/dist/tabs/index.wxml
index 6c2bffe1..76e22bcb 100644
--- a/dist/tabs/index.wxml
+++ b/dist/tabs/index.wxml
@@ -1,5 +1,5 @@
 <view class="custom-class van-tabs van-tabs--{{ type }}">
-  <view class="van-tabs__wrap {{ scrollable ? 'van-tabs__wrap--scrollable' : '' }} {{ type === 'line' && border ? 'van-hairline--top-bottom' : '' }}">
+  <view style="z-index: {{ zIndex }}" class="van-tabs__wrap {{ scrollable ? 'van-tabs__wrap--scrollable' : '' }} {{ type === 'line' && border ? 'van-hairline--top-bottom' : '' }}">
     <scroll-view
       scroll-x="{{ scrollable }}"
       scroll-with-animation
diff --git a/dist/tabs/index.wxss b/dist/tabs/index.wxss
index 84e8d62b..db2563ed 100644
--- a/dist/tabs/index.wxss
+++ b/dist/tabs/index.wxss
@@ -1 +1 @@
-@import '../common/index.wxss';.van-tabs{position:relative;-webkit-tap-highlight-color:transparent}.van-tabs__wrap{top:0;left:0;right:0;z-index:99;position:absolute}.van-tabs__wrap--page-top{position:fixed}.van-tabs__wrap--content-bottom{top:auto;bottom:0}.van-tabs__wrap--scrollable .van-tab{-webkit-flex:0 0 22%;flex:0 0 22%}.van-tabs__nav{display:-webkit-flex;display:flex;-webkit-user-select:none;user-select:none;position:relative;background-color:#fff}.van-tabs__nav--line{height:100%}.van-tabs__nav--card{margin:0 15px;border-radius:2px;box-sizing:border-box;border:1px solid #f44;height:30px}.van-tabs__nav--card .van-tab{color:#f44;border-right:1px solid #f44;line-height:28px}.van-tabs__nav--card .van-tab:last-child{border-right:none}.van-tabs__nav--card .van-tab.van-tab--active{color:#fff;background-color:#f44}.van-tabs__line{z-index:1;left:0;bottom:0;height:2px;position:absolute;background-color:#f44}.van-tabs--line{padding-top:44px}.van-tabs--line .van-tabs__wrap{height:44px}.van-tabs--card{padding-top:30px}.van-tabs--card .van-tabs__wrap{height:30px}.van-tab{-webkit-flex:1;flex:1;cursor:pointer;padding:0 5px;font-size:14px;position:relative;color:#333;line-height:44px;text-align:center;box-sizing:border-box;background-color:#fff;min-width:0}.van-tab span{display:block}.van-tab--active{color:#f44}.van-tab--disabled{color:#c9c9c9}
\ No newline at end of file
+@import '../common/index.wxss';.van-tabs{position:relative;-webkit-tap-highlight-color:transparent}.van-tabs__wrap{top:0;left:0;right:0;position:absolute}.van-tabs__wrap--page-top{position:fixed}.van-tabs__wrap--content-bottom{top:auto;bottom:0}.van-tabs__wrap--scrollable .van-tab{-webkit-flex:0 0 22%;flex:0 0 22%}.van-tabs__nav{display:-webkit-flex;display:flex;-webkit-user-select:none;user-select:none;position:relative;background-color:#fff}.van-tabs__nav--line{height:100%}.van-tabs__nav--card{margin:0 15px;border-radius:2px;box-sizing:border-box;border:1px solid #f44;height:30px}.van-tabs__nav--card .van-tab{color:#f44;border-right:1px solid #f44;line-height:28px}.van-tabs__nav--card .van-tab:last-child{border-right:none}.van-tabs__nav--card .van-tab.van-tab--active{color:#fff;background-color:#f44}.van-tabs__line{z-index:1;left:0;bottom:0;height:2px;position:absolute;background-color:#f44}.van-tabs--line{padding-top:44px}.van-tabs--line .van-tabs__wrap{height:44px}.van-tabs--card{padding-top:30px}.van-tabs--card .van-tabs__wrap{height:30px}.van-tab{-webkit-flex:1;flex:1;cursor:pointer;padding:0 5px;font-size:14px;position:relative;color:#333;line-height:44px;text-align:center;box-sizing:border-box;background-color:#fff;min-width:0}.van-tab span{display:block}.van-tab--active{color:#f44}.van-tab--disabled{color:#c9c9c9}
\ No newline at end of file