李帅

1.收藏列表改用get

......@@ -158,10 +158,20 @@ class ImmerseController extends Controller
$user = $request->user();
$data = Collect::query()->where(['user_id' => $user->id, 'state' => 1])
$collects = Collect::query()->where(['user_id' => $user->id, 'state' => 1])
->orderByDesc('created_at')
->skip(($page - 1) * $page_size)->take($page_size + 1)->get();
$data = [];
foreach ($collects as $collect){
$data['content'] = $collect->immerse->content;
$data['thumbnail'] = $collect->immerse->thumbnail;
$data['url'] = $collect->immerse->url;
$data['type'] = $collect->immerse->type;
$data['is_praise'] = $collect->immerse->isPraise($collect->id, $user->id);
$data['is_collect'] = $collect->immerse->isCollect($collect->id, $user->id);
}
return Response::success($data);
}
}
......
......@@ -44,4 +44,9 @@ class Collect extends Model
return false;
}
}
public function immerse()
{
return $this->belongsTo(Immerse::class,'immerse_id','id');
}
}
......