后台设备模块开发

@@ -107,7 +107,7 @@ class AdminLightOrderController extends AdminBaseController
             ->join('temple t','l.temple_id=t.id')
             ->join('temple t','l.temple_id=t.id')
             ->join('temple_area ta','l.area_id=ta.id')
             ->join('temple_area ta','l.area_id=ta.id')
             ->where('l.temple_id',$id)
             ->where('l.temple_id',$id)
-            ->field('l.*,t.address,t.name as tname,ta.name as taname,ta.light')
+            ->field('l.*,t.address,t.name as tname,ta.name as taname,ta.light,lo.name as loname')
             ->order('l.create_time','desc')
             ->order('l.create_time','desc')
             ->paginate('10');
             ->paginate('10');
         $this->assign('page',$data->render());
         $this->assign('page',$data->render());

@@ -68,8 +68,9 @@
                     <td>{$vo.money}</td>
                     <td>{$vo.money}</td>
                     <td>{:date('Y-m-d',$vo.pay_time);}</td>
                     <td>{:date('Y-m-d',$vo.pay_time);}</td>
                     <td>{:date('Y-m-d',$vo.end_time);}</td>
                     <td>{:date('Y-m-d',$vo.end_time);}</td>
-                    <td>{$vo.name}</td>
+                    <td>{$vo.loname}</td>
                     <td><img width="25" height="25" src="{:cmf_get_image_preview_url($vo.avatar)}" onclick="parent.imagePreviewDialog(this.src);"/></td>
                     <td><img width="25" height="25" src="{:cmf_get_image_preview_url($vo.avatar)}" onclick="parent.imagePreviewDialog(this.src);"/></td>
+                    <td>{$vo.content}</td>
                     <td>
                     <td>
                         <a href="{:url('AdminLightOrder/edit',array('id'=>$vo['id']))}">编辑</a>
                         <a href="{:url('AdminLightOrder/edit',array('id'=>$vo['id']))}">编辑</a>
                         <a class="js-ajax-delete" href="{:url('AdminLightOrder/delete',array('id'=>$vo['id']))}">
                         <a class="js-ajax-delete" href="{:url('AdminLightOrder/delete',array('id'=>$vo['id']))}">