[bugfix] SubmitBar: incomplete button text display (#1940)

youzan · Oct 17, 2018 · 9c5fa8a · 9c5fa8a
1 parent f90e96f
commit 9c5fa8a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/packages/submit-bar/index.vue b/packages/submit-bar/index.vue
@@ -12,7 +12,14 @@
           <span :class="b('price')">{{ currency }} {{ price | format }}</span>
         </template>
       </div>
-      <van-button :type="buttonType" :disabled="disabled" :loading="loading" @click="$emit('submit')">
+      <van-button
+        square
+        size="large"
+        :type="buttonType"
+        :disabled="disabled"
+        :loading="loading"
+        @click="$emit('submit')"
+      >
         {{ loading ? '' : buttonText }}
       </van-button>
     </div>

diff --git a/packages/submit-bar/test/__snapshots__/demo.spec.js.snap b/packages/submit-bar/test/__snapshots__/demo.spec.js.snap
@@ -7,7 +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--large van-button--square"><span class="van-button__text">
       提交订单
     </span></button>
       </div>
@@ -19,7 +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--large van-button--square van-button--disabled van-button--unclickable"><span class="van-button__text">
       提交订单
     </span></button>
       </div>
@@ -30,7 +30,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 van-button--loading van-button--unclickable">
+        <button class="van-button van-button--danger van-button--large van-button--square van-button--loading van-button--unclickable">
           <div class="van-loading van-loading--circular van-loading" style="color:;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>
@@ -50,7 +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--large van-button--square"><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
@@ -5,7 +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--large van-button--square van-button--disabled van-button--unclickable"><span class="van-button__text">
       
     </span></button>
   </div>

diff --git a/packages/vant-css/src/submit-bar.css b/packages/vant-css/src/submit-bar.css
@@ -42,12 +42,5 @@
 
   .van-button {
     width: 110px;
-    height: 100%;
-    border-radius: 0;
-    font-size: 16px;
-
-    &--disabled {
-      border: none;
-    }
   }
 }