wupengfei 2 years ago
parent
commit
67cae5d039

+ 3 - 2
.idea/workspace.xml

@@ -3,6 +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/Video.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Video.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/nutrition/view/datum_url/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/datum_url/form.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -244,7 +245,7 @@
       <workItem from="1677459885906" duration="27029000" />
       <workItem from="1677545294116" duration="25527000" />
       <workItem from="1677631459930" duration="23725000" />
-      <workItem from="1677718149453" duration="15738000" />
+      <workItem from="1677718149453" duration="16752000" />
     </task>
     <servers />
   </component>
@@ -434,7 +435,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="php-line-method">
           <url>file://$PROJECT_DIR$/application/api/controller/Video.php</url>
-          <line>1536</line>
+          <line>1542</line>
           <properties>
             <option name="className" value="\app\api\controller\Video" />
             <option name="methodName" value="getFollowUpList" />

+ 9 - 3
application/api/controller/Video.php

@@ -1338,6 +1338,8 @@ class Video extends Base
      * @return name:is_collect type:int default:-- desc:是否收藏
      * @return name:collect_num type:int default:-- desc:收藏量
      * @return name:read_num type:int default:-- desc:播放量
+     * @return name:desc type:string default:-- desc:简介
+     * @return name:switch_open type:int default:-- desc:通知开关【0关闭1开启】
      */
     public function getVideoCollect()
     {
@@ -1348,12 +1350,13 @@ 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.comment_num,i.is_vip,i.ali_vid,i.duration,i.user_id buid,i.read_num')
+            ->field('t.id,t.create_at,t.coll_id video_id,t.children_id url_id,i.title,i.cover,i.comment_num,i.is_vip,i.ali_vid,i.duration,i.user_id buid,i.read_num,i.desc')
             ->leftJoin('VideoUrl i','t.children_id = i.id')
             ->order('id desc')
             ->limit($this->off_set,$this->page_num)
             ->select()->toArray();
         array_walk($list,function (&$v){
+            $v['switch_open'] =  PlatformSwitch::checkSwitch($this->user_id,$v['video_id'],7);
             $v['is_normal'] = CheckPower::checkModulesPower($v['video_id'],$v['url_id'],$this->request->controller());
             $v['transmit_num'] = numTransform($v['transmit_num']);
             $v['read_num'] = numTransform($v['read_num']);
@@ -1430,6 +1433,8 @@ class Video extends Base
      * @return name:praise_num type:int default:-- desc:点赞量
      * @return name:is_collect type:int default:-- desc:是否收藏
      * @return name:collect_num type:int default:-- desc:收藏量
+     * @return name:desc type:string default:-- desc:简介
+     * @return name:switch_open type:int default:-- desc:通知开关【0关闭1开启】
      */
     public function getTagsVideo()
     {
@@ -1440,12 +1445,13 @@ class Video extends Base
         $sel_where[]  = ['t.type','=',2];
         $list = VideoCommentLike::where($sel_where)
             ->alias('t')
-            ->field('t.id,t.create_at,t.like_id url_id,i.user_id buid,i.title,i.cover,i.is_vip,i.cover,i.ali_vid,i.video_id,i.duration,i.transmit_num')
+            ->field('t.id,t.create_at,t.like_id url_id,i.user_id buid,i.title,i.cover,i.is_vip,i.cover,i.ali_vid,i.video_id,i.duration,i.transmit_num,i.desc')
             ->leftJoin('VideoUrl i','t.like_id = i.id')
             ->order('id desc')
             ->limit($this->off_set,$this->page_num)
             ->select()->toArray();
         array_walk($list,function (&$v){
+            $v['switch_open'] =  PlatformSwitch::checkSwitch($this->user_id,$v['video_id'],7);
             $v['is_normal'] = CheckPower::checkModulesPower($v['video_id'],$v['url_id'],$this->request->controller());
             $v['transmit_num'] = numTransform($v['transmit_num']);
             $v['comment_num'] = VideoComment::getVideoCommentNum($v['url_id']);
@@ -1669,7 +1675,7 @@ class Video extends Base
          $user_info = $this->userInfo('name,headimg');
          $list =  VideoCommentLike::where([['type','=',2],['like_id','in',$all_video]])
              ->alias('l')
-             ->field('l.id,l.user_id,m.name user_name,m.headimg,l.create_at,v.cover,v.title,v.read_num,v.duration')
+             ->field('l.id,l.user_id,m.name user_name,m.headimg,l.create_at,v.cover,v.title,v.read_num,v.duration,v.desc')
              ->leftJoin('StoreMember m','m.id  = l.user_id')
              ->join('VideoUrl v','v.id  = l.like_id')
              ->limit($this->off_set,$this->page_num)

+ 2 - 1
application/nutrition/view/datum_url/form.html

@@ -96,6 +96,7 @@
 
         window.form.render();
         laydate.render({type: 'datetime', elem: '[name="release_time"]'})
+        var upload_url = '/api/upload/pdfUpload';
 
         layui.use(['upload', 'element', 'layer'], function(){
             var $ = layui.jquery
@@ -104,7 +105,7 @@
                 ,layer = layui.layer;
             upload.render({
                 elem: '#test3',
-                url: $("select[name='is_down']").val() == 1 ? '/api/upload/upload': '/api/upload/pdfUpload', //此处用的是第三方的 http 请求演示,实际使用时改成您自己的上传接口即可。,accept: 'file', //普通文件,
+                url: upload_url, //此处用的是第三方的 http 请求演示,实际使用时改成您自己的上传接口即可。,accept: 'file', //普通文件,
               //  url:'/api/upload/upload',
                 accept: 'file', //普通文件,
                 done: function(res){