diff --git a/pages.json b/pages.json index a49001d..ebc79c8 100644 --- a/pages.json +++ b/pages.json @@ -86,12 +86,7 @@ "selectedColor": "#000000", "borderStyle": "white", "backgroundColor": "#ffffff", - "list": [{ - "pagePath": "pages/index", - "iconPath": "static/images/tabbar/home.png", - "selectedIconPath": "static/images/tabbar/home_.png", - "text": "首页" - }, + "list": [ { "pagePath": "pages/control/index", "iconPath": "static/images/tabbar/work.png", diff --git a/pages/control/index.vue b/pages/control/index.vue index 56fdb2c..2544c61 100644 --- a/pages/control/index.vue +++ b/pages/control/index.vue @@ -557,13 +557,13 @@ export default { this.message = JSON.stringify({[type]: status}) console.info("指令:"+this.message+";大棚:"+this.publishTopic) // 控制设备 - // this.publishMessage(); - // // 设备回执 - // this.deviceType=type; + this.publishMessage(); + // 设备回执 + this.deviceType=type; //todo - this.status[type] = this.status[type] === 0 ? 1 : 0; - this.show[type] = this.status[type] === 0 ? "运行" : "暂停"; + // this.status[type] = this.status[type] === 0 ? 1 : 0; + // this.show[type] = this.status[type] === 0 ? "运行" : "暂停"; } } diff --git a/pages/login.vue b/pages/login.vue index b644d4f..c6e8d70 100644 --- a/pages/login.vue +++ b/pages/login.vue @@ -64,7 +64,7 @@ onLoad() { //#ifdef H5 if (getToken()) { - this.$tab.reLaunch('/pages/index') + this.$tab.reLaunch('/pages/control/index') } //#endif }, @@ -121,7 +121,7 @@ loginSuccess(result) { // 设置用户信息 this.$store.dispatch('GetInfo').then(res => { - this.$tab.reLaunch('/pages/index') + this.$tab.reLaunch('/pages/control/index') }) } } diff --git a/pages/mine/setting/index.vue b/pages/mine/setting/index.vue index 87f1f06..5834d35 100644 --- a/pages/mine/setting/index.vue +++ b/pages/mine/setting/index.vue @@ -50,7 +50,7 @@ handleLogout() { this.$modal.confirm('确定注销并退出系统吗?').then(() => { this.$store.dispatch('LogOut').then(() => {}).finally(()=>{ - this.$tab.reLaunch('/pages/index') + this.$tab.reLaunch('/pages/control/index') }) }) }