...
|
...
|
@@ -173,18 +173,16 @@ class UsersController extends HomeBaseController{ |
|
|
public function getOrder(){
|
|
|
$users_id=$this->request->param('users_id');
|
|
|
$order=Db::name('order')->where(['users_id'=>$users_id])->paginate(8);
|
|
|
$data=$order->items();
|
|
|
foreach ($data as $k=>$v){
|
|
|
$data_info=$order->items();
|
|
|
foreach ($data_info as $k=>$v){
|
|
|
$time_info=$this->getTimeInfo($v['start_time'],$v['end_time']);
|
|
|
$data[$k]=array_merge($data[$k],$time_info);
|
|
|
$data[$k]=array_merge($data_info[$k],$time_info);
|
|
|
}
|
|
|
dump($data);
|
|
|
exit;
|
|
|
$data=[
|
|
|
'currentPage'=>$order->currentPage(),
|
|
|
'allPage' => $order->lastPage(),
|
|
|
'allData'=>$order->total(),
|
|
|
'data'=>$order->items()
|
|
|
'data'=>$data_info
|
|
|
];
|
|
|
$this->apiResponse(200,'success',$data);
|
|
|
}
|
...
|
...
|
|