|
|
@@ -676,9 +676,9 @@ class Video extends Base
|
|
|
->leftJoin('store_member u','u.id = c.user_id')
|
|
|
->order('c.id asc')
|
|
|
->select()->toArray();
|
|
|
- $val['like_num'] = VideoCommentLike::where('like_id',$val['id'])->count();
|
|
|
+ $val['like_num'] = VideoCommentLike::where('like_id',$val['id'])->where('type',1)->count();
|
|
|
$val['children'] = $children;
|
|
|
- $val['is_like'] = VideoCommentLike::where(['like_id'=>$val['id'],'user_id'=>$user_id])->count();
|
|
|
+ $val['is_like'] = VideoCommentLike::where(['like_id'=>$val['id'],'user_id'=>$user_id,'type'=>1])->count();
|
|
|
|
|
|
$parent = VideoComment::where(['c.id'=>$val['pid'],'c.is_deleted'=>0])
|
|
|
->alias('c')->field('c.*,u.name,u.headimg')
|
|
|
@@ -806,7 +806,8 @@ class Video extends Base
|
|
|
* @return name:url_id type:string default:-- desc:url_id
|
|
|
* @return name:cover type:string default:-- desc:封面
|
|
|
* @return name:time type:string default:-- desc:时间
|
|
|
- * @return name:ali_vid:string default:-- desc:云点播id
|
|
|
+ * @return name:ali_vid type:string default:-- desc:云点播id
|
|
|
+ * @return name:is_vip type:int default:-- desc:是否是vip[0否1是]
|
|
|
*/
|
|
|
public function getLearnHistory()
|
|
|
{
|
|
|
@@ -955,6 +956,7 @@ class Video extends Base
|
|
|
* @return name:cover type:string default:-- desc:封面
|
|
|
* @return name:create_at type:string default:-- desc:时间
|
|
|
* @return name:ali_vid type:string default:-- desc:云点播id
|
|
|
+ * @return name:is_vip type:int default:-- desc:是否是vip[0否1是]
|
|
|
*/
|
|
|
public function getPurchaseVideo()
|
|
|
{
|
|
|
@@ -965,7 +967,7 @@ class Video extends Base
|
|
|
$sel_where[] = ['t.type','=',1];
|
|
|
$list = UserLearn::where($sel_where)
|
|
|
->alias('t')
|
|
|
- ->field('t.id,t.create_at,t.first_id video_id,t.second_id url_id,i.title,i.cover,i.ali_vid')
|
|
|
+ ->field('t.id,t.create_at,t.first_id video_id,t.second_id url_id,i.title,i.cover,i.is_vip,i.ali_vid')
|
|
|
->leftJoin('VideoUrl i','t.second_id = i.id')
|
|
|
->order('id desc')
|
|
|
->limit($this->off_set,$this->page_num)
|
|
|
@@ -989,6 +991,7 @@ class Video extends Base
|
|
|
* @return name:cover type:string default:-- desc:封面
|
|
|
* @return name:create_at type:string default:-- desc:时间
|
|
|
* @return name:ali_vid type:string default:-- desc:云点播id
|
|
|
+ * @return name:is_vip type:int default:-- desc:是否是vip[0否1是]
|
|
|
*/
|
|
|
public function getVideoCollect()
|
|
|
{
|
|
|
@@ -999,7 +1002,7 @@ class Video extends Base
|
|
|
$sel_where[] = ['t.coll_type','=',1];
|
|
|
$list = UserCollect::where($sel_where)
|
|
|
->alias('t')
|
|
|
- ->field('t.id,t.create_at,t.coll_id video_id,t.children_id url_id,i.title,i.cover,i.ali_vid')
|
|
|
+ ->field('t.id,t.create_at,t.coll_id video_id,t.children_id url_id,i.title,i.cover,i.is_vip,i.ali_vid')
|
|
|
->leftJoin('VideoUrl i','t.children_id = i.id')
|
|
|
->order('id desc')
|
|
|
->limit($this->off_set,$this->page_num)
|
|
|
@@ -1007,6 +1010,41 @@ class Video extends Base
|
|
|
$this->success('ok',['list'=>$list]);
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * @title 视频点赞列表【我的点赞】
|
|
|
+ * @desc 视频点赞列表
|
|
|
+ * @author qc
|
|
|
+ * @method GET
|
|
|
+ * @url /api/Video/getTagsVideo
|
|
|
+ * @header name:Authorization require:1 desc:Token
|
|
|
+ * @param name:title type:string default:-- desc:标题
|
|
|
+ * @param name:page type:int default:0 desc:页数
|
|
|
+ * @param name:page_num type:int default:20 desc:每页数
|
|
|
+ * @return name:title type:string default:-- desc:标题
|
|
|
+ * @return name:video_id type:string default:-- desc:视频id
|
|
|
+ * @return name:url_id type:string default:-- desc:url_id
|
|
|
+ * @return name:cover type:string default:-- desc:封面
|
|
|
+ * @return name:create_at type:string default:-- desc:时间
|
|
|
+ * @return name:ali_vid type:string default:-- desc:云点播id
|
|
|
+ * @return name:is_vip type:int default:-- desc:是否是vip[0否1是]
|
|
|
+ */
|
|
|
+ public function getTagsVideo()
|
|
|
+ {
|
|
|
+ $sel_where = [];
|
|
|
+ $title = input('get.title');
|
|
|
+ if($title) $sel_where[] = ['i.title','like','%'.$title.'%'];
|
|
|
+ $sel_where[] = ['t.user_id','=',$this->user_id];
|
|
|
+ $sel_where[] = ['t.type','=',2];
|
|
|
+ $list = VideoCommentLike::where($sel_where)
|
|
|
+ ->alias('t')
|
|
|
+ ->field('t.id,t.create_at,t.like_id video_id,t.url_id,i.title,i.cover,i.is_vip,i.cover,i.ali_vid')
|
|
|
+ ->leftJoin('VideoUrl i','t.url_id = i.id')
|
|
|
+ ->order('id desc')
|
|
|
+ ->limit($this->off_set,$this->page_num)
|
|
|
+ ->select()->toArray();
|
|
|
+ $this->success('ok',['list'=>$list]);
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
|
|
|
|
