diff --git a/application/api/controller/Index.php b/application/api/controller/Index.php index 61452de..fd8e775 100644 --- a/application/api/controller/Index.php +++ b/application/api/controller/Index.php @@ -402,14 +402,14 @@ class Index extends Api } } foreach ($shangwu1 as $key => $vo) { - $up = array_merge($vo, $shangwu2[$key]); + $up1[] = array_merge($vo, $shangwu2[$key]); } foreach ($shangwu3 as $key => $vo) { - $up = array_merge($vo, $shangwu4[$key]); + $up2[] = array_merge($vo, $shangwu4[$key]); + } + foreach ($up1 as $key => $vo) { + $up[] = array_merge($vo, $up2[$key]); } -// foreach ($shangwu4 as $key => $vo) { -// $up[] = array_merge($vo, $shangwu4[$key]); -// } //$up 上午 //$down 下午 //下午时间飞机一 @@ -493,14 +493,14 @@ class Index extends Api } } foreach ($xiawu1 as $key => $vo) { - $down[] = array_merge($vo, $xiawu2[$key]); + $down1[] = array_merge($vo, $xiawu2[$key]); } foreach ($xiawu3 as $key => $vo) { - $down = array_merge($vo, $xiawu4[$key]); + $down2[] = array_merge($vo, $xiawu4[$key]); + } + foreach ($down1 as $key => $vo) { + $down[] = array_merge($vo, $down2[$key]); } -// foreach ($xiawu3 as $key => $vo) { -// $down[] = array_merge($vo, $xiawu4[$key]); -// } $list = [ 'up' => $up, 'down' => $down