Merge branch 'master' into feasure

# Conflicts:
#	App.vue

App.vue

@@ -59,7 +59,7 @@
       },
       checkLogin() {
         if (!getToken()) {
-          this.$tab.reLaunch('/pages/login') 
+          this.$tab.reLaunch('/pages/login')
         }
       },
       /**

manifest.json

@@ -41,7 +41,7 @@
     },
     "quickapp" : {},
     "mp-weixin" : {
-        "appid" : "wxccd7e2a0911b3397",
+        "appid" : "wxd86ebf13689eac0d",
         "setting" : {
             "urlCheck" : false,
             "es6" : false,

pages/control/index.vue

@@ -172,7 +172,7 @@ export default {
       mqttClient: null,
       temp: "",
       mqttConfig: {
-        host: '1.94.254.176',
+        host: '122.51.109.52',
         port: 9001,
         username: 'admin',
         password: 'Admin#12345678',
@@ -359,7 +359,7 @@ export default {
             //todo
 
             // this.status[type] = this.status[type] === 0 ? 1 : 0;
-            // this.show[type] = this.status[type] === 0 ? "运行" : "暂停";
+            // this.show[type] = this.status[type] === 0 ? "暂停" : "运行";
 
           }
         }
@@ -475,7 +475,7 @@ export default {
 
       if (isSuccess) {
         this.status[type] = this.status[type] === 0 ? 1 : 0;
-        this.show[type] = this.status[type] === 0 ? "运行" : "暂停";
+        this.show[type] = this.status[type] === 0 ? "暂停" : "运行";
       }
       this.deviceType = '';
       this.$modal.msgSuccess("设备操作成功！")

pages/demo/index.vue

@@ -238,7 +238,7 @@ export default {
     return {
       // MQTT配置
       mqttConfig: {
-        broker: 'ws://1.94.254.176:9001/mqtt', // 公共测试服务器
+        broker: 'ws://122.51.109.52:9001/mqtt', // 公共测试服务器
         clientId: 'uniapp_mqtt_' + Math.random().toString(16).substr(2, 8),
         username: 'admin',
         password: 'Admin#12345678',