|
|
@@ -79,6 +79,11 @@ class VideoService extends BaseService
|
|
|
}else{
|
|
|
$query->where('a.status', 2);
|
|
|
}
|
|
|
+
|
|
|
+ $id = isset($params['id']) ? $params['id'] : 0;
|
|
|
+ if ($id > 0) {
|
|
|
+ $query->whereNotIn('a.id', [$id]);
|
|
|
+ }
|
|
|
})
|
|
|
->where(function ($query) use ($params) {
|
|
|
$keyword = isset($params['kw']) ? $params['kw'] : '';
|
|
|
@@ -110,7 +115,7 @@ class VideoService extends BaseService
|
|
|
$list = $list ? $list->toArray() : [];
|
|
|
if ($list && $list['data']) {
|
|
|
foreach ($list['data'] as &$item) {
|
|
|
- $item['create_time'] = isset($item['create_time']) ? datetime($item['create_time'], 'Y-m-d H.i.s') : '';
|
|
|
+ $item['time_text'] = isset($item['create_time']) ? dateFormat($item['create_time'], 'Y-m-d H:i') : '';
|
|
|
$item['thumb'] = isset($item['thumb']) && $item['thumb'] ? get_image_url($item['thumb']) : '';
|
|
|
if(isset($item['albums'])){
|
|
|
$albums = $item['albums']? json_decode($item['albums'], true):[];
|
|
|
@@ -130,10 +135,15 @@ class VideoService extends BaseService
|
|
|
$member['avatar'] = isset($member['avatar']) && $member['avatar']? get_image_url($member['avatar']) : get_image_url('/images/member/logo.png');
|
|
|
}
|
|
|
$item['tags'] = isset($item['tags']) && $item['tags']? explode(',', $item['tags']) : [];
|
|
|
- $item['like_num'] = isset($item['like_num']) && $item['like_num']? format_num($item['like_num']) : 0;
|
|
|
- $item['collect_num'] = isset($item['collect_num']) && $item['collect_num']? format_num($item['collect_num']) : 0;
|
|
|
- $item['comment_num'] = isset($item['comment_num']) && $item['comment_num']? format_num($item['comment_num']) : 0;
|
|
|
- $item['views'] = isset($item['views']) && $item['views']? format_num($item['views']) : 0;
|
|
|
+ $item['like_num'] = isset($item['like_num']) && $item['like_num']? intval($item['like_num']) : 0;
|
|
|
+ $item['collect_num'] = isset($item['collect_num']) && $item['collect_num']? intval($item['collect_num']) : 0;
|
|
|
+ $item['views'] = isset($item['views']) && $item['views']? intval($item['views']) : 0;
|
|
|
+ $item['comment_num'] = isset($item['comment_num']) && $item['comment_num']? intval($item['comment_num']) : 0;
|
|
|
+ $item['is_like'] = VideoCollectService::make()->checkCollect($userId, $item['id'], 3);
|
|
|
+ $item['is_collect'] = VideoCollectService::make()->checkCollect($userId, $item['id'], 2);
|
|
|
+ $item['is_follow'] = MemberCollectService::make()->checkCollect($userId, $item['user_id'], 1);
|
|
|
+ $item['is_fans'] = MemberCollectService::make()->checkCollect($item['user_id'], $userId, 1);
|
|
|
+ $item['is_publisher'] = $userId == $item['user_id']? 1 : 0;
|
|
|
$item['member'] = $member;
|
|
|
}
|
|
|
}
|