diff --git a/packages/actionsheet/test/__snapshots__/demo.spec.js.snap b/packages/actionsheet/test/__snapshots__/demo.spec.js.snap
index 9e4a3dc9e..c93c354b6 100644
--- a/packages/actionsheet/test/__snapshots__/demo.spec.js.snap
+++ b/packages/actionsheet/test/__snapshots__/demo.spec.js.snap
@@ -3,18 +3,15 @@
 exports[`renders demo correctly 1`] = `
 <div>
   <div>
-    <button class="van-button van-button--default van-button--normal">
-      <!----><span class="van-button__text">弹出 Actionsheet</span></button>
+    <button class="van-button van-button--default van-button--normal"><span class="van-button__text">弹出 Actionsheet</span></button>
     <!---->
   </div>
   <div>
-    <button class="van-button van-button--default van-button--normal">
-      <!----><span class="van-button__text">弹出带取消按钮的 Actionsheet</span></button>
+    <button class="van-button van-button--default van-button--normal"><span class="van-button__text">弹出带取消按钮的 Actionsheet</span></button>
     <!---->
   </div>
   <div>
-    <button class="van-button van-button--default van-button--normal">
-      <!----><span class="van-button__text">弹出带标题的 Actionsheet</span></button>
+    <button class="van-button van-button--default van-button--normal"><span class="van-button__text">弹出带标题的 Actionsheet</span></button>
     <!---->
   </div>
 </div>
diff --git a/packages/address-edit/test/__snapshots__/demo.spec.js.snap b/packages/address-edit/test/__snapshots__/demo.spec.js.snap
index 935da4aff..35cb13b68 100644
--- a/packages/address-edit/test/__snapshots__/demo.spec.js.snap
+++ b/packages/address-edit/test/__snapshots__/demo.spec.js.snap
@@ -103,12 +103,10 @@ exports[`renders demo correctly 1`] = `
         </div>
       </div>
       <div class="van-address-edit__buttons">
-        <button class="van-button van-button--danger van-button--normal van-button--block">
-          <!----><span class="van-button__text">
+        <button class="van-button van-button--danger van-button--normal van-button--block"><span class="van-button__text">
       保存
     </span></button>
-        <button class="van-button van-button--default van-button--normal van-button--block">
-          <!----><span class="van-button__text">
+        <button class="van-button van-button--default van-button--normal van-button--block"><span class="van-button__text">
       删除
     </span></button>
       </div>
diff --git a/packages/address-edit/test/__snapshots__/index.spec.js.snap b/packages/address-edit/test/__snapshots__/index.spec.js.snap
index 67febb89d..c5c36e5f8 100644
--- a/packages/address-edit/test/__snapshots__/index.spec.js.snap
+++ b/packages/address-edit/test/__snapshots__/index.spec.js.snap
@@ -73,8 +73,7 @@ exports[`create a AddressEdit 1`] = `
     <!---->
   </div>
   <div class="van-address-edit__buttons">
-    <button class="van-button van-button--danger van-button--normal van-button--block">
-      <!----><span class="van-button__text">
+    <button class="van-button van-button--danger van-button--normal van-button--block"><span class="van-button__text">
       保存
     </span></button>
     <!---->
@@ -207,8 +206,7 @@ exports[`create a AddressEdit with props 1`] = `
     </div>
   </div>
   <div class="van-address-edit__buttons">
-    <button class="van-button van-button--danger van-button--normal van-button--block">
-      <!----><span class="van-button__text">
+    <button class="van-button van-button--danger van-button--normal van-button--block"><span class="van-button__text">
       保存
     </span></button>
     <!---->
