blackteay/vant
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant.git synced 2025-04-05 19:41:42 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch '1.x' of https://github.com/youzan/vant into 1.x

Browse Source
This commit is contained in:
陈嘉涵 2019-05-06 09:44:30 +08:00
commit 0e45563c93
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/pull-refresh/index.js
View File

@ -144,7 +144,7 @@ export default sfc({
const text = this[`${status}Text`] || t(status);
const style = {
transition: `${this.duration}ms`,
transform: `translate3d(0,${this.height}px, 0)`
transform: this.height ? `translate3d(0,${this.height}px, 0)` : ''
};
const Status = this.slots(status) || [

2
packages/pull-refresh/test/__snapshots__/demo.spec.js.snap
View File

@ -3,7 +3,7 @@
exports[`renders demo correctly 1`] = `
<div>
<div class="van-pull-refresh">
<div class="van-pull-refresh__track" style="transition:0ms;transform:translate3d(0,0px, 0);">
<div class="van-pull-refresh__track" style="transition:0ms;transform:;">
<div class="van-pull-refresh__head"></div>
<div>
<p>刷新次数: 0</p>

4
packages/pull-refresh/test/__snapshots__/index.spec.js.snap
View File

@ -46,7 +46,7 @@ exports[`change head content when pulling down 4`] = `
exports[`change head content when pulling down 5`] = `
<div class="van-pull-refresh">
<div class="van-pull-refresh__track" style="transition: 300ms; transform: translate3d(0,0px, 0);">
<div class="van-pull-refresh__track" style="transition: 300ms;">
<div class="van-pull-refresh__head"></div>
</div>
</div>
@ -54,7 +54,7 @@ exports[`change head content when pulling down 5`] = `
exports[`not in page top 1`] = `
<div class="van-pull-refresh">
<div class="van-pull-refresh__track" style="transition: 0ms; transform: translate3d(0,0px, 0);">
<div class="van-pull-refresh__track" style="transition: 0ms;">
<div class="van-pull-refresh__head"></div>
</div>
</div>