Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
xiaojunnuo@126.com
2020-09-01 17:18:18 +08:00

View File

@@ -23,11 +23,6 @@ export default {
type: Boolean, type: Boolean,
required: false, required: false,
default: false default: false
},
betterScrollOptions: {
type: Object,
required: false,
default: () => ({})
} }
}, },
computed: { computed: {
@@ -47,7 +42,6 @@ export default {
class="container-component"> class="container-component">
<this.component <this.component
ref="component" ref="component"
betterScrollOptions={this.betterScrollOptions}
{ ...{ attrs: this.$attrs } } { ...{ attrs: this.$attrs } }
onScroll={ e => this.$emit('scroll', e) }> onScroll={ e => this.$emit('scroll', e) }>
{ slots } { slots }