1

.idea/workspace.xml

@@ -3,7 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/api/controller/Article.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Article.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Video.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Video.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -215,7 +215,7 @@
       <workItem from="1673052319155" duration="16867000" />
       <workItem from="1673226266250" duration="24113000" />
       <workItem from="1673312216057" duration="9503000" />
-      <workItem from="1673399011843" duration="10114000" />
+      <workItem from="1673399011843" duration="10476000" />
     </task>
     <servers />
   </component>

application/api/controller/Video.php

@@ -722,6 +722,7 @@ class Video extends Base
      * @return name:name type:string default:-- desc:会员名称
      * @return name:headimg type:string default:-- desc:会员头像
      * @return name:content type:string default:-- desc:内容
+     * @return name:is_top type:int default:-- desc:是否置顶（0否1是）
      * @return name:parent type:array default:-- desc:评论上一级（数据同上【一维数组】）
      * @return name:children type:array default:-- desc:二级评论（数据同上【二维数组】）
      * @return name:like_num type:int default:-- desc:点赞数量
@@ -741,10 +742,10 @@ class Video extends Base
         $sort_type= input('sort_type',1);
         switch ($sort_type) {
             case 1:
-                $order =  ['c.id'=>'desc','c.like_times'=>'desc'];
+                $order =  ['c.is_top'=>'desc','c.id'=>'desc','c.like_times'=>'desc'];
                 break;
             case 2:
-                $order =   ['c.like_times'=>'desc','c.id'=>'asc'];
+                $order =   ['c.is_top'=>'desc','c.like_times'=>'desc','c.id'=>'asc'];
                 break;
         }
 
@@ -762,7 +763,7 @@ class Video extends Base
                 ->alias('c')
                 ->field('c.*,u.name,u.headimg')
                 ->leftJoin('store_member u','u.id = c.user_id')
-                ->order('c.id asc')
+                ->order('c.is_top,c.id asc')
                 ->select()->toArray();
             $val['like_num'] = VideoCommentLike::where('like_id',$val['id'])->where('type',1)->count();
             $val['like_num'] = numTransform($val['like_num']);
@@ -978,6 +979,7 @@ class Video extends Base
      * @return name:url_id type:string default:-- desc:url_id
      * @return name:cover type:string default:-- desc:封面
      * @return name:is_read type:int default:-- desc:是否已读（0未读1已读）
+     * @return name:is_top type:int default:-- desc:是否置顶（0否1是）
      * @return name:create_at type:string default:-- desc:时间
      * @return name:user_name type:string default:-- desc:用户名【其他会员】
      * @return name:headimg type:string default:-- desc:用户头【其他会员】
@@ -1003,16 +1005,16 @@ class Video extends Base
         $sel_where[]  = ['t.pid','in',implode(',',$all_comment)];
         $list = VideoComment::where($sel_where)
             ->alias('t')
-            ->field('t.id,t.create_at,t.is_read,t.lev,t.content,t.pid,u.name user_name,u.headimg,i.id url_id,i.video_id,i.ali_vid,i.cover,i.duration')
+            ->field('t.id,t.is_top,t.create_at,t.is_read,t.lev,t.content,t.pid,u.name user_name,u.headimg,i.id url_id,i.video_id,i.ali_vid,i.cover,i.duration')
             ->leftJoin('store_member u','t.user_id = u.id')
             ->leftJoin('VideoUrl i','t.url_id = i.id')