diff --git a/packages/address-list/test/__snapshots__/demo.spec.js.snap b/packages/address-list/test/__snapshots__/demo.spec.js.snap
index aece16b0b..ba7d797b7 100644
--- a/packages/address-list/test/__snapshots__/demo.spec.js.snap
+++ b/packages/address-list/test/__snapshots__/demo.spec.js.snap
@@ -41,8 +41,7 @@ exports[`renders demo correctly 1`] = `
           </i>
         </div>
       </div>
-      <button class="van-button van-button--danger van-button--large van-button--square van-address-list__add">
-        <!----><span class="van-button__text">新增地址</span></button>
+      <button class="van-button van-button--danger van-button--large van-button--square van-address-list__add"><span class="van-button__text">新增地址</span></button>
     </div>
   </div>
 </div>
diff --git a/packages/button/index.vue b/packages/button/index.vue
index 6fe9f6841..f21ec7a5f 100644
--- a/packages/button/index.vue
+++ b/packages/button/index.vue
@@ -19,7 +19,7 @@
     @click="onClick"
   >
     <loading v-if="loading" size="20px" :color="type === 'default' ? 'black' : 'white'" />
-    <span :class="b('text')">
+    <span v-else :class="b('text')">
       <slot>{{ text }}</slot>
     </span>
   </component>
diff --git a/packages/button/test/__snapshots__/demo.spec.js.snap b/packages/button/test/__snapshots__/demo.spec.js.snap
index 8b2fcc606..d3186b523 100644
--- a/packages/button/test/__snapshots__/demo.spec.js.snap
+++ b/packages/button/test/__snapshots__/demo.spec.js.snap
@@ -4,52 +4,39 @@ exports[`renders demo correctly 1`] = `
 <div>
   <div>
     <div class="demo-button-row">
-      <button class="van-button van-button--default van-button--normal">
-        <!----><span class="van-button__text">默认按钮</span></button>
-      <button class="van-button van-button--primary van-button--normal">
-        <!----><span class="van-button__text">主要按钮</span></button>
+      <button class="van-button van-button--default van-button--normal"><span class="van-button__text">默认按钮</span></button>
+      <button class="van-button van-button--primary van-button--normal"><span class="van-button__text">主要按钮</span></button>
     </div>
-    <button class="van-button van-button--warning van-button--normal">
-      <!----><span class="van-button__text">警告按钮</span></button>
-    <button class="van-button van-button--danger van-button--normal">
-      <!----><span class="van-button__text">危险按钮</span></button>
+    <button class="van-button van-button--warning van-button--normal"><span class="van-button__text">警告按钮</span></button>
+    <button class="van-button van-button--danger van-button--normal"><span class="van-button__text">危险按钮</span></button>
   </div>
   <div>
     <div class="demo-button-row">
-      <button class="van-button van-button--default van-button--normal van-button--plain">
-        <!----><span class="van-button__text">默认按钮</span></button>
-      <button class="van-button van-button--primary van-button--normal van-button--plain">
-        <!----><span class="van-button__text">主要按钮</span></button>
+      <button class="van-button van-button--default van-button--normal van-button--plain"><span class="van-button__text">默认按钮</span></button>
+      <button class="van-button van-button--primary van-button--normal van-button--plain"><span class="van-button__text">主要按钮</span></button>
     </div>
-    <button class="van-button van-button--warning van-button--normal van-button--plain">
-      <!----><span class="van-button__text">警告按钮</span></button>
-    <button class="van-button van-button--danger van-button--normal van-button--plain">
-      <!----><span class="van-button__text">危险按钮</span></button>
+    <button class="van-button van-button--warning van-button--normal van-button--plain"><span class="van-button__text">警告按钮</span></button>
+    <button class="van-button van-button--danger van-button--normal van-button--plain"><span class="van-button__text">危险按钮</span></button>
   </div>
   <div>
-    <button class="van-button van-button--default van-button--large">
-      <!----><span class="van-button__text">大号按钮</span></button>
-    <button class="van-button van-button--default van-button--normal">
-      <!----><span class="van-button__text">普通按钮</span></button>
-    <button class="van-button van-button--default van-button--small">
-      <!----><span class="van-button__text">小型按钮</span></button>
-    <button class="van-button van-button--default van-button--mini">
-      <!----><span class="van-button__text">迷你按钮</span></button>
+    <button class="van-button van-button--default van-button--large"><span class="van-button__text">大号按钮</span></button>
+    <button class="van-button van-button--default van-button--normal"><span class="van-button__text">普通按钮</span></button>
+    <button class="van-button van-button--default van-button--small"><span class="van-button__text">小型按钮</span></button>
+    <button class="van-button van-button--default van-button--mini"><span class="van-button__text">迷你按钮</span></button>
   </div>
   <div>
