1

application/api/controller/Article.php

@@ -29,6 +29,7 @@ class Article extends Base
         'getMyArticleList',
         'getUserArticleDetail',
         'delUserArticle',
+        'delComment',
     ];
     public function initialize()
     {
@@ -252,6 +253,7 @@ class Article extends Base
      * @return name:children type:array default:-- desc:二级评论（数据同上【二维数组】）
      * @return name:like_num type:int default:-- desc:点赞数量
      * @return name:is_like type:int default:-- desc:是否点赞（0否1是）
+     * @return name:can_delete type:int default:-- desc:是否可以删除（0否1是）
      * @return name:total_num type:int default:-- desc:总评论数（仅一级）
      */
     public function getArticleCommentList()
@@ -280,11 +282,12 @@ class Article extends Base
             $val['children'] =  $children;
             $val['like_num'] = ArticleCommentLike::where('like_id',$val['id'])->count();
             $val['is_like'] =  ArticleCommentLike::where(['like_id'=>$val['id'],'user_id'=>$user_id])->count();
-            $parent  = ArticleComment::where(['c.id'=>$val['pid']])
+            $parent  = ArticleComment::where(['c.id'=>$val['pid'],'c.is_deleted'=>0])
                 ->alias('c')->field('c.*,u.name,u.headimg')
                 ->leftJoin('store_member u','u.id = c.user_id')
                 ->find();
             $val['parent']  = $parent ? $parent->toArray() : null;
+            $val['can_delete']  = $val['user_id'] == $this->user_id ? 1 :0;
         });
         $total_num  = ArticleComment::where($where)->alias('c')->count();
         $this->success('ok',['list'=>$list,'total_num'=>$total_num]);
@@ -392,6 +395,19 @@ class Article extends Base
     }
 
     /**
+     * @title 删除评论
+     * @desc 删除评论
+     * @author qc
+     * @method POST
+     * @url /api/Article/delComment
+     * @header name:Authorization require:1 desc:Token
+     * @param name:id type:int default:1 desc:评论id
+     */
+    public function delComment(){
+        ArticleComment::where(['id'=>input('post.id'),'user_id'=>$this->user_id])->update(['is_deleted'=>1]);
+        $this->success('删除成功');
+    }
+    /**
      * @title 图文二级评论
      * @desc 图文二级评论
      * @author qc

application/api/controller/Demand.php

@@ -1,6 +1,8 @@
 <?php
 namespace app\api\controller;
+use app\common\model\PlatformDemand;
 use app\common\model\UserDemand;
+use app\common\model\UserSearch;
 use library\tools\Data;
 
 /**
@@ -27,10 +29,85 @@ class Demand extends Base
      */
      public function classIntro(){}
 
