动态完善

application/api/controller/Topicdongtai.php

@@ -337,6 +337,9 @@ class Topicdongtai extends Api
                     $val['childremark'] = $answer_info['nickname'].'...等人,共'.$number.'条回复';
                 }
 
+                //时间处理
+                $val['createtime_text'] = $this->get_last_time($val['createtime']);
+
                 //回复是否已赞
                 $val['is_good'] = $this->answer_is_good($val['id'],$this->auth->id);
             }
@@ -356,6 +359,7 @@ class Topicdongtai extends Api
             ->join('user','a.user_id = user.id','LEFT')
             ->where(['a.id'=>$floor_id])->find();
         $floor_info = info_domain_image($floor_info,['avatar']);
+        $floor_info['createtime_text'] = $this->get_last_time($floor_info['createtime']);
         //回复是否已赞
         $floor_info['is_good'] = $this->answer_is_good($floor_id,$this->auth->id);
 
@@ -370,6 +374,7 @@ class Topicdongtai extends Api
         if(!empty($child_lists)){
             foreach($child_lists as $key => &$answer){
                 $answer['is_good'] = $this->answer_is_good($answer['id'],$this->auth->id);
+                $answer['createtime_text'] = $this->get_last_time($answer['createtime']);
             }
         }
 
@@ -401,9 +406,17 @@ class Topicdongtai extends Api
         }
 
         //排除屏蔽的
-        $screen = 1;
+        $screen_ids = Db::name('topic_dongtai_screen')->where('user_id',$this->auth->id)->column('dt_id');
+        if(!empty($screen_ids)){
+            $where['dt.id'] = ['NOTIN',$screen_ids];
+        }
         //排除黑名单的
+        $black_ids = Db::name('user_blacklist')->where('user_id',$this->auth->id)->column('black_user_id');
+        if(!empty($black_ids)){
+            $where['dt.user_id'] = ['NOTIN',$black_ids];
+        }
 
+        //
         $list = Db::name('topic_dongtai')->alias('dt')
             ->join('user','dt.user_id = user.id','LEFT')
             ->join('topic_hub topic','dt.topic_id = topic.id','LEFT')