lizhen_gitee 1 year ago
parent
commit
6601bbc30b
1 changed files with 17 additions and 13 deletions
  1. 17 13
      application/api/controller/Topicdongtai.php

+ 17 - 13
application/api/controller/Topicdongtai.php

@@ -100,15 +100,16 @@ class Topicdongtai extends Api
 
         $where = [
             'dt.user_id'=>$uid,
-
         ];
         if($uid != $this->auth->id){
             $where['dt.auditstatus'] = 1;  //不是自己的,就只能看审核通过的
         }
 
+        $field = 'dt.*,user.username,user.nickname,user.avatar,user.gender,user.birthday,user.idcard_status,user.real_status';
+
         $list = Db::name('topic_dongtai')->alias('dt')
             ->join('user','dt.user_id = user.id','LEFT')
-            ->field('dt.*,user.username,user.nickname,user.avatar,user.gender,user.birthday,user.idcard_status,user.real_status')
+            ->field($field)
             ->where($where)
             ->order('dt.id desc')->autopage()->select();
         $list = list_domain_image($list,['images','audio_file','avatar','video_file']);
@@ -136,12 +137,14 @@ class Topicdongtai extends Api
     public function delete(){
 
         $id = input('id',0);
+
         $where['id'] = $id;
         $where['user_id'] = $this->auth->id;
-        $dongtai = Db::name('topic_dongtai')->field('id,topic_ids')->where($where)->find();
+        $dongtai = Db::name('topic_dongtai')->field('id')->where($where)->find();
         if (empty($dongtai)) {
             $this->error('未找到动态信息');
         }
+
         Db::startTrans();
         $delRes = Db::name('topic_dongtai')->where('id',$id)->delete();
         if (!$delRes) {
@@ -166,7 +169,7 @@ class Topicdongtai extends Api
 
         //最新
         $order = input('orderby','new');
-        $orderby  = 'dt.id desc';
+        $orderby  = 'dt.goodnum desc,dt.id desc';
 
         //关注
         $where_follow = '';
@@ -199,13 +202,11 @@ class Topicdongtai extends Api
 
         $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')
             ->field($field)
             ->where($where)
             ->where($where_follow)
-            ->where($where_black);
-
-        $list = $list->order($orderby)
+            ->where($where_black)
+            ->order($orderby)
             ->autopage()->select();
         $list = list_domain_image($list,['images','audio_file','avatar']);
 
@@ -227,16 +228,18 @@ class Topicdongtai extends Api
 
         $this->success('success',$list);
     }
+
     //详情
     public function info(){
         $id = input('id');
 
+        $field = 'dt.*,user.username,user.nickname,user.avatar,user.gender,user.birthday,user.idcard_status,user.real_status';
+
         $info = Db::name('topic_dongtai')->alias('dt')
             ->join('user','dt.user_id = user.id','LEFT')
-            ->join('user_wallet uw','user.id = uw.user_id','LEFT')
-            ->field('dt.*,user.username,user.nickname,user.avatar,user.gender,user.birthday,user.attribute,user.idcard_status,uw.vip_endtime')
+            ->field($field)
             ->where('dt.id',$id)->find();
-        $info = info_domain_image($info,['images','audio_file','avatar']);
+        $info = info_domain_image($info,['images','audio_file','avatar','video_file']);
 
 
         if($info){
@@ -337,14 +340,15 @@ class Topicdongtai extends Api
 
         $where = ['good.user_id'=>$this->auth->id];
 
+        $field = 'dt.*,user.username,user.nickname,user.avatar,user.gender,user.birthday,user.idcard_status,user.real_status';
 
         $list = Db::name('topic_dongtai')->alias('dt')
+            ->field($field)
             ->join('user','dt.user_id = user.id','LEFT')
             ->join('topic_dongtai_good good','dt.id = good.dt_id','LEFT')
-            ->field('dt.*,dt.id as dt_id,user.username,user.nickname,user.avatar,user.gender,user.birthday,user.idcard_status,user.real_status')
             ->where($where)
             ->order('dt.id desc')->autopage()->select();
-        $list = list_domain_image($list,['images','audio_file','avatar']);
+        $list = list_domain_image($list,['images','audio_file','avatar','video_file']);
 
         if(!empty($list)){
             foreach($list as $key => &$val){