msg

pages/loop/loop.wxml

@@ -86,8 +86,8 @@
     <text style="left: 5%;top: 50%;">控</text>
     <text style="left: 15%;top: 8%;">开</text>
     <text style="left: 15%;top: 58%;">关</text>
-    <switch style="top: 8%;zoom: {{zoom}};" bindchange="Controltime5" checked="{{state[2]}}"></switch>
-    <switch style="top: 55%;zoom: {{zoom}};" bindchange="Controltime6" checked="{{state[3]}}"></switch>
+    <switch style="top: 8%;zoom: {{zoom}};" bindchange="Controllight1" checked="{{state[2]}}"></switch>
+    <switch style="top: 55%;zoom: {{zoom}};" bindchange="Controllight2" checked="{{state[3]}}"></switch>
     <text style="right: 35%;top: 9%;">小于</text>
     <text style="right: 35%;top: 55%;">大于</text>
     <picker bindchange="bindPickerChange1" value="{{index}}" range="{{arr}}" mode="{{select1}}">
@@ -130,12 +130,12 @@
     <switch bindchange="Controltime5" checked="{{newSwitch[0]}}"></switch>
     <text style="left: 40%;">开启时间</text>
     <text style="left: 75%;">关闭时间</text>
-    <picker mode="time" start="00:00" end="23:59" value="{{timeValue[0]}}" bindchange="bindTimeChange5" 
+    <picker start="00:00" end="23:59" value="{{timeValue[0]}}" bindchange="bindTimeChange5" 
     mode="{{newSwitchstate[0]}}">
         <view class="startTime" style="background-color: {{newcolor[0]}};color:{{newfont[0]}}">
         {{timeValue[0]}}</view>
     </picker>
-    <picker mode="time" start="00:00" end="23:59" value="{{timeValue[1]}}" bindchange="bindTimeChange6" 
+    <picker start="00:00" end="23:59" value="{{timeValue[1]}}" bindchange="bindTimeChange6" 
     mode="{{newSwitchstate[0]}}">
         <view class="endTime" style="background-color: {{newcolor[0]}};color: {{newfont[0]}};">
         {{timeValue[1]}}</view>
@@ -149,11 +149,11 @@
     <switch bindchange="Controltime6" checked="{{newSwitch[1]}}"></switch>
     <text style="left: 40%;">开启时间</text>
     <text style="left: 75%;">关闭时间</text>
-    <picker mode="time" start="00:00" end="23:59" value="{{timeValue[2]}}" bindchange="bindTimeChange7" mode="{{newSwitchstate[1]}}">
+    <picker start="00:00" end="23:59" value="{{timeValue[2]}}" bindchange="bindTimeChange7" mode="{{newSwitchstate[1]}}">
         <view class="startTime" style="background-color: {{newcolor[1]}};color:{{newfont[1]}}">
         {{timeValue[2]}}</view>
     </picker>
-    <picker mode="time" start="00:00" end="23:59" value="{{timeValue[3]}}" bindchange="bindTimeChange8" mode="{{newSwitchstate[1]}}">
+    <picker start="00:00" end="23:59" value="{{timeValue[3]}}" bindchange="bindTimeChange8" mode="{{newSwitchstate[1]}}">
         <view class="endTime" style="background-color: {{newcolor[1]}};color:{{newfont[1]}}">
         {{timeValue[3]}}</view>
     </picker>
@@ -161,13 +161,13 @@
   <!-- 光控 -->
   <view class="newlight">
     <text style="top:2%;letter-spacing:20px">光控</text>
-    <switch bindchange="Controllinght3" checked="{{newSwitch[2]}}"></switch>
-    <picker mode="time" start="00:00" end="23:59" value="{{timeValue[4]}}" bindchange="bindTimeChange9" mode="{{newSwitchstate[2]}}">
+    <switch bindchange="Controltime7" checked="{{newSwitch[2]}}"></switch>
+    <picker start="00:00" end="23:59" value="{{timeValue[4]}}" bindchange="bindTimeChange9" mode="{{newSwitchstate[2]}}">
         <view class="lightstartTime" style="background-color: {{newcolor[2]}};color:{{newfont[2]}}">
         {{timeValue[4]}}</view>
     </picker>
     <text style="left: 44%;">至</text>
-    <picker mode="time" start="00:00" end="23:59" value="{{timeValue[5]}}" bindchange="bindTimeChange10" mode="{{newSwitchstate[2]}}">
+    <picker start="00:00" end="23:59" value="{{timeValue[5]}}" bindchange="bindTimeChange10" mode="{{newSwitchstate[2]}}">
         <view class="lightendTime" style="background-color: {{newcolor[2]}};color:{{newfont[2]}}">
         {{timeValue[5]}}</view>
     </picker>

utils/loop.js

@@ -64,7 +64,7 @@ function deviceMessage(groupNames, deviceNames) {
             var deviceId = group[d].devices[g].deviceId
             var deviceKey = group[d].devices[g].deviceKey
             var modules = group[d].devices[g].module
-            return {loopnum, deviceId, deviceKey, modules}
+            return {loopnum,deviceId,deviceKey,modules,id,Device}
           //新设备
           } else {
             var loopNum = group[d].devices[g].circuits