diff --git a/pages.json b/pages.json index 60aafa3..6ae3a8b 100644 --- a/pages.json +++ b/pages.json @@ -8,6 +8,13 @@ "enableShareAppMessage": true } }, + { + "path": "pages/deviceManage/index", + "style": { + "navigationBarTitleText": "设备管理", + "navigationStyle": "custom" + } + }, { "path": "pages/mine/index", "style": { @@ -44,13 +51,6 @@ "navigationStyle": "custom" } }, - { - "path": "pages/deviceManage/index", - "style": { - "navigationBarTitleText": "设备管理", - "navigationStyle": "custom" - } - }, { "path": "pages/privacy/index", "style": { @@ -92,4 +92,4 @@ ] }, "uniIdRouter": {} -} +} \ No newline at end of file diff --git a/pages/deviceManage/index.vue b/pages/deviceManage/index.vue index 74f9cbe..97febd9 100644 --- a/pages/deviceManage/index.vue +++ b/pages/deviceManage/index.vue @@ -32,26 +32,11 @@ - - - + + + @@ -60,9 +45,9 @@ 设备状态 - 设备日志 - + --> 设备控制 @@ -188,7 +173,7 @@ - + 继续打印 @@ -202,7 +187,7 @@ ? '#ffffff' : '#cccccc', }"> - + - + 报警继续 - + 报警退出 @@ -249,7 +234,7 @@ import { export default { data () { return { - TOPBG:BASE_IMG_URL + "/minePage/top.jpg", + TOPBG: BASE_IMG_URL + "/minePage/top.jpg", isMediaLoading: false, deviceName: "", title: "Hello", @@ -1102,7 +1087,8 @@ export default {