order

@@ -48,10 +48,7 @@ class AdminOrderController extends AdminBaseController{
             ->join('equipment b','a.mac_address=b.mac_address')
             ->join('equipment b','a.mac_address=b.mac_address')
             ->where($where)
             ->where($where)
             ->order('start_time','desc')
             ->order('start_time','desc')
-            ->paginate(10)->each(function ($item){
-                $item['time']=ceil(($item['end_time']-$item['start_time'])/3600);
-                return $item;
-            });
+            ->paginate(10);
         $this->assign('data',$data);
         $this->assign('data',$data);
         $this->assign('hospital', isset($param['hospital']) ? $param['hospital'] : '');
         $this->assign('hospital', isset($param['hospital']) ? $param['hospital'] : '');
         $this->assign('order_no', isset($param['order_no']) ? $param['order_no'] : '');
         $this->assign('order_no', isset($param['order_no']) ? $param['order_no'] : '');

@@ -63,9 +63,9 @@
                     <td>{$vo.mac_address}</td>
                     <td>{$vo.mac_address}</td>
                     <td>{$vo.serial_number}</td>
                     <td>{$vo.serial_number}</td>
                     <td>{$vo.hospital}</td>
                     <td>{$vo.hospital}</td>
-                    <td>{$vo.sumTime}</td>
-                    <td>{$vo.num}</td>
-                    <td>{$vo.average}</td>
+                    <td>{$vo.sumTime}小时</td>
+                    <td>{$vo.num}次</td>
+                    <td>{$vo.average}小时</td>
                 </tr>
                 </tr>
             </foreach>
             </foreach>
         </table>
         </table>

@@ -44,7 +44,7 @@
                     <td>{$vo.hospital}</td>
                     <td>{$vo.hospital}</td>
                     <td>{:date('Y-m-d H:i:s',$vo.start_time)}</td>
                     <td>{:date('Y-m-d H:i:s',$vo.start_time)}</td>
                     <td>{:date('Y-m-d H:i:s',$vo.end_time)}</td>
                     <td>{:date('Y-m-d H:i:s',$vo.end_time)}</td>
-                    <td>约{$vo.time}小时</td>
+                    <td>{$vo.time}小时</td>
                     <td>{$vo.price}元</td>
                     <td>{$vo.price}元</td>
                 </tr>
                 </tr>
             </foreach>
             </foreach>