正在显示
1 个修改的文件
包含
10 行增加
和
10 行删除
@@ -402,14 +402,14 @@ class Index extends Api | @@ -402,14 +402,14 @@ class Index extends Api | ||
402 | } | 402 | } |
403 | } | 403 | } |
404 | foreach ($shangwu1 as $key => $vo) { | 404 | foreach ($shangwu1 as $key => $vo) { |
405 | - $up = array_merge($vo, $shangwu2[$key]); | 405 | + $up1[] = array_merge($vo, $shangwu2[$key]); |
406 | } | 406 | } |
407 | foreach ($shangwu3 as $key => $vo) { | 407 | foreach ($shangwu3 as $key => $vo) { |
408 | - $up = array_merge($vo, $shangwu4[$key]); | 408 | + $up2[] = array_merge($vo, $shangwu4[$key]); |
409 | + } | ||
410 | + foreach ($up1 as $key => $vo) { | ||
411 | + $up[] = array_merge($vo, $up2[$key]); | ||
409 | } | 412 | } |
410 | -// foreach ($shangwu4 as $key => $vo) { | ||
411 | -// $up[] = array_merge($vo, $shangwu4[$key]); | ||
412 | -// } | ||
413 | //$up 上午 | 413 | //$up 上午 |
414 | //$down 下午 | 414 | //$down 下午 |
415 | //下午时间飞机一 | 415 | //下午时间飞机一 |
@@ -493,14 +493,14 @@ class Index extends Api | @@ -493,14 +493,14 @@ class Index extends Api | ||
493 | } | 493 | } |
494 | } | 494 | } |
495 | foreach ($xiawu1 as $key => $vo) { | 495 | foreach ($xiawu1 as $key => $vo) { |
496 | - $down[] = array_merge($vo, $xiawu2[$key]); | 496 | + $down1[] = array_merge($vo, $xiawu2[$key]); |
497 | } | 497 | } |
498 | foreach ($xiawu3 as $key => $vo) { | 498 | foreach ($xiawu3 as $key => $vo) { |
499 | - $down = array_merge($vo, $xiawu4[$key]); | 499 | + $down2[] = array_merge($vo, $xiawu4[$key]); |
500 | + } | ||
501 | + foreach ($down1 as $key => $vo) { | ||
502 | + $down[] = array_merge($vo, $down2[$key]); | ||
500 | } | 503 | } |
501 | -// foreach ($xiawu3 as $key => $vo) { | ||
502 | -// $down[] = array_merge($vo, $xiawu4[$key]); | ||
503 | -// } | ||
504 | $list = [ | 504 | $list = [ |
505 | 'up' => $up, | 505 | 'up' => $up, |
506 | 'down' => $down | 506 | 'down' => $down |
-
请 注册 或 登录 后发表评论