动态的三个新列表

application/api/controller/Topicdongtai.php

@@ -598,52 +598,96 @@ class Topicdongtai extends Api
         }
     }
 
-    ////////////////////////////////////////////////////////////
 
-    //消息-互动消息-评论
-    //谁评论了我
-    public function msg_answer(){
+
+
+    //我的评论
+    public function my_answer(){
         $map = [
             'dt.user_id' => $this->auth->id,
             'a.level'    => 1,
         ];
         $list = Db::name('topic_dongtai_answer')->alias('a')
-            ->field('a.id,a.createtime,user.nickname,user.gender,user.avatar')
+            ->field('a.id,a.createtime,a.content,
+            dt.content as dt_content,dt.type as dt_type,dtuser.nickname as dtuser_nickname,
+            user.nickname,user.avatar,user.gender,user.birthday,user.attribute,uw.vip_endtime')
             ->join('topic_dongtai dt','a.dt_id = dt.id','LEFT')
+            ->join('user dtuser','dt.user_id = dtuser.id','LEFT')
             ->join('user','a.user_id = user.id','LEFT')
+            ->join('user_wallet uw','user.id = uw.user_id','LEFT')
             ->where($map)->order('a.id desc')->autopage()->select();
         $list = list_domain_image($list,['avatar']);
         if(!empty($list)){
             foreach($list as $key => &$val){
-                //时间
-                $val['createtime_text'] = get_last_time($val['createtime']);
+
+                //用户年龄
+                $val['age'] = birthtime_to_age($val['birthday']);
+                unset($val['birthday']);
+
+                //用户vip
+                $val['is_vip'] = $val['vip_endtime'] > time() ? 1 : 0;
+                unset($val['vip_endtime']);
+
             }
         }
 
         $this->success(1,$list);
     }
 
+    //删除我的某个评论
+    public function delete_answer(){
+        $id = input('id',0);
+        Db::name('topic_dongtai_answer')->where('id',$id)->where('user_id',$this->auth->id)->delete();
+
+        $this->success();
+    }
+
+
+    //我点赞的动态
+    public function my_good(){
+
+
+        $where = ['good.user_id'=>$this->auth->id];
+
+
+        $list = Db::name('topic_dongtai')->alias('dt')
+            ->join('user','dt.user_id = user.id','LEFT')
+            ->join('user_wallet uw','user.id = uw.user_id','LEFT')
+            ->join('topic_dongtai_good good','dt.id = good.dt_id','LEFT')
+            ->field('dt.*,user.nickname,user.avatar,user.gender,user.birthday,user.attribute,uw.vip_endtime')
+            ->where($where)
+            ->order('dt.id desc')->autopage()->select();
+        $list = list_domain_image($list,['images','audio_file','avatar']);
 
-    //消息-互动消息-获赞
-    //谁赞了我
-    public function msg_good(){
-        $map = [
-            'dt.user_id' => $this->auth->id,
-        ];
-        $list = Db::name('topic_dongtai_good')->alias('g')
-            ->field('g.id,g.createtime,user.nickname,user.gender,user.avatar')
-            ->join('topic_dongtai dt','g.dt_id = dt.id','LEFT')
-            ->join('user','g.user_id = user.id','LEFT')
-            ->where($map)->order('g.id desc')->autopage()->select();
-        $list = list_domain_image($list,['avatar']);
         if(!empty($list)){
             foreach($list as $key => &$val){
+
+                //用户年龄
+                $val['age'] = birthtime_to_age($val['birthday']);
+                unset($val['birthday']);
+
+                //用户vip
+                $val['is_vip'] = $val['vip_endtime'] > time() ? 1 : 0;
+                unset($val['vip_endtime']);
+
+                //追加点赞
+                $val['isgood'] = $this->is_good($val['id'],$this->auth->id);
+
                 //时间
                 $val['createtime_text'] = get_last_time($val['createtime']);
+
+                //关注
+                $val['is_follow'] = $this->is_follow($val['user_id'],$this->auth->id);
+
+                //层主评论数量
+                $val['answernumber'] = Db::name('topic_dongtai_answer')->where(['dt_id'=>$val['id'],'level'=>1])->count();
+
+                //话题
+                $val['topic_text'] = Db::name('topic_hub')->where('id','IN',$val['topic_ids'])->column('name');
             }
         }
 
-        $this->success(1,$list);
+        $this->success('success',$list);
     }