|
...
|
...
|
@@ -51,6 +51,7 @@ class AdminOrderController extends AdminBaseController{ |
|
|
|
->join('users u','a.users_id=u.id')
|
|
|
|
// ->field('a.*,b.serial_number,b.hospital')
|
|
|
|
// ->join('equipment b','a.eq_name=b.name')
|
|
|
|
->field('a.*')
|
|
|
|
->where($where)
|
|
|
|
->order('a.end_time','desc')
|
|
|
|
->paginate(10);
|
|
...
|
...
|
@@ -68,7 +69,6 @@ class AdminOrderController extends AdminBaseController{ |
|
|
|
//更改订单状态
|
|
|
|
public function endOrder(){
|
|
|
|
$param=$this->request->param();
|
|
|
|
var_dump($param);
|
|
|
|
Db::name('order')
|
|
|
|
->where('id',$param['id'])
|
|
|
|
->update(['state'=>3]);
|
...
|
...
|
|
