正在显示
1 个修改的文件
包含
19 行增加
和
9 行删除
@@ -131,15 +131,25 @@ class AdminLightOrderController extends AdminBaseController | @@ -131,15 +131,25 @@ class AdminLightOrderController extends AdminBaseController | ||
131 | { | 131 | { |
132 | $id = $this->request->param('id'); | 132 | $id = $this->request->param('id'); |
133 | $data = Db::name('light_order') | 133 | $data = Db::name('light_order') |
134 | - ->alias('l') | ||
135 | - ->join('temple t','t.id=l.temple_id') | ||
136 | - ->where('l.id', $id) | ||
137 | - ->field('l.*,t.name as tname,t.id as tid') | ||
138 | - ->find(); | ||
139 | - $temple=Db::name('temple')->select(); | ||
140 | - $this->assign('temple',$temple); | ||
141 | - $area=Db::name('temple_area')->where('temple_id',$data['temple_id'])->select(); | ||
142 | - $this->assign('area',$area); | 134 | + ->alias('lo') |
135 | + ->join('light l','lo.light_id=l.id') | ||
136 | + ->join('users u','lo.users_id=u.id') | ||
137 | + ->join('temple t','l.temple_id=t.id') | ||
138 | + ->join('temple_area ta','l.area_id=ta.id') | ||
139 | + ->where('lo,id',$id) | ||
140 | + ->field('lo.*,l.*,u.*,t.name as tname,ta.name as taname,lo.name as loname') | ||
141 | + ->order('lo.create_time','desc') | ||
142 | + ->paginate('10'); | ||
143 | + $data['location']=[$data['row'],$data['column']]; | ||
144 | + $address = Db::name('temple')->field('address')->distinct('true')->select(); | ||
145 | + $this->assign('address',$address); | ||
146 | + $temple = Db::name('temple')->where('address',$data['address'])->select(); | ||
147 | + $this->assign('temple', $temple); | ||
148 | + $area = Db::name('temple_area')->where('temple_id', $data['temple_id'])->select(); | ||
149 | + $this->assign('area', $area); | ||
150 | + $location=json_decode($this->getLocation($id=$data['area_id'],$locationId=$data['id']),true); | ||
151 | + | ||
152 | + $this->assign('location', $location); | ||
143 | $this->assign('list', $data); | 153 | $this->assign('list', $data); |
144 | return $this->fetch(); | 154 | return $this->fetch(); |
145 | } | 155 | } |
-
请 注册 或 登录 后发表评论