cost

@@ -86,6 +86,11 @@ class OrderController extends HomeBaseController{
     }
 
     public function getPrice($start_time,$end_time){
+        $cost=Db::name('cost')->where('id',1)->find();
+        $interval = Db::name('interval')->where('id',1)->find();
+
+        //判断是否在时间段内
+        
 
         $price=1;
         return $price;

@@ -49,11 +49,12 @@
                 <th>设备锁编号</th>
                 <th>设备锁名称</th>
                 <th>初始医院设置</th>
+                <th>设备电量状态</th>
                 <th>导入时间</th>
                 <th>二维码</th>
                 <th>备注</th>
                 <th>设备状态</th>
-                <th>查看秘钥</th>
+                <!--<th>查看秘钥</th>-->
                 <th width="90">操作</th>
             </tr>
             </thead>
@@ -77,6 +78,12 @@
                         {$vo.hospital}
                     </td>
                     <td>
+                        <switch name="vo.electricity">
+                            <case value="0"><span class="label-success">低电</span></case>
+                            <case value="1"><span class="label-warning">正常</span></case>
+                        </switch>
+                    </td>
+                    <td>
                         {$vo.create_time}
                     </td>
                     <td>
@@ -91,9 +98,9 @@
                             <case value="1"><span class="label-warning">占用</span></case>
                         </switch>
                     </td>
-                    <td>
-                        {$vo.key}
-                    </td>
+                    <!--<td>-->
+                        <!--{$vo.key}-->
+                    <!--</td>-->
                     <td>
                         <a href="{:url('AdminEquipment/edit',array('id'=>$vo['id']))}">{:lang('EDIT')}</a>
                         <a href="{:url('AdminEquipment/delete',array('id'=>$vo['id']))}" class="js-ajax-delete">{:lang('DELETE')}</a>