-            ->order('t.id desc')
+            ->order('t.is_top desc,t.id desc')
             ->limit($this->off_set,$this->page_num)
             ->select()->toArray();
         foreach ($list as &$v) {
             $v['is_normal'] = CheckPower::checkModulesPower($v['video_id'],$v['url_id'],$this->request->controller());
             $parent_comment = VideoComment::where([['t.id','=',$v['pid']]])
-                ->field('t.id,t.video_id,t.url_id,t.content,i.title,i.cover,t.pid,u.name,i.ali_vid')
+                ->field('t.id,t.is_top,t.video_id,t.url_id,t.content,i.title,i.cover,t.pid,u.name,i.ali_vid')
                 ->alias('t')
                 ->leftJoin('VideoUrl i','t.url_id = i.id')
                 ->leftJoin('store_member u','t.user_id = u.id')
@@ -1038,6 +1040,7 @@ class Video extends Base
      * @return name:is_read type:int default:-- desc:是否已读（0未读1已读）
      * @return name:duration type:int default:-- desc:时长（单位：秒）
      * @return name:cover type:string default:-- desc:封面
+     * @return name:is_top type:int default:-- desc:是否置顶（0否1是）
      * @return name:create_at type:string default:-- desc:时间
      * @return name:user_name type:string default:-- desc:用户名【用户自己的】
      * @return name:headimg type:string default:-- desc:用户头像【用户自己的】
@@ -1061,9 +1064,9 @@ class Video extends Base
         $sel_where[]  = ['t.lev','>=',2];
         $list = VideoComment::where($sel_where)
             ->alias('t')
-            ->field('t.id,t.is_read,t.create_at,t.lev,t.content,i.title,t.pid,i.id url_id,i.video_id,i.ali_vid,i.cover,i.duration')
+            ->field('t.id,t.is_top,t.is_read,t.create_at,t.lev,t.content,i.title,t.pid,i.id url_id,i.video_id,i.ali_vid,i.cover,i.duration')
             ->leftJoin('VideoUrl i','t.url_id = i.id')
-            ->order('t.id desc')
+            ->order('t.is_top,t.id desc')
             ->limit($this->off_set,$this->page_num)
             ->select()->toArray();
         foreach ($list as &$v) {
@@ -1071,7 +1074,7 @@ class Video extends Base
             $v['headimg'] = $user_info['headimg'];
             $v['is_normal'] = CheckPower::checkModulesPower($v['video_id'],$v['url_id'],$this->request->controller());
             $parent_comment = VideoComment::where([['t.id','=',$v['pid']]])
-                ->field('t.id,t.video_id,t.url_id,t.content,i.title,i.cover,t.pid,u.name,i.ali_vid,i.duration')
+                ->field('t.id,t.is_top,t.video_id,t.url_id,t.content,i.title,i.cover,t.pid,u.name,i.ali_vid,i.duration')
                 ->alias('t')
                 ->leftJoin('VideoUrl i','t.url_id = i.id')
                 ->leftJoin('store_member u','t.user_id = u.id')
@@ -1095,6 +1098,7 @@ class Video extends Base
      * @return name:video_id type:string default:-- desc:视频id
      * @return name:duration type:int default:-- desc:时长（单位：秒）
      * @return name:url_id type:string default:-- desc:url_id
+     * @return name:is_top type:int default:-- desc:是否置顶（0否1是）
      * @return name:cover type:string default:-- desc:封面
      * @return name:create_at type:string default:-- desc:时间
      * @return name:user_name type:string default:-- desc:用户名【用户自己的】
@@ -1112,9 +1116,9 @@ class Video extends Base
         $sel_where[]  = ['t.is_deleted','=',0];
         $list = VideoComment::where($sel_where)
             ->alias('t')
-            ->field('t.id,t.create_at,t.video_id,t.url_id,t.lev,t.content,i.title,i.cover,i.ali_vid,i.cover,i.duration')
+            ->field('t.id,t.create_at,t.is_top,t.video_id,t.url_id,t.lev,t.content,i.title,i.cover,i.ali_vid,i.cover,i.duration')
             ->leftJoin('VideoUrl i','t.url_id = i.id')
-            ->order('id desc')
+            ->order('t.is_top desc, id desc')
             ->limit($this->off_set,$this->page_num)
             ->select()->toArray();
         foreach ($list as &$v)
@@ -1141,6 +1145,7 @@ class Video extends Base
      * @return name:is_read type:int default:-- desc:是否已读（0未读1已读）
      * @return name:video_id type:string default:-- desc:视频id
      * @return name:url_id type:string default:-- desc:url_id
+     * @return name:is_top type:int default:-- desc:是否置顶（0否1是）
      * @return name:cover type:string default:-- desc:封面
      * @return name:create_at type:string default:-- desc:时间
      * @return name:user_name type:string default:-- desc:用户名
@@ -1158,10 +1163,10 @@ class Video extends Base
         $sel_where[]  = ['i.user_id','=',$this->user_id];
         $list = VideoComment::where($sel_where)
             ->alias('t')
-            ->field('t.id,t.is_read,t.create_at,t.video_id,t.url_id,t.lev,t.content,i.title,i.cover,i.ali_vid,u.name user_name,u.headimg,i.duration')
+            ->field('t.id,t.is_read,t.is_top,t.create_at,t.video_id,t.url_id,t.lev,t.content,i.title,i.cover,i.ali_vid,u.name user_name,u.headimg,i.duration')
             ->leftJoin('VideoUrl i','t.url_id = i.id')
             ->leftJoin('store_member u','t.user_id = u.id')
-            ->order('t.id desc')
+            ->order('t.is_top desc,t.id desc')
             ->limit($this->off_set,$this->page_num)
             ->select()->toArray();
         array_walk($list,function (&$v){