Merge branch 'develop' of http://git.caihongxingqiu.net/rainbow/community-service into develop

app/Http/Controllers/V1/PostController.php

@@ -134,7 +134,14 @@ class PostController extends Controller
             Log::info('获取用户信息失败');
             return jsonError('获取用户信息失败');
         }
-        $list = $this->postRepositories->myPost($request['type'], $userInfo['uid']);
+        $param = $request->all();
+        if(isset($param['uid'])){
+            $uid = $param['uid'];
+        }else{
+            $uid = $userInfo['uid'];
+        }
+
+        $list = $this->postRepositories->myPost($param, $uid);
         $fractal = new Manager();
         $resource = new Collection($list, new MyTransformer());
         $resource->setPaginator(new IlluminatePaginatorAdapter($list));

app/Repositories/PostRepositories.php

@@ -303,8 +303,9 @@ class PostRepositories
     /**
      * 个人中心内容列表
      */
-    public function MyPost($type, $uid)
+    public function MyPost($request, $uid)
     {
+        $type = $request['type'];
         $perPage = isset($request['per_page']) ? $request['per_page'] : 20;
 
         $where = [];

app/Transformers/FeedTransformer.php

@@ -32,15 +32,9 @@ class FeedTransformer extends TransformerAbstract {
            // 'follow_status' => $this->getFollowStatus($feed['uid'],$feed['follow_uid']),
             'type' => $feed['type'],
             'relate_id' => $feed['relate_id'],
-            'relate_data' => $feed['relate_data'],
-            'content' => json_decode($feed['content']),
+            'relate_data' => !empty($feed['relate_data'])?$feed['relate_data']:'',
+            'content' => !empty($feed['content'])?json_decode($feed['content']):'',
             'created_at' => Carbon::parse($feed['created_at'])->diffForHumans(),
         ];
     }
-    public function getData($feed){
-//        if($feed['type'] == 6){
-//           return $this->detail($feed['relate_id']);
-//        }
-    }
-
 }

app/Transformers/Post/MyTransformer.php

@@ -17,7 +17,7 @@ class MyTransformer extends TransformerAbstract
         return [
             'id' => $post['id'],
             'img' => $post['img'],
-            'create_bean' => $post->data->create_bean,
+            'type' => $post['type'],
             'collect_bean' => $post->data->collect_bean,
         ];
     }