Merge branch 'dev' into next

This commit is contained in:
chenjiahan
2020-06-19 06:45:40 +08:00
111 changed files with 4109 additions and 2285 deletions
+3 -3
View File
@@ -166,11 +166,11 @@ export default createComponent({
},
mounted() {
this.onShow();
this.init();
},
activated() {
this.onShow();
this.init();
this.setLine();
},
@@ -180,7 +180,7 @@ export default createComponent({
this.setLine();
},
onShow() {
init() {
this.$nextTick(() => {
this.inited = true;
this.tabHeight = getVisibleHeight(this.$refs.wrap);