-
+    /**
+     * @title 需求列表【平台】
+     * @desc 需求列表【平台】
+     * @author qc
+     * @method GET
+     * @url /api/Demand/getDemandList
+     * @header name:Authorization require:1 desc:Token
+     * @param  name:title type:string default:-- desc:标题
+     * @param  name:is_tj type:int default:0 desc:是否推荐0否1是
+     * @param  name:is_over type:int default:-1 desc:是否推荐[-1全部0否1是]
+     * @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:content type:string default:-- desc:需求
+     * @return name:images type:string default:-- desc:图片【多张|隔开】
+     * @return name:user_name type:string default:-- desc:名称
+     * @return name:headimg type:string default:-- desc:头像
+     * @return name:money type:float default:-- desc:金额
+     * @return name:is_over type:int default:-- desc:是否解决【0否，1是】
+     */
      public function getDemandList()
      {
+        $title = input('get.title');
+        $is_tj = input('get.is_tj',0);
+        $is_over = input('get.is_over',-1);
+        $sel_where =[];
+        $sel_where[] = ['d.is_deleted','=',0];
+        $sel_where[] = ['d.stats','=',1];
+        if($title)  $sel_where[]  = ['d.title','like','%'.$title.'%'];
+        if($is_over > -1)  $sel_where[]  = ['d.is_over','=',$is_over];
+        if($title && $this->user_id) UserSearch::saveSearchTitle($this->user_id,$title,5);
+        $where_str = '';
+        if($is_tj) {
+             $search_log =  UserSearch::getSearchTitle($this->user_id,5);
+             $search_arr = [];
+             foreach ($search_log as $t){
+                 $search_arr[] =  " d.title like '".'%'.$t."%'" .' ';
+             }
+             if(!empty($search_arr)) $where_str  =  implode(' OR ',$search_arr);
+         }
+         $app_name = sysconf('app_name');
+         $app_log = sysconf('app_log');
+         $list = PlatformDemand::where($sel_where)
+             ->field('d.*,u.name user_name,u.headimg')
+             ->alias('d')
+             ->leftJoin('User u','u.id = d.user_id')
+             ->when($where_str,function ($query)use ($where_str){if($where_str) $query->where($where_str);})
+             ->order('d.sort desc ,d.id desc')
+             ->limit($this->off_set,$this->page_num)->select()->toArray();
+         array_walk($list,function (&$v)use ($app_name,$app_log){
+             if(!$v['user_name']) $v['user_name'] = $app_name;
+             if(!$v['headimg']) $v['headimg'] = $app_log;
+         });
+         $this->success('ok',['list'=>$list]);
+
+     }
 
+
+    /**
+     * @title 需求详情【平台】
+     * @desc 需求详情【平台】
+     * @author qc
+     * @method GET
+     * @url /api/Demand/getDemandInfo
+     * @header name:Authorization require:1 desc:Token
+     * @param  name:id type:int default:-- desc:平台发布需求id
+     * @return name:title type:string default:-- desc:标题
+     * @return name:content type:string default:-- desc:需求
+     * @return name:images type:string default:-- desc:图片【多张|隔开】
+     * @return name:user_name type:string default:-- desc:名称
+     * @return name:headimg type:string default:-- desc:头像
+     * @return name:money type:float default:-- desc:金额
+     * @return name:is_over type:int default:-- desc:是否解决【0否，1是】
+     */
+     public function getDemandInfo()
+     {
+         $detail = PlatformDemand::where('id',input('get.id'))->find();
+         if(!$detail || $detail->is_deleted == 1) $this->error('该需求已删除');
+         $this->success('ok',['detail'=>$detail->toArray()]);
      }
 
 
