Forráskód Böngészése

用户背包礼物,用户的动态列表,用户家族信息

lizhen_gitee 1 éve
szülő
commit
916f0f5d5b

+ 2 - 1
application/api/controller/Gift.php

@@ -53,7 +53,8 @@ class Gift extends Api
      * 获取我的背包礼物
      */
     public function getMyBackGift() {
-        $userid = $this->auth->id;
+
+        $userid = $this->request->request("user_id", $this->auth->id);
         $page = $this->request->request('page',1); // 分页
         $pageNum = $this->request->request('pageNum',10); // 分页
         // 分页搜索构建

+ 10 - 1
application/api/controller/Topicdongtai.php

@@ -61,6 +61,8 @@ class Topicdongtai extends Api
 
         if(!empty($list)){
             foreach($list as $key => &$val){
+
+                //追加点赞
                 $val['isgood'] = $this->is_good($val['id'],$this->auth->id);
 
                 //创建视频缩略图
@@ -71,7 +73,14 @@ class Topicdongtai extends Api
                     $val['images_thumb'] = join('.', $images_url) . '_0.jpg';
                 }
 
+                //时间
                 $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();
             }
         }
 
@@ -147,7 +156,7 @@ class Topicdongtai extends Api
             $info['createtime_text'] = get_last_time($info['createtime']);
 
             //关注
-            $val['is_follow'] = $this->is_follow($info['user_id'],$this->auth->id);
+            $info['is_follow'] = $this->is_follow($info['user_id'],$this->auth->id);
 
             //评论
             $info['answernumber'] = Db::name('topic_dongtai_answer')->where(['dt_id'=>$id,'level'=>1])->count();

+ 1 - 1
application/api/controller/User.php

@@ -671,7 +671,7 @@ class User extends Api
         $content = $this->request->param('content');// 内容
         $images = $this->request->param('images');// 图片
         $ruser_id = $this->request->param('ruser_id');// 被举报用户ID
-        if (!$type || !$content || !$image || !$ruser_id) {
+        if (!$type || !$content || !$images || !$ruser_id) {
             $this->error("请完成举报内容!");
         }
         $user_id = $this->auth->id;

+ 10 - 0
application/api/controller/Usercenter.php

@@ -87,6 +87,16 @@ class UserCenter extends Common
             $userInfo['party_info'] = ['party_id' => $party['id'], 'room_type' => $party['room_type']];
         }
 
+        //家族信息
+        $userInfo['guild_info'] = json([]);
+        $memberinfo = Db::name('guild_member')->alias('m')->field('guild.name,guild.image,guild.member,guild.desc')->join('guild','m.guild_id = guild.id','LEFT')->where(['m.user_id'=>$user_id,'m.status'=>1])->find();
+        if ($memberinfo) {
+            $userInfo['memberinfo'] = $memberinfo;
+        }
+        //动态
+        //技能
+        //礼物
+
         //访客记录
         $visit_data = [
             'user_id' => $this->auth->id,