正在显示
1 个修改的文件
包含
1 行增加
和
1 行删除
@@ -176,7 +176,7 @@ class UsersController extends HomeBaseController{ | @@ -176,7 +176,7 @@ class UsersController extends HomeBaseController{ | ||
176 | $data_info=$order->items(); | 176 | $data_info=$order->items(); |
177 | foreach ($data_info as $k=>$v){ | 177 | foreach ($data_info as $k=>$v){ |
178 | $time_info=$this->getTimeInfo($v['start_time'],$v['end_time']); | 178 | $time_info=$this->getTimeInfo($v['start_time'],$v['end_time']); |
179 | - $data[$k]=array_merge($data_info[$k],$time_info); | 179 | + $data_info[$k]=array_merge($data_info[$k],$time_info); |
180 | } | 180 | } |
181 | $data=[ | 181 | $data=[ |
182 | 'currentPage'=>$order->currentPage(), | 182 | 'currentPage'=>$order->currentPage(), |
-
请 注册 或 登录 后发表评论