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

app/Http/Controllers/ConfigController.php

@@ -89,6 +89,12 @@ class ConfigController extends Controller
                 3=>'活动',
                 4=>'话题',
             ],
+            'floor_type'=>[
+                0=>'banner',
+                1=>'推荐关注',
+                2=>'热门视频',
+                3=>'推荐话题',
+             ],
             'behavior_status'=>[
                 '1' => '已登记行为',
                 '0' => '未登记行为'
@@ -112,6 +118,7 @@ class ConfigController extends Controller
             'release_status'=>[
                 '1'=>'正常',
                 '0'=>'异常'
+
             ]
         ];
     }

app/Repositories/Post/PostRepository.php

@@ -300,6 +300,10 @@ class PostRepository
             $where[] = ['type', $request['type']];
         }
 
+        if(isset($request['uid'])){
+            $where[] = ['uid', $request['uid']];
+        }
+
         $sort = 'post.id';
         if(isset($request['sort']) && in_array($request['sort'], ['praise_count', 'share_count', 'pv', 'comment_count', 'create_bean'])){
             $sort = $request['sort'];