cost

@@ -90,7 +90,19 @@ class OrderController extends HomeBaseController{
         $interval = Db::name('interval')->where('id',1)->find();
         $interval = Db::name('interval')->where('id',1)->find();
 
 
         //判断是否在时间段内
         //判断是否在时间段内
-        
+        $interval['start_time'];
+        if ($end_time > $interval['start_time'] && $end_time < $interval['end_time']){
+            if ($start_time > $interval['start_time']){
+
+            }else if ($start_time < $interval['start_time']){
+
+            }
+        }elseif ($start_time < $interval['end_time'] && $end_time > $interval['end_time']){
+
+        }else{
+
+        }
+
 
 
         $price=1;
         $price=1;
         return $price;
         return $price;

@@ -79,12 +79,12 @@
                     </td>
                     </td>
                     <td>
                     <td>
                         <switch name="vo.electricity">
                         <switch name="vo.electricity">
-                            <case value="0"><span class="label-success">低电</span></case>
-                            <case value="1"><span class="label-warning">正常</span></case>
+                            <case value="0"><span class="label-danger">低电</span></case>
+                            <case value="1"><span class="label-success">正常</span></case>
                         </switch>
                         </switch>
                     </td>
                     </td>
                     <td>
                     <td>
-                        {$vo.create_time}
+                        {:date('Y-m-d H:i:s',$vo.create_time)}
                     </td>
                     </td>
                     <td>
                     <td>
                         <img src="{:cmf_get_image_preview_url($vo.qr_code)}">
                         <img src="{:cmf_get_image_preview_url($vo.qr_code)}">