热门圈子

application/api/controller/Friend.php

@@ -29,11 +29,7 @@ class Friend extends Api{
      */
     public function getCircleList(){
         $page = $this->request->post('page',1);
-        $type = $this->request->post('type','');//my_circle:我的圈子
         $where = ['status' =>1];
-        if($type == 'my_circle'){
-            $where['user_id'] = $this->auth->id;
-        }
         $list = HotcircleModel::where($where)
             ->page($page)
             ->limit($this->pageSize)
@@ -65,7 +61,10 @@ class Friend extends Api{
      * 加入圈子
      */
     public function joinCircle(){
-        $hot_circle_id = $this->request->post('hot_circle_id',1);
+        $hot_circle_id = $this->request->post('hot_circle_id',0);
+        if(!$hot_circle_id){
+            $this->error('请选择圈子');
+        }
         $fastim = Db::name('fastim_user')->where(['user_id' =>$this->auth->id])->find();
         $data = [
             'user_id' =>$this->auth->id,