mirror of
https://github.com/youzan/vant.git
synced 2025-10-20 10:44:59 +00:00
chore: merge src and src-next
This commit is contained in:
@@ -21,6 +21,8 @@ export default createComponent({
|
||||
},
|
||||
},
|
||||
|
||||
emits: ['change', 'finish'],
|
||||
|
||||
data() {
|
||||
return {
|
||||
remain: 0,
|
||||
@@ -40,7 +42,9 @@ export default createComponent({
|
||||
watch: {
|
||||
time: {
|
||||
immediate: true,
|
||||
handler: 'reset',
|
||||
handler() {
|
||||
this.reset();
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
@@ -153,7 +157,9 @@ export default createComponent({
|
||||
render() {
|
||||
return (
|
||||
<div class={bem()}>
|
||||
{this.slots('default', this.timeData) || this.formattedTime}
|
||||
{this.$slots.default
|
||||
? this.$slots.default(this.timeData)
|
||||
: this.formattedTime}
|
||||
</div>
|
||||
);
|
||||
},
|
||||
|
Reference in New Issue
Block a user