-    <button disabled="disabled" class="van-button van-button--default van-button--normal van-button--disabled van-button--unclickable">
-      <!----><span class="van-button__text">禁用状态</span></button>
+    <button disabled="disabled" class="van-button van-button--default van-button--normal van-button--disabled van-button--unclickable"><span class="van-button__text">禁用状态</span></button>
   </div>
   <div>
     <button class="van-button van-button--default van-button--normal van-button--loading van-button--unclickable">
-      <div class="van-loading van-loading--circular van-loading--black" style="color:#c9c9c9;width:20px;height:20px;"><span class="van-loading__spinner van-loading__spinner--circular"> <svg viewBox="25 25 50 50" class="van-loading__circular"><circle cx="50" cy="50" r="20" fill="none"></circle></svg></span></div> <span class="van-button__text"></span></button>
-    <button
-      class="van-button van-button--primary van-button--normal van-button--loading van-button--unclickable">
-      <div class="van-loading van-loading--circular van-loading--white" style="color:white;width:20px;height:20px;"><span class="van-loading__spinner van-loading__spinner--circular"> <svg viewBox="25 25 50 50" class="van-loading__circular"><circle cx="50" cy="50" r="20" fill="none"></circle></svg></span></div> <span class="van-button__text"></span></button>
+      <div class="van-loading van-loading--circular van-loading--black" style="color:#c9c9c9;width:20px;height:20px;"><span class="van-loading__spinner van-loading__spinner--circular"> <svg viewBox="25 25 50 50" class="van-loading__circular"><circle cx="50" cy="50" r="20" fill="none"></circle></svg></span></div>
+    </button>
+    <button class="van-button van-button--primary van-button--normal van-button--loading van-button--unclickable">
+      <div class="van-loading van-loading--circular van-loading--white" style="color:white;width:20px;height:20px;"><span class="van-loading__spinner van-loading__spinner--circular"> <svg viewBox="25 25 50 50" class="van-loading__circular"><circle cx="50" cy="50" r="20" fill="none"></circle></svg></span></div>
+    </button>
   </div>
   <div>
-    <a href="https://www.youzan.com" target="_blank" class="van-button van-button--default van-button--normal">
-      <!----><span class="van-button__text">
+    <a href="https://www.youzan.com" target="_blank" class="van-button van-button--default van-button--normal"><span class="van-button__text">
       按钮
     </span></a>
   </div>
diff --git a/packages/card/test/__snapshots__/demo.spec.js.snap b/packages/card/test/__snapshots__/demo.spec.js.snap
index a0dd32b36..9593e4948 100644
--- a/packages/card/test/__snapshots__/demo.spec.js.snap
+++ b/packages/card/test/__snapshots__/demo.spec.js.snap
@@ -37,10 +37,8 @@ exports[`renders demo correctly 1`] = `
       </div>
       <div class="van-card__footer">
         <div>
-          <button class="van-button van-button--default van-button--mini">
-            <!----><span class="van-button__text">按钮</span></button>
-          <button class="van-button van-button--default van-button--mini">
-            <!----><span class="van-button__text">按钮</span></button>
+          <button class="van-button van-button--default van-button--mini"><span class="van-button__text">按钮</span></button>
+          <button class="van-button van-button--default van-button--mini"><span class="van-button__text">按钮</span></button>
         </div>
       </div>
     </div>
diff --git a/packages/circle/test/__snapshots__/demo.spec.js.snap b/packages/circle/test/__snapshots__/demo.spec.js.snap
index d1ba3c926..c353c6153 100644
--- a/packages/circle/test/__snapshots__/demo.spec.js.snap
+++ b/packages/circle/test/__snapshots__/demo.spec.js.snap
@@ -18,10 +18,8 @@ exports[`renders demo correctly 1`] = `
       <div class="van-circle__text">0%</div>
     </div>
     <div>
