order

@@ -32,6 +32,7 @@ class AdminOrderController extends AdminBaseController{
     public function index(){
     public function index(){
         $Order=new OrderModel();
         $Order=new OrderModel();
         $data=$Order->alias('a')
         $data=$Order->alias('a')
+            ->field('a.*,b.serial_number,b.hospital')
             ->join('equipment b','a.mac_address=b.mac_address')
             ->join('equipment b','a.mac_address=b.mac_address')
             ->paginate(10);
             ->paginate(10);
         dump($data->toArray());
         dump($data->toArray());

@@ -48,12 +48,12 @@
                 <tr>
                 <tr>
                     <td><b>{$vo.id}</b></td>
                     <td><b>{$vo.id}</b></td>
                     <td>{$vo.mac_address}</td>
                     <td>{$vo.mac_address}</td>
+                    <td>{$vo.serial_number}</td>
+                    <td>{$vo.hospital}</td>
+                    <td>{$vo.start_time}</td>
+                    <td>{$vo.end_time}</td>
                     <td>{$vo.mac_address}</td>
                     <td>{$vo.mac_address}</td>
-                    <td>{$vo.mac_address}</td>
-                    <td>{$vo.mac_address}</td>
-                    <td>{$vo.mac_address}</td>
-                    <td>{$vo.mac_address}</td>
-                    <td>{$vo.mac_address}</td>
+                    <td>{$vo.price}</td>
                 </tr>
                 </tr>
             </foreach>
             </foreach>
         </table>
         </table>