|
@@ -156,14 +156,18 @@ class PostController extends Controller
|
|
public function suggestPost(Request $request)
|
|
public function suggestPost(Request $request)
|
|
{
|
|
{
|
|
$userInfo = $this->getUserInfo();
|
|
$userInfo = $this->getUserInfo();
|
|
- if (empty($userInfo)) {
|
|
|
|
- return jsonError('获取用户信息失败');
|
|
|
|
|
|
+ if ($userInfo) {
|
|
|
|
+ $uid = $userInfo['uid'];
|
|
|
|
+ $inviteCode = $userInfo['invite_code'];
|
|
|
|
+ }else{
|
|
|
|
+ $uid = 0;
|
|
|
|
+ $inviteCode = '';
|
|
}
|
|
}
|
|
|
|
|
|
$param = $request->all();
|
|
$param = $request->all();
|
|
$list = $this->postRepositories->suggestPost($param);
|
|
$list = $this->postRepositories->suggestPost($param);
|
|
$fractal = new Manager();
|
|
$fractal = new Manager();
|
|
- $resource = new Collection($list, new SuggestTransformer($userInfo['uid'], $userInfo['invite_code']));
|
|
|
|
|
|
+ $resource = new Collection($list, new SuggestTransformer($uid, $inviteCode));
|
|
$resource->setPaginator(new IlluminatePaginatorAdapter($list));
|
|
$resource->setPaginator(new IlluminatePaginatorAdapter($list));
|
|
$data = $fractal->createData($resource)->toArray();
|
|
$data = $fractal->createData($resource)->toArray();
|
|
|
|
|
|
@@ -180,7 +184,6 @@ class PostController extends Controller
|
|
} else {
|
|
} else {
|
|
$floor = json_decode($floor, true);
|
|
$floor = json_decode($floor, true);
|
|
}
|
|
}
|
|
-
|
|
|
|
if ($floor) {
|
|
if ($floor) {
|
|
$newData = [];
|
|
$newData = [];
|
|
foreach ($data['data'] as $key => $val) {
|
|
foreach ($data['data'] as $key => $val) {
|
|
@@ -206,7 +209,8 @@ class PostController extends Controller
|
|
} elseif ($floor[$key + 1]['show_type'] == 'user') {
|
|
} elseif ($floor[$key + 1]['show_type'] == 'user') {
|
|
$userData = [];
|
|
$userData = [];
|
|
foreach ($floor[$key + 1]['data'] as $item) {
|
|
foreach ($floor[$key + 1]['data'] as $item) {
|
|
- $userData[] = array_merge($item, ['follow_status' => $this->getFollowStatus($userInfo['uid'], $item['uid'])]);
|
|
|
|
|
|
+ $followStatus = $uid ? $this->getFollowStatus($userInfo['uid'], $item['uid']) : 0;
|
|
|
|
+ $userData[] = array_merge($item, ['follow_status' => $followStatus]);
|
|
}
|
|
}
|
|
if ($userData) {
|
|
if ($userData) {
|
|
$newData[] = [
|
|
$newData[] = [
|