-      <button class="van-button van-button--primary van-button--small">
-        <!----><span class="van-button__text">增加</span></button>
-      <button class="van-button van-button--danger van-button--small">
-        <!----><span class="van-button__text">减少</span></button>
+      <button class="van-button van-button--primary van-button--small"><span class="van-button__text">增加</span></button>
+      <button class="van-button van-button--danger van-button--small"><span class="van-button__text">减少</span></button>
     </div>
   </div>
 </div>
diff --git a/packages/contact-card/test/__snapshots__/demo.spec.js.snap b/packages/contact-card/test/__snapshots__/demo.spec.js.snap
index 4187db50d..815447e8d 100644
--- a/packages/contact-card/test/__snapshots__/demo.spec.js.snap
+++ b/packages/contact-card/test/__snapshots__/demo.spec.js.snap
@@ -29,8 +29,7 @@ exports[`renders demo correctly 1`] = `
             </div>
           </div>
         </div>
-        <button class="van-button van-button--danger van-button--large van-button--square van-contact-list__add">
-          <!----><span class="van-button__text">新建联系人</span></button>
+        <button class="van-button van-button--danger van-button--large van-button--square van-contact-list__add"><span class="van-button__text">新建联系人</span></button>
       </div>
     </div>
     <div name="popup-slide-bottom" class="van-popup van-popup--bottom" style="display:none;">
@@ -70,8 +69,7 @@ exports[`renders demo correctly 1`] = `
           </div>
         </div>
         <div class="van-contact-edit__buttons">
-          <button class="van-button van-button--danger van-button--normal van-button--block">
-            <!----><span class="van-button__text">保存</span></button>
+          <button class="van-button van-button--danger van-button--normal van-button--block"><span class="van-button__text">保存</span></button>
           <!---->
         </div>
       </div>
diff --git a/packages/dialog/test/__snapshots__/demo.spec.js.snap b/packages/dialog/test/__snapshots__/demo.spec.js.snap
index 2836136d4..a63a99b3e 100644
--- a/packages/dialog/test/__snapshots__/demo.spec.js.snap
+++ b/packages/dialog/test/__snapshots__/demo.spec.js.snap
@@ -3,18 +3,14 @@
 exports[`renders demo correctly 1`] = `
 <div>
   <div>
-    <button class="van-button van-button--default van-button--normal">
-      <!----><span class="van-button__text">Alert</span></button>
-    <button class="van-button van-button--default van-button--normal">
-      <!----><span class="van-button__text">无标题 Alert</span></button>
+    <button class="van-button van-button--default van-button--normal"><span class="van-button__text">Alert</span></button>
+    <button class="van-button van-button--default van-button--normal"><span class="van-button__text">无标题 Alert</span></button>
   </div>
   <div>
-    <button class="van-button van-button--default van-button--normal">
-      <!----><span class="van-button__text">Confirm</span></button>
+    <button class="van-button van-button--default van-button--normal"><span class="van-button__text">Confirm</span></button>
   </div>
   <div>
-    <button class="van-button van-button--default van-button--normal">
-      <!----><span class="van-button__text">高级用法</span></button>
+    <button class="van-button van-button--default van-button--normal"><span class="van-button__text">高级用法</span></button>
     <div name="van-dialog-bounce" class="van-dialog" style="display:none;">
       <!---->
       <div class="van-dialog__content">
@@ -52,12 +48,10 @@ exports[`renders demo correctly 1`] = `
         </div>
       </div>
       <div class="van-hairline--top van-dialog__footer van-dialog__footer--buttons">
-        <button class="van-button van-button--default van-button--large van-dialog__cancel">
-          <!----><span class="van-button__text">
+        <button class="van-button van-button--default van-button--large van-dialog__cancel"><span class="van-button__text">
         取消
       </span></button>
-        <button class="van-button van-button--default van-button--large van-dialog__confirm van-hairline--left">
-          <!----><span class="van-button__text">
+        <button class="van-button van-button--default van-button--large van-dialog__confirm van-hairline--left"><span class="van-button__text">
         确认
       </span></button>
       </div>
