Showing
1 changed file
with
14 additions
and
11 deletions
| ... | @@ -163,17 +163,20 @@ class ImmerseController extends Controller | ... | @@ -163,17 +163,20 @@ class ImmerseController extends Controller |
| 163 | ->skip(($page - 1) * $page_size)->take($page_size + 1)->get(); | 163 | ->skip(($page - 1) * $page_size)->take($page_size + 1)->get(); |
| 164 | 164 | ||
| 165 | $lists = []; | 165 | $lists = []; |
| 166 | - foreach ($collects as $collect){ | 166 | + |
| 167 | - $data['user_id'] = $collect->user_id; | 167 | + if ($collects->count()){ |
| 168 | - $data['immerse_id'] = $collect->immerse_id; | 168 | + foreach ($collects as $collect){ |
| 169 | - $data['content'] = $collect->immerse->content; | 169 | + $data['user_id'] = $collect->user_id; |
| 170 | - $data['thumbnail'] = $collect->immerse->thumbnail; | 170 | + $data['immerse_id'] = $collect->immerse_id; |
| 171 | - $data['url'] = $collect->immerse->url; | 171 | + $data['content'] = $collect->immerse->content; |
| 172 | - $data['type'] = $collect->immerse->type; | 172 | + $data['thumbnail'] = $collect->immerse->thumbnail; |
| 173 | - $data['is_praise'] = $collect->immerse->isPraise($collect->id, $user->id); | 173 | + $data['url'] = $collect->immerse->url; |
| 174 | - $data['is_collect'] = $collect->immerse->isCollect($collect->id, $user->id); | 174 | + $data['type'] = $collect->immerse->type; |
| 175 | - | 175 | + $data['is_praise'] = $collect->immerse->isPraise($collect->id, $user->id); |
| 176 | - $lists[] = $data; | 176 | + $data['is_collect'] = $collect->immerse->isCollect($collect->id, $user->id); |
| 177 | + | ||
| 178 | + $lists[] = $data; | ||
| 179 | + } | ||
| 177 | } | 180 | } |
| 178 | 181 | ||
| 179 | return Response::success($lists); | 182 | return Response::success($lists); | ... | ... |
-
Please register or login to post a comment