blackteay/vant
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant.git synced 2025-04-06 03:57:59 +08:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
neverland 2018-10-17 10:11:12 +08:00 committed by GitHub
parent f90e96f701
commit 9c5fa8a9d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/submit-bar/index.vue
View File

@ -12,7 +12,14 @@
<span :class="b('price')">{{ currency }} {{ price | format }}</span> <span :class="b('price')">{{ currency }} {{ price | format }}</span>
</template> </template>
</div> </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 }} {{ loading ? '' : buttonText }}
</van-button> </van-button>
</div> </div>

8
packages/submit-bar/test/__snapshots__/demo.spec.js.snap
View File

@ -7,7 +7,7 @@ exports[`renders demo correctly 1`] = `
<!----> <!---->
<div class="van-submit-bar__bar"> <div class="van-submit-bar__bar">
<div class="van-submit-bar__text"><span>合计：</span> <span class="van-submit-bar__price">¥ 30.50</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> </span></button>
</div> </div>
@ -19,7 +19,7 @@ exports[`renders demo correctly 1`] = `
你的收货地址不支持同城送, 我们已为你推荐快递</div> 你的收货地址不支持同城送, 我们已为你推荐快递</div>
<div class="van-submit-bar__bar"> <div class="van-submit-bar__bar">
<div class="van-submit-bar__text"><span>合计：</span> <span class="van-submit-bar__price">¥ 30.50</span></div> <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> </span></button>
</div> </div>
@ -30,7 +30,7 @@ exports[`renders demo correctly 1`] = `
<!----> <!---->
<div class="van-submit-bar__bar"> <div class="van-submit-bar__bar">
<div class="van-submit-bar__text"><span>合计：</span> <span class="van-submit-bar__price">¥ 30.50</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 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> <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> </button>
</div> </div>
@ -50,7 +50,7 @@ exports[`renders demo correctly 1`] = `
</i> </i>
</div> <span class="van-checkbox__label">全选</span></div> </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> <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> </span></button>
</div> </div>

2
packages/submit-bar/test/__snapshots__/index.spec.js.snap
View File

@ -5,7 +5,7 @@ exports[`submit 1`] = `
<!----> <!---->
<div class="van-submit-bar__bar"> <div class="van-submit-bar__bar">
<div class="van-submit-bar__text"><span>合计：</span> <span class="van-submit-bar__price">¥ 0.00</span></div> <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> </span></button>
</div> </div>

7
packages/vant-css/src/submit-bar.css
View File

@ -42,12 +42,5 @@
.van-button { .van-button {
width: 110px; width: 110px;
height: 100%;
border-radius: 0;
font-size: 16px;
&--disabled {
border: none;
}
} }
} }