diff --git a/packages/field/test/__snapshots__/demo.spec.js.snap b/packages/field/test/__snapshots__/demo.spec.js.snap
index e0348a7df..9d19d7ade 100644
--- a/packages/field/test/__snapshots__/demo.spec.js.snap
+++ b/packages/field/test/__snapshots__/demo.spec.js.snap
@@ -151,8 +151,7 @@ exports[`renders demo correctly 1`] = `
             <!---->
             <!---->
             <div class="van-field__button">
-              <button class="van-button van-button--primary van-button--small">
-                <!----><span class="van-button__text">发送验证码</span></button>
+              <button class="van-button van-button--primary van-button--small"><span class="van-button__text">发送验证码</span></button>
             </div>
           </div>
           <!---->
diff --git a/packages/goods-action/test/__snapshots__/demo.spec.js.snap b/packages/goods-action/test/__snapshots__/demo.spec.js.snap
index 986b62bc9..ee7d70e4d 100644
--- a/packages/goods-action/test/__snapshots__/demo.spec.js.snap
+++ b/packages/goods-action/test/__snapshots__/demo.spec.js.snap
@@ -12,10 +12,8 @@ exports[`renders demo correctly 1`] = `
         <i class="van-icon van-icon-cart van-goods-action-mini-btn__icon" style="color:undefined;font-size:undefined;">
           <!---->
         </i> 购物车</a>
-      <a class="van-button van-button--default van-button--normal van-button--bottom-action van-goods-action-big-btn">
-        <!----><span class="van-button__text">加入购物车</span></a>
-      <a class="van-button van-button--primary van-button--normal van-button--bottom-action van-goods-action-big-btn">
-        <!----><span class="van-button__text">立即购买</span></a>
+      <a class="van-button van-button--default van-button--normal van-button--bottom-action van-goods-action-big-btn"><span class="van-button__text">加入购物车</span></a>
+      <a class="van-button van-button--primary van-button--normal van-button--bottom-action van-goods-action-big-btn"><span class="van-button__text">立即购买</span></a>
     </div>
   </div>
   <div>
@@ -32,10 +30,8 @@ exports[`renders demo correctly 1`] = `
         <i class="van-icon van-icon-shop van-goods-action-mini-btn__icon" style="color:undefined;font-size:undefined;">
           <!---->
         </i> 店铺</a>
-      <a class="van-button van-button--default van-button--normal van-button--bottom-action van-goods-action-big-btn">
-        <!----><span class="van-button__text">加入购物车</span></a>
-      <a class="van-button van-button--primary van-button--normal van-button--bottom-action van-goods-action-big-btn">
-        <!----><span class="van-button__text">立即购买</span></a>
+      <a class="van-button van-button--default van-button--normal van-button--bottom-action van-goods-action-big-btn"><span class="van-button__text">加入购物车</span></a>
+      <a class="van-button van-button--primary van-button--normal van-button--bottom-action van-goods-action-big-btn"><span class="van-button__text">立即购买</span></a>
     </div>
   </div>
 </div>
diff --git a/packages/number-keyboard/test/__snapshots__/demo.spec.js.snap b/packages/number-keyboard/test/__snapshots__/demo.spec.js.snap
index a3bf65d48..2a70873db 100644
--- a/packages/number-keyboard/test/__snapshots__/demo.spec.js.snap
+++ b/packages/number-keyboard/test/__snapshots__/demo.spec.js.snap
@@ -3,8 +3,7 @@
 exports[`renders demo correctly 1`] = `
 <div>
   <div>
-    <button class="van-button van-button--default van-button--normal">
-      <!----><span class="van-button__text">
+    <button class="van-button van-button--default van-button--normal"><span class="van-button__text">
       弹出默认键盘
     </span></button>
     <div name="van-slide-bottom" class="van-number-keyboard van-number-keyboard--default" style="z-index:100;">
