alighasami/vant
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

[improvement] Functional: button (#2676)

Browse Source
This commit is contained in:
neverland
2019-02-02 17:04:02 +08:00
committed by GitHub
parent 5926d02d38
commit e3f4cac05d
8 changed files with 91 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/submit-bar/index.js
+2 -2
View File
@@ -25,14 +25,14 @@ export default sfc(
}
},
render(h, context) {
render(h, context, inherit) {
const { props, listeners } = context;
const { tip, price } = props;
const slots = context.slots();
const hasPrice = typeof price === 'number';
return (
<div class={bem()} {...context.data}>
<div class={bem()} {...inherit}>
{slots.top}
{(slots.tip || tip) && (
<div class={bem('tip')}>
packages/submit-bar/test/__snapshots__/demo.spec.js.snap
+2 -2
View File
@@ -13,14 +13,14 @@ exports[`renders demo correctly 1`] = `
<div class="van-submit-bar">
<div class="van-submit-bar__tip">你的收货地址不支持同城送, 我们已为你推荐快递</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--large van-button--square van-button--disabled"><span class="van-button__text">提交订单</span></button>
<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--large van-button--disabled van-button--square"><span class="van-button__text">提交订单</span></button>
</div>
</div>
</div>
<div>
<div class="van-submit-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><button class="van-button van-button--danger van-button--large van-button--square van-button--loading">
<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--large van-button--loading van-button--square">
<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>
packages/submit-bar/test/__snapshots__/index.spec.js.snap
+1 -1
View File
@@ -3,7 +3,7 @@
exports[`disable submit 1`] = `
<div class="van-submit-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><button disabled="disabled" class="van-button van-button--danger van-button--large van-button--square van-button--disabled"><span class="van-button__text"></span></button>
<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--large van-button--disabled van-button--square"><span class="van-button__text"></span></button>
</div>
</div>
`;