diff --git a/pages.json b/pages.json index 7ac4efb..a24d0f6 100644 --- a/pages.json +++ b/pages.json @@ -64,14 +64,10 @@ { "path": "control/index", "style": { - "navigationBarTitleText": "控制中心", - "usingComponents": { - "auto-page": "/pages/home/control/automatic", - "manual-page": "/pages/home/control/manual" - } + "navigationBarTitleText": "控制中心" } } -// , + // { // "path": "control/automatic", // "style": { diff --git a/pages/home/control/automatic.vue b/pages/home/control/automatic.vue index dc2b599..99aa235 100644 --- a/pages/home/control/automatic.vue +++ b/pages/home/control/automatic.vue @@ -566,9 +566,6 @@ export default { refresh() { this.getAgriTerm(); this.showFlag = !((store.getters && store.getters.name !== 'admin') && this.$auth.hasRole("test")) - this.$nextTick(() => { - this.getSwiperHeight(); // 页面初始化时也计算一次 - }); }, getAgriTerm() { getAgriTerm(this.imei).then(response => { @@ -595,7 +592,9 @@ export default { } }).catch(err => { }).finally(() => { - + this.$nextTick(() => { + this.getSwiperHeight(); // 页面初始化时也计算一次 + }); }); }, // --------------------共同逻辑------------------------------ diff --git a/pages/home/control/index.vue b/pages/home/control/index.vue index 6f62a8c..bcbe945 100644 --- a/pages/home/control/index.vue +++ b/pages/home/control/index.vue @@ -62,6 +62,8 @@