@@ -27,8 +26,7 @@ exports[`renders demo correctly 1`] = `
     </div>
   </div>
   <div>
-    <button class="van-button van-button--default van-button--normal">
-      <!----><span class="van-button__text">
+    <button class="van-button van-button--default van-button--normal"><span class="van-button__text">
       弹出自定义键盘
     </span></button>
     <div name="van-slide-bottom" class="van-number-keyboard van-number-keyboard--custom" style="z-index:100;display:none;">
diff --git a/packages/panel/test/__snapshots__/demo.spec.js.snap b/packages/panel/test/__snapshots__/demo.spec.js.snap
index a10d39653..c6d57f2dc 100644
--- a/packages/panel/test/__snapshots__/demo.spec.js.snap
+++ b/packages/panel/test/__snapshots__/demo.spec.js.snap
@@ -33,10 +33,8 @@ exports[`renders demo correctly 1`] = `
       </div>
       <div class="van-hairline--top van-panel__footer">
         <div>
-          <button class="van-button van-button--default van-button--small">
-            <!----><span class="van-button__text">按钮</span></button>
-          <button class="van-button van-button--danger van-button--small">
-            <!----><span class="van-button__text">按钮</span></button>
+          <button class="van-button van-button--default van-button--small"><span class="van-button__text">按钮</span></button>
+          <button class="van-button van-button--danger van-button--small"><span class="van-button__text">按钮</span></button>
         </div>
       </div>
     </div>
diff --git a/packages/popup/test/__snapshots__/demo.spec.js.snap b/packages/popup/test/__snapshots__/demo.spec.js.snap
index 4a3766382..817394605 100644
--- a/packages/popup/test/__snapshots__/demo.spec.js.snap
+++ b/packages/popup/test/__snapshots__/demo.spec.js.snap
@@ -3,19 +3,15 @@
 exports[`renders demo correctly 1`] = `
 <div>
   <div>
-    <button class="van-button van-button--default van-button--normal">
-      <!----><span class="van-button__text">弹出 Popup</span></button>
+    <button class="van-button van-button--default van-button--normal"><span class="van-button__text">弹出 Popup</span></button>
     <!---->
   </div>
   <div>
-    <button class="van-button van-button--default van-button--normal">
-      <!----><span class="van-button__text">底部弹出</span></button>
+    <button class="van-button van-button--default van-button--normal"><span class="van-button__text">底部弹出</span></button>
     <!---->
-    <button class="van-button van-button--default van-button--normal">
-      <!----><span class="van-button__text">顶部弹出</span></button>
+    <button class="van-button van-button--default van-button--normal"><span class="van-button__text">顶部弹出</span></button>
     <!---->
-    <button class="van-button van-button--default van-button--normal">
-      <!----><span class="van-button__text">右侧弹出</span></button>
+    <button class="van-button van-button--default van-button--normal"><span class="van-button__text">右侧弹出</span></button>
     <!---->
   </div>
 </div>
diff --git a/packages/sku/test/__snapshots__/demo.spec.js.snap b/packages/sku/test/__snapshots__/demo.spec.js.snap
index 1a6785772..2ab5cc837 100644
--- a/packages/sku/test/__snapshots__/demo.spec.js.snap
+++ b/packages/sku/test/__snapshots__/demo.spec.js.snap
@@ -5,22 +5,19 @@ exports[`renders demo correctly 1`] = `
   <div>
     <div class="sku-container">
       <!---->
-      <button class="van-button van-button--primary van-button--normal van-button--block">
-        <!----><span class="van-button__text">基础用法</span></button>
+      <button class="van-button van-button--primary van-button--normal van-button--block"><span class="van-button__text">基础用法</span></button>
     </div>
   </div>
   <div>
     <div class="sku-container">
       <!---->
-      <button class="van-button van-button--primary van-button--normal van-button--block">
-        <!----><span class="van-button__text">自定义步进器相关配置</span></button>
+      <button class="van-button van-button--primary van-button--normal van-button--block"><span class="van-button__text">自定义步进器相关配置</span></button>
     </div>
   </div>
   <div>
     <div class="sku-container">
       <!---->
-      <button class="van-button van-button--primary van-button--normal van-button--block">
-        <!----><span class="van-button__text">高级用法</span></button>
+      <button class="van-button van-button--primary van-button--normal van-button--block"><span class="van-button__text">高级用法</span></button>
     </div>
   </div>
 </div>