@@ -98,6 +175,28 @@ class Demand extends Base
     }
 
     /**
+     * @title 获取我的需求详情【用户】
+     * @desc 获取我的需求详情【用户】
+     * @author qc
+     * @method GET
+     * @url /api/Demand/getMyDemandDetail
+     * @header name:Authorization require:1 desc:Token
+     * @param  name:id type:int default:0 desc:需求记录id
+     * @return name:title type:string default:-- desc:标题
+     * @return name:content type:string default:-- desc:需求
+     * @return name:status type:int default:-- desc:0待审核1审核通过2审核未通过
+     * @return name:remark type:string default:-- desc:审核备注
+     * @return name:money type:float default:-- desc:金额
+     */
+    public function getMyDemandDetail()
+    {
+        $detail = UserDemand::where(['user_id'=>$this->user_id,'id'=>input('get.id')])->find();
+        if(!$detail || $detail->is_deleted == 1) $this->error('该需求已删除');
+        $this->success('ok',['detail'=>$detail->toArray()]);
+    }
+
+
+    /**
      * @title 删除我的需求【用户】
      * @desc 删除我的需求【用户】
      * @author qc

application/api/controller/Press.php

@@ -12,7 +12,7 @@ use library\tools\Data;
 class Press extends Base
 {
     // 需要登录的
-    protected $need_login = ['pressCollect','pressTransmit','pressRead','PressTags','pressComment','pressCommend'];
+    protected $need_login = ['pressCollect','pressTransmit','pressRead','PressTags','pressComment','pressCommend','delComment'];
     public function initialize()
     {
         parent::initialize();
@@ -144,7 +144,7 @@ class Press extends Base
             $val['children'] =  $children;
             $val['like_num'] = PlatformLike::getPraiseNum($val['id']);
             $val['is_like'] =  PlatformLike::where(['like_id'=>$val['id'],'user_id'=>$user_id,'type'=>1])->count();
-            $parent  = PlatformComment::where(['c.id'=>$val['pid']])
+            $parent  = PlatformComment::where(['c.id'=>$val['pid'],'c.is_deleted'=>0])
                 ->alias('c')->field('c.*,u.name,u.headimg')
                 ->leftJoin('store_member u','u.id = c.user_id')
                 ->find();
@@ -153,7 +153,20 @@ class Press extends Base
         $total_num  = PlatformComment::where($where)->alias('c')->count();
         $this->success('ok',['list'=>$list,'total_num'=>$total_num]);
     }
-    
+
+    /**
+     * @title 删除评论
+     * @desc 删除评论
+     * @author qc
+     * @method POST
+     * @url /api/Press/delComment
+     * @header name:Authorization require:1 desc:Token
+     * @param name:id type:int default:1 desc:评论id
+     */
+    public function delComment(){
+        PlatformComment::where(['id'=>input('post.id'),'user_id'=>$this->user_id])->update(['is_deleted'=>1]);
+        $this->success('删除成功');
+    }
     
     /**
      * @title 以下接口调用验证登录【需要header传Authorization】

application/api/controller/Video.php

@@ -20,7 +20,7 @@ use library\tools\Data;
 class Video extends Base
 {
 
-    protected $need_login = ['userReferVideo','userReferVideoDetail','delUserVideo','videoComment','secondCommend','videoTags','videoTransmit','getMyVideoList'];// 需要登录的
+    protected $need_login = ['userReferVideo','userReferVideoDetail','delUserVideo','videoComment','secondCommend','videoTags','videoTransmit','getMyVideoList','delComment'];// 需要登录的
 
     public function initialize()
     {
@@ -472,6 +472,7 @@ class Video extends Base
      * @return name:children type:array default:-- desc:二级评论（数据同上【二维数组】）
      * @return name:like_num type:int default:-- desc:点赞数量
      * @return name:is_like type:int default:-- desc:是否点赞（0否1是）
+     * @return name:can_delete type:int default:-- desc:是否可以删除（0否1是）
      * @return name:total_num type:int default:-- desc:总评论数（仅一级）
      *
      */
@@ -508,6 +509,7 @@ class Video extends Base
                 ->leftJoin('store_member u','u.id = c.user_id')
                 ->find();
             $val['parent']  = $parent ? $parent->toArray() : null;
+            $val['can_delete']  = $val['user_id'] == $this->user_id ? 1 :0;
         });
 
         $total_num  = VideoComment::where($where)->alias('c')->count();
@@ -515,6 +517,20 @@ class Video extends Base
     }
 
     /**
+     * @title 删除评论
+     * @desc 删除评论
+     * @author qc
+     * @method POST
+     * @url /api/Video/delComment
+     * @header name:Authorization require:1 desc:Token
+     * @param name:id type:int default:1 desc:评论id
+     */
+    public function delComment(){
+        VideoComment::where(['id'=>input('post.id'),'user_id'=>$this->user_id])->update(['is_deleted'=>1]);
+        $this->success('删除成功');
+    }
+
+    /**
      * @title 点赞||取消点赞
      * @desc 点赞||取消点赞
      * @author qc

application/common/model/PlatformDemand.php

@@ -0,0 +1,8 @@
+<?php
+namespace app\common\model;
+use think\Model;
+// 平台发布需求
+class PlatformDemand extends Model
+{
+
+}