Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[bugfix] SubmitBar: incomplete button text display #1940

Merged
merged 1 commit into from
Oct 17, 2018
Merged

[bugfix] SubmitBar: incomplete button text display #1940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 8 additions & 1 deletion packages/submit-bar/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions packages/submit-bar/test/__snapshots__/demo.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion packages/submit-bar/test/__snapshots__/index.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 0 additions & 7 deletions packages/vant-css/src/submit-bar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,5 @@

.van-button {
width: 110px;
height: 100%;
border-radius: 0;
font-size: 16px;

&--disabled {
border: none;
}
}
}