diff --git a/packages/steps/test/__snapshots__/demo.spec.js.snap b/packages/steps/test/__snapshots__/demo.spec.js.snap
index ce66c4623..69d0b6b1b 100644
--- a/packages/steps/test/__snapshots__/demo.spec.js.snap
+++ b/packages/steps/test/__snapshots__/demo.spec.js.snap
@@ -38,8 +38,7 @@ exports[`renders demo correctly 1`] = `
         </div>
       </div>
     </div>
-    <button class="van-button van-button--default van-button--normal">
-      <!----><span class="van-button__text">下一步</span></button>
+    <button class="van-button van-button--default van-button--normal"><span class="van-button__text">下一步</span></button>
   </div>
   <div>
     <div class="van-steps van-steps--horizontal">
diff --git a/packages/submit-bar/test/__snapshots__/demo.spec.js.snap b/packages/submit-bar/test/__snapshots__/demo.spec.js.snap
index a9ca687aa..e54f1fd58 100644
--- a/packages/submit-bar/test/__snapshots__/demo.spec.js.snap
+++ b/packages/submit-bar/test/__snapshots__/demo.spec.js.snap
@@ -7,8 +7,7 @@ exports[`renders demo correctly 1`] = `
       <!---->
       <div class="van-submit-bar__bar">
         <div class="van-submit-bar__text"><span>合计：</span> <span class="van-submit-bar__price">¥ 30.50</span></div>
-        <button class="van-button van-button--danger van-button--normal">
-          <!----><span class="van-button__text">
+        <button class="van-button van-button--danger van-button--normal"><span class="van-button__text">
       提交订单
     </span></button>
       </div>
@@ -20,8 +19,7 @@ exports[`renders demo correctly 1`] = `
         您的收货地址不支持同城送, 我们已为您推荐快递</div>
       <div class="van-submit-bar__bar">
         <div class="van-submit-bar__text"><span>合计：</span> <span class="van-submit-bar__price">¥ 30.50</span></div>
-        <button disabled="disabled" class="van-button van-button--danger van-button--normal van-button--disabled van-button--unclickable">
-          <!----><span class="van-button__text">
+        <button disabled="disabled" class="van-button van-button--danger van-button--normal van-button--disabled van-button--unclickable"><span class="van-button__text">
       提交订单
     </span></button>
       </div>
@@ -33,9 +31,8 @@ exports[`renders demo correctly 1`] = `
       <div class="van-submit-bar__bar">
         <div class="van-submit-bar__text"><span>合计：</span> <span class="van-submit-bar__price">¥ 30.50</span></div>
         <button class="van-button van-button--danger van-button--normal van-button--loading van-button--unclickable">
-          <div class="van-loading van-loading--circular van-loading--white" style="color:white;width:20px;height:20px;"><span class="van-loading__spinner van-loading__spinner--circular"> <svg viewBox="25 25 50 50" class="van-loading__circular"><circle cx="50" cy="50" r="20" fill="none"></circle></svg></span></div> <span class="van-button__text">
-      
-    </span></button>
+          <div class="van-loading van-loading--circular van-loading--white" style="color:white;width:20px;height:20px;"><span class="van-loading__spinner van-loading__spinner--circular"> <svg viewBox="25 25 50 50" class="van-loading__circular"><circle cx="50" cy="50" r="20" fill="none"></circle></svg></span></div>
+        </button>
       </div>
     </div>
   </div>
@@ -53,8 +50,7 @@ exports[`renders demo correctly 1`] = `
             </i>
           </div> <span class="van-checkbox__label">全选</span></div>
         <div class="van-submit-bar__text"><span>合计：</span> <span class="van-submit-bar__price">¥ 30.50</span></div>
-        <button class="van-button van-button--danger van-button--normal">
-          <!----><span class="van-button__text">
+        <button class="van-button van-button--danger van-button--normal"><span class="van-button__text">
       提交订单
     </span></button>
       </div>
diff --git a/packages/submit-bar/test/__snapshots__/index.spec.js.snap b/packages/submit-bar/test/__snapshots__/index.spec.js.snap
index d894deb26..5d331b8b5 100644
--- a/packages/submit-bar/test/__snapshots__/index.spec.js.snap
+++ b/packages/submit-bar/test/__snapshots__/index.spec.js.snap
@@ -5,8 +5,7 @@ exports[`submit 1`] = `
   <!---->
   <div class="van-submit-bar__bar">
     <div class="van-submit-bar__text"><span>合计：</span> <span class="van-submit-bar__price">¥ 0.00</span></div>
