Merge branch '1.x' into dev

This commit is contained in:
陈嘉涵 2019-05-10 11:13:11 +08:00
commit 19efe4b316

View File

@ -50,8 +50,10 @@ export default sfc({
methods: { methods: {
getWidth() { getWidth() {
this.progressWidth = this.$el.offsetWidth; this.$nextTick(() => {
this.pivotWidth = this.$refs.pivot ? this.$refs.pivot.offsetWidth : 0; this.progressWidth = this.$el.offsetWidth;
this.pivotWidth = this.$refs.pivot ? this.$refs.pivot.offsetWidth : 0;
});
} }
}, },