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

index.html

@@ -127,7 +127,8 @@
             </div>
             <div class="ac-switch">
                 <div class="ac-title">二楼-大会议室-04-空调</div>
-                <span class="ac-btn">开</span>
+                <i class="iconfont iconquxiao"></i>
+                <span class="ac-btn">关</span>
             </div>
         </div>
         <div class="m-con">

js/showHardware.js

@@ -266,9 +266,6 @@ $(function () {
 
     //开关
     if (ifOn!='unset') {
-      $('.ac-close').text(ifOn?'开':'关')
-      $('.ac-close').addClass('activeTxt')
-      $('.ac-close').addClass('activeTxt')
       if (ifOn) {
           $('.ac-body').show()
           $('.ac-switch').hide()