-    <button disabled="disabled" class="van-button van-button--danger van-button--normal van-button--disabled van-button--unclickable">
-      <!----><span class="van-button__text">
+    <button disabled="disabled" class="van-button van-button--danger van-button--normal van-button--disabled van-button--unclickable"><span class="van-button__text">
       
     </span></button>
   </div>
diff --git a/packages/tab/demo/index.vue b/packages/tab/demo/index.vue
index 00c187f65..a24b9e93f 100644
--- a/packages/tab/demo/index.vue
+++ b/packages/tab/demo/index.vue
@@ -9,7 +9,7 @@
     </demo-block>
 
     <demo-block :title="$t('title2')">
-      <van-tabs sticky @scroll="subscribeSticky">
+      <van-tabs @scroll="onScroll">
         <van-tab v-for="index in 8" :title="$t('tab') + index" :key="index">
           {{ $t('content') }} {{ index }}
         </van-tab>
@@ -113,7 +113,7 @@ export default {
       this.$toast(title);
     },
 
-    subscribeSticky(e) {
+    onScroll(e) {
       console.log(e);
     }
   }
diff --git a/packages/tabs/index.vue b/packages/tabs/index.vue
index 0ad2eac4b..d3bdab567 100644
--- a/packages/tabs/index.vue
+++ b/packages/tabs/index.vue
@@ -48,6 +48,7 @@ export default create({
   },
 
   props: {
+    color: String,
     sticky: Boolean,
     lineWidth: Number,
     swipeable: Boolean,
@@ -70,8 +71,7 @@ export default create({
     offsetTop: {
       type: Number,
       default: 0
-    },
-    color: String
+    }
   },
 
   data() {
diff --git a/packages/toast/test/__snapshots__/demo.spec.js.snap b/packages/toast/test/__snapshots__/demo.spec.js.snap
index c77ae701f..dbef15fc0 100644
--- a/packages/toast/test/__snapshots__/demo.spec.js.snap
+++ b/packages/toast/test/__snapshots__/demo.spec.js.snap
@@ -3,22 +3,17 @@
 exports[`renders demo correctly 1`] = `
 <div>
   <div>
-    <button class="van-button van-button--default van-button--normal">
-      <!----><span class="van-button__text">文字提示</span></button>
+    <button class="van-button van-button--default van-button--normal"><span class="van-button__text">文字提示</span></button>
   </div>
   <div>
-    <button class="van-button van-button--default van-button--normal">
-      <!----><span class="van-button__text">加载提示</span></button>
+    <button class="van-button van-button--default van-button--normal"><span class="van-button__text">加载提示</span></button>
   </div>
   <div>
-    <button class="van-button van-button--default van-button--normal">
-      <!----><span class="van-button__text">成功提示</span></button>
-    <button class="van-button van-button--default van-button--normal">
-      <!----><span class="van-button__text">失败提示</span></button>
+    <button class="van-button van-button--default van-button--normal"><span class="van-button__text">成功提示</span></button>
+    <button class="van-button van-button--default van-button--normal"><span class="van-button__text">失败提示</span></button>
   </div>
   <div>
-    <button class="van-button van-button--default van-button--normal">
-      <!----><span class="van-button__text">高级用法</span></button>
+    <button class="van-button van-button--default van-button--normal"><span class="van-button__text">高级用法</span></button>
   </div>
 </div>
 `;
diff --git a/packages/vant-css/src/button.css b/packages/vant-css/src/button.css
index d69ecc21a..eed4346c4 100644
--- a/packages/vant-css/src/button.css
+++ b/packages/vant-css/src/button.css
@@ -99,10 +99,6 @@
     .van-loading {
       display: inline-block;
     }
-
-    .van-button__text {
-      display: none;
-    }
   }
 
   /* mini图标默认宽度50px，文字不能超过4个 */