Default Changelist

app/api/controller/User.php

@@ -110,22 +110,10 @@ class User extends BaseController
             ['page', 1],
             ['pageSize', 50],
         ], $request);
-<<<<<<< HEAD
-
-        $post["pageSize"] = $post["pageSize"] > 50 ? 50 : (int)$post["pageSize"];
-        $post["page"] = $post["page"] <= 0 ? 1 : (int)$post["page"];
-
-        $post["parent_uid"] = $request->user["uid"];
-
-        $data = (new UserModel)->getDataList($post, "u.uid,u.mobile,u.nickname,u.avatar");
-
-
-=======
         $post["pageSize"]  = $post["pageSize"]>50 ? 50 : (int)$post["pageSize"];
         $post["page"]      = $post["page"]<=0     ? 1  : (int)$post["page"];
         $post["parent_uid"]= $request->user["uid"];
         $data = (new UserModel)->getDataList($post,"u.uid,u.mobile,u.nickname,u.avatar");
->>>>>>> 7e9deec4b69946e56f2d67e274125611f70c3461
         return app('json')->success($data);
     }
     
@@ -168,49 +156,6 @@ class User extends BaseController
           }
         return app('json')->success(compact('count','list'));
      }
-    
-    
-    
-
-
-    /**
-     * 获取用户总邀请人数排行榜
-     * @param Request $request
-     */
-    public function getInviterRanking(Request $request){
-        $time = $request->param('time', time());
-        $times = explode(" - ",$time);
-        $page = $request->param('page', 1); // 获取请求中的页码参数，默认为 1  123123
-        $pageSize = $request->param('pageSize', 6); // 获取请求中的每页记录数参数，默认为 6
-        if(sizeof($times)==2)
-        {
-            $count = (new UserModel) -> where('parent_uid', $request->user['uid'])->where('regtime','>=',$times[0])->where('regtime','<',$times[1])->count();
-        }
-        else
-        {
-            $count = (new UserModel) -> where('parent_uid', $request->user['uid'])->count();
-        }
-        $uids = (new UserModel) -> where('parent_uid', $request->user['uid'])
-            -> column('uid');
-        $InfoAudit= new InfoAudit();
-        $list = [];
-        if($count)
-        {
-            $list = (new UserModel)  -> where('parent_uid', 'in',$uids)
-                -> group('parent_uid')
-                -> field('parent_uid, COUNT(*) AS count')
-                -> order('count', 'DESC')
-                -> page($page,$pageSize)
-                -> select()
-                -> toArray();
-
-            foreach ($list as &$v)
-            {
-                $v['auth_info'] = $InfoAudit->where('uid',$v['uid'])->where('status',1)->find();
-            }
-        }
-        return app('json')->success(compact('count','list'));
-    }
 
 
     /**