...
|
...
|
@@ -176,7 +176,7 @@ class UsersController extends HomeBaseController{ |
|
|
$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_info[$k],$time_info);
|
|
|
$data_info[$k]=array_merge($data_info[$k],$time_info);
|
|
|
}
|
|
|
$data=[
|
|
|
'currentPage'=>$order->currentPage(),
|
...
|
...
|
|