Merge branch 'master' of http://192.168.0.115:3000/chenzhiguang/scene_wisdom

edit.html

@@ -147,13 +147,13 @@
                                 <div>
                                     <div class='title'>标题</div>
                                     <span class='close'></span>    
-                                    <div>当前状态: 关</div> 
+                                   <!--  <div>当前状态: 关</div> 
                                     <div>
                                         <label class='switch'>
                                             开关灯
                                             <input class="mui-switch mui-switch-animbg" type="checkbox"> 
                                         </label> 
-                                    </div>
+                                    </div> -->
                                 </div>    
                             </div>
                             <div id="popup">

js/main_2020_edit.js

@@ -14868,7 +14868,7 @@ function o(a, s, l) {
                 
             } 
             this.setVisiblePanos(t.visiblePanos); 
-            this.infoAttribute = t.infoAttribute;
+            this.infoAttribute = t.infoAttribute || {};
             
         }
         var g = e("three")

js/main_2020_show.js

@@ -52,8 +52,8 @@ deviceBtnBind($('#hotPannel .ac-con  .air-con .ac-btn.down'),  '06', '2')//fanPo
 deviceBtnBind($('#hotPannel .ac-con  .air-con .ac-btn.left'),  '06', '3')//fanPos
 deviceBtnBind($('#hotPannel .ac-con  .air-con .ac-btn.right'),  '06', '4')//fanPos
 
-deviceBtnBind($('#hotPannel .ac-con  .air-con [name="onoff"]').eq(0),  '06', '4')//fanState
-deviceBtnBind($('#hotPannel .ac-con  .air-con [name="onoff"]').eq(1),  '06', '4')//fanState
+deviceBtnBind($('#hotPannel .ac-con  .air-con [name="onoff"] .ac-btn').eq(0),  '07', '1')//fanState
+deviceBtnBind($('#hotPannel .ac-con  .air-con [name="onoff"] .ac-btn').eq(1),  '07', '0')//fanState
 
 
 var getAjax = function(url, success, errorString){