李帅

1.收藏列表改用get

...@@ -166,16 +166,18 @@ class ImmerseController extends Controller ...@@ -166,16 +166,18 @@ class ImmerseController extends Controller
166 166
167 if ($collects->count()){ 167 if ($collects->count()){
168 foreach ($collects as $collect){ 168 foreach ($collects as $collect){
169 - $data['user_id'] = $collect->user_id; 169 + if ($collect->immerse){ // 避免删除过临境的还存在收藏列表里
170 - $data['immerse_id'] = $collect->immerse_id; 170 + $data['user_id'] = $collect->user_id;
171 - $data['content'] = $collect->immerse->content; 171 + $data['immerse_id'] = $collect->immerse_id;
172 - $data['thumbnail'] = $collect->immerse->thumbnail; 172 + $data['content'] = $collect->immerse->content;
173 - $data['url'] = $collect->immerse->url; 173 + $data['thumbnail'] = $collect->immerse->thumbnail;
174 - $data['type'] = $collect->immerse->type; 174 + $data['url'] = $collect->immerse->url;
175 - $data['is_praise'] = $collect->immerse->isPraise($collect->immerse_id, $user->id); 175 + $data['type'] = $collect->immerse->type;
176 - $data['is_collect'] = $collect->immerse->isCollect($collect->immerse_id, $user->id); 176 + $data['is_praise'] = $collect->immerse->isPraise($collect->immerse_id, $user->id);
177 - 177 + $data['is_collect'] = $collect->immerse->isCollect($collect->immerse_id, $user->id);
178 - $lists[] = $data; 178 +
179 + $lists[] = $data;
180 + }
179 } 181 }
180 } 182 }
181 183
......