|
|
|
@ -137,12 +137,26 @@ class Posts extends BaseController |
|
|
|
['status', '=', 1], |
|
|
|
['delete_time', '=', 0] |
|
|
|
]; |
|
|
|
$field = 'id,content,location,address,type,user_id,create_time,privacy'; |
|
|
|
$field = 'id,content,location,address,type,user_id,create_time,privacy,avatar'; |
|
|
|
$data = (new PostsModel())->where($where)->field($field)->find(); |
|
|
|
if (!$data) { |
|
|
|
return warning(lang('system.error')); |
|
|
|
} |
|
|
|
$data['files'] = PostsFile::getPostsFile($data['id']); |
|
|
|
|
|
|
|
$src = ''; |
|
|
|
if (empty($data['avatar'])) { |
|
|
|
$data['files'] = PostsFile::getPostsFile($data['id']); |
|
|
|
if (strpos('2',$data['type']) !== false && count($data['files']) > 1) { |
|
|
|
$imageFileArr = array_column($data['files'], 'src'); |
|
|
|
$src = PostsModel::createPostsAvatar($data['posts_id'], $imageFileArr); |
|
|
|
} |
|
|
|
} else { |
|
|
|
$src = $data['avatar']; |
|
|
|
} |
|
|
|
if ($src) { |
|
|
|
$data['files'][] = ['file_id' => 0, 'type' => 1, 'src' => $src]; |
|
|
|
} |
|
|
|
|
|
|
|
$friendIds = Friend::getFriendIds($this->uid); |
|
|
|
$friendIds[] = $this->uid; |
|
|
|
|
|
|
|
@ -152,6 +166,10 @@ class Posts extends BaseController |
|
|
|
|
|
|
|
$data['comment'] = Comment::getPostsComment($data['id'], $this->uid, $friendIds); |
|
|
|
|
|
|
|
$data['user'] = $this->getFriendUserInfo($data['user_id']); |
|
|
|
|
|
|
|
unset($data['avatar']); |
|
|
|
|
|
|
|
return success('', $data); |
|
|
|
} |
|
|
|
|
|
|
|
@ -265,6 +283,7 @@ class Posts extends BaseController |
|
|
|
$key + 1 |
|
|
|
); |
|
|
|
} |
|
|
|
PostsModel::createAvatar($posts_id); |
|
|
|
} elseif ($video_file && $poster_file) { |
|
|
|
$fileSaveArr = $this->addPostsFileData( |
|
|
|
$video_file, |
|
|
|
|