|
@@ -18,6 +18,7 @@ class IndexController extends Controller
|
|
* @apiGroup Index
|
|
* @apiGroup Index
|
|
* @apiPermission none
|
|
* @apiPermission none
|
|
* @apiVersion 0.1.0
|
|
* @apiVersion 0.1.0
|
|
|
|
+ * @apiParam {int} [page=1] 页码(分页参数)
|
|
* @apiSuccessExample {json} Success-Response:
|
|
* @apiSuccessExample {json} Success-Response:
|
|
* HTTP/1.1 200 OK
|
|
* HTTP/1.1 200 OK
|
|
*{
|
|
*{
|
|
@@ -26,7 +27,7 @@ class IndexController extends Controller
|
|
*"message": "",
|
|
*"message": "",
|
|
*"data": {
|
|
*"data": {
|
|
* "banner": [], 轮播图
|
|
* "banner": [], 轮播图
|
|
- * "other_user": [ 动态用户
|
|
|
|
|
|
+ * "users": [ 动态用户
|
|
* 'news_num':2 新消息数目
|
|
* 'news_num':2 新消息数目
|
|
* ],
|
|
* ],
|
|
* "dreams": [
|
|
* "dreams": [
|
|
@@ -59,17 +60,17 @@ class IndexController extends Controller
|
|
$banner = $this->getBanner();
|
|
$banner = $this->getBanner();
|
|
// 关注的用户
|
|
// 关注的用户
|
|
$arr = $user->UserCareUser;
|
|
$arr = $user->UserCareUser;
|
|
- $other_user = [] ;
|
|
|
|
|
|
+ $users = [] ;
|
|
foreach ($arr as $k => $v){
|
|
foreach ($arr as $k => $v){
|
|
if ($v->pivot->dream_num > 0) {
|
|
if ($v->pivot->dream_num > 0) {
|
|
$v->news_num = $v->pivot->dream_num;
|
|
$v->news_num = $v->pivot->dream_num;
|
|
- $other_user[] = $v;
|
|
|
|
|
|
+ $users[] = $v;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
// 获取其他用户信息 及梦想
|
|
// 获取其他用户信息 及梦想
|
|
- $dreams = DreamInfoModel::orderBy('score','desc')->limit(20)->get();
|
|
|
|
|
|
+ $dreams = DreamInfoModel::orderBy('score','desc')->limit(20)->paginate(20);
|
|
$this->dreams($dreams);
|
|
$this->dreams($dreams);
|
|
- return $this->api(compact('banner','other_user','dreams'));
|
|
|
|
|
|
+ return $this->api(compact('banner','users','dreams'));
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -85,7 +86,7 @@ class IndexController extends Controller
|
|
*"status_code": 0,
|
|
*"status_code": 0,
|
|
*"message": "",
|
|
*"message": "",
|
|
*"data": {
|
|
*"data": {
|
|
- * "other_user": [ 动态用户
|
|
|
|
|
|
+ * "users": [ 动态用户
|
|
* 'news_num':2 新消息数目
|
|
* 'news_num':2 新消息数目
|
|
* ],
|
|
* ],
|
|
* "dreams": [
|
|
* "dreams": [
|
|
@@ -116,17 +117,18 @@ class IndexController extends Controller
|
|
$user = $this->getUser();
|
|
$user = $this->getUser();
|
|
// 关注的用户
|
|
// 关注的用户
|
|
$arr = $user->UserCareUser;
|
|
$arr = $user->UserCareUser;
|
|
- $other_user = [] ;
|
|
|
|
|
|
+ $users = [] ;
|
|
|
|
+
|
|
foreach ($arr as $k => $v){
|
|
foreach ($arr as $k => $v){
|
|
if ($v->pivot->dream_num > 0) {
|
|
if ($v->pivot->dream_num > 0) {
|
|
$v->news_num = $v->pivot->dream_num;
|
|
$v->news_num = $v->pivot->dream_num;
|
|
- $other_user[] = $v;
|
|
|
|
|
|
+ $users[] = $v;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
// 获取其他用户信息 及梦想
|
|
// 获取其他用户信息 及梦想
|
|
- $dreams = DreamInfoModel::orderBy('score','desc')->offset(20)->limit(100)->get();
|
|
|
|
|
|
+ $dreams = DreamInfoModel::orderBy('score','desc')->offset(20)->limit(100)->paginate(20);
|
|
$this->dreams($dreams);
|
|
$this->dreams($dreams);
|
|
- return $this->api(compact('other_user','dreams'));
|
|
|
|
|
|
+ return $this->api(compact('users','dreams'));
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -142,7 +144,7 @@ class IndexController extends Controller
|
|
*"status_code": 0,
|
|
*"status_code": 0,
|
|
*"message": "",
|
|
*"message": "",
|
|
*"data": {
|
|
*"data": {
|
|
- * "other_user": [
|
|
|
|
|
|
+ * "users": [
|
|
* 'news_num':2 新消息数目
|
|
* 'news_num':2 新消息数目
|
|
* ], 动态用户
|
|
* ], 动态用户
|
|
* "dreams": [
|
|
* "dreams": [
|
|
@@ -173,17 +175,17 @@ class IndexController extends Controller
|
|
$user = $this->getUser();
|
|
$user = $this->getUser();
|
|
// 关注的用户
|
|
// 关注的用户
|
|
$arr = $user->UserCareUser;
|
|
$arr = $user->UserCareUser;
|
|
- $other_user = [] ;
|
|
|
|
|
|
+ $users = [] ;
|
|
foreach ($arr as $k => $v){
|
|
foreach ($arr as $k => $v){
|
|
if ($v->pivot->dream_num > 0) {
|
|
if ($v->pivot->dream_num > 0) {
|
|
$v->news_num = $v->pivot->dream_num;
|
|
$v->news_num = $v->pivot->dream_num;
|
|
- $other_user[] = $v;
|
|
|
|
|
|
+ $users[] = $v;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
// 获取其他用户信息 及梦想
|
|
// 获取其他用户信息 及梦想
|
|
- $dreams = DreamInfoModel::orderBy('score','desc')->offset(100)->limit(500)->get();
|
|
|
|
|
|
+ $dreams = DreamInfoModel::orderBy('score','desc')->offset(100)->limit(500)->paginate(20);
|
|
$this->dreams($dreams);
|
|
$this->dreams($dreams);
|
|
- return $this->api(compact('other_user','dreams'));
|
|
|
|
|
|
+ return $this->api(compact('$users','dreams'));
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -235,15 +237,15 @@ class IndexController extends Controller
|
|
{
|
|
{
|
|
$user = $this->getUser();
|
|
$user = $this->getUser();
|
|
$keyword ='%'.$request->keyword.'%';
|
|
$keyword ='%'.$request->keyword.'%';
|
|
- $data1 = UserInfoModel::where('nickname','like',$keyword)->get();
|
|
|
|
|
|
+ $data1 = UserInfoModel::where('nickname','like',$keyword)->paginate(20);
|
|
$data2 = DreamInfoModel::where('dream','like',$keyword)->
|
|
$data2 = DreamInfoModel::where('dream','like',$keyword)->
|
|
- orWhere('dream','like',$keyword)->get();
|
|
|
|
- $data3 = BaseSettingsModel::where('category','sign')->where('value','like',$keyword)->get();
|
|
|
|
|
|
+ orWhere('dream','like',$keyword)->paginate(20);
|
|
|
|
+ $data3 = BaseSettingsModel::where('category','sign')->where('value','like',$keyword)->paginate(20);
|
|
if (empty($request->keyword)) {
|
|
if (empty($request->keyword)) {
|
|
// 历史搜索
|
|
// 历史搜索
|
|
- $data1 = $user->search()->orderBy('id','desc')->limit(10)->get();
|
|
|
|
|
|
+ $data1 = $user->search()->orderBy('id','desc')->limit(10)->paginate(20);
|
|
// 热门搜索
|
|
// 热门搜索
|
|
- $data2 = SearchInfoModel::get();
|
|
|
|
|
|
+ $data2 = SearchInfoModel::paginate(20);
|
|
$arr = [];
|
|
$arr = [];
|
|
foreach ($data2 as $k => $v) {
|
|
foreach ($data2 as $k => $v) {
|
|
if (count($arr) == 8) {
|
|
if (count($arr) == 8) {
|
|
@@ -292,7 +294,7 @@ class IndexController extends Controller
|
|
return $this->api('');
|
|
return $this->api('');
|
|
}
|
|
}
|
|
$keyword ='%'.$request->keyword.'%';
|
|
$keyword ='%'.$request->keyword.'%';
|
|
- $data1 = UserInfoModel::where('nickname','like',$keyword)->get();
|
|
|
|
|
|
+ $data1 = UserInfoModel::where('nickname','like',$keyword)->paginate(20);
|
|
return $this->api(compact('data1'));
|
|
return $this->api(compact('data1'));
|
|
}
|
|
}
|
|
|
|
|
|
@@ -305,24 +307,24 @@ class IndexController extends Controller
|
|
* @apiParam {string} keyword 关键字
|
|
* @apiParam {string} keyword 关键字
|
|
* @apiSuccessExample {json} Success-Response:
|
|
* @apiSuccessExample {json} Success-Response:
|
|
* HTTP/1.1 200 OK
|
|
* HTTP/1.1 200 OK
|
|
- {
|
|
|
|
- "status": true,
|
|
|
|
- "status_code": 0,
|
|
|
|
- "message": "",
|
|
|
|
- "data": {
|
|
|
|
- "data": [
|
|
|
|
- {
|
|
|
|
- "dream": "haha", 梦想名
|
|
|
|
- "user_pic": [
|
|
|
|
- {
|
|
|
|
- "pic": "", 用户头像
|
|
|
|
- }
|
|
|
|
- ],
|
|
|
|
- "dream_img": "", 梦想图片
|
|
|
|
- }
|
|
|
|
- ]
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ *{
|
|
|
|
+ * "status": true,
|
|
|
|
+ * "status_code": 0,
|
|
|
|
+ * "message": "",
|
|
|
|
+ * "data": {
|
|
|
|
+ * "data": [
|
|
|
|
+ * {
|
|
|
|
+ * "dream": "haha", 梦想名
|
|
|
|
+ * "user_pic": [
|
|
|
|
+ * {
|
|
|
|
+ * "pic": "", 用户头像
|
|
|
|
+ * }
|
|
|
|
+ * ],
|
|
|
|
+ * "dream_img": "", 梦想图片
|
|
|
|
+ * }
|
|
|
|
+ * ]
|
|
|
|
+ * }
|
|
|
|
+ *}
|
|
* @apiErrorExample {json} Error-Response:
|
|
* @apiErrorExample {json} Error-Response:
|
|
* HTTP/1.1 400 Bad Request
|
|
* HTTP/1.1 400 Bad Request
|
|
*/
|
|
*/
|
|
@@ -333,7 +335,7 @@ class IndexController extends Controller
|
|
}
|
|
}
|
|
$keyword ='%'.$request->keyword.'%';
|
|
$keyword ='%'.$request->keyword.'%';
|
|
$data = DreamInfoModel::where('dream','like',$keyword)->
|
|
$data = DreamInfoModel::where('dream','like',$keyword)->
|
|
- orWhere('dream','like',$keyword)->get();
|
|
|
|
|
|
+ orWhere('dream','like',$keyword)->paginate(20);
|
|
foreach ($data as $k => $value) {
|
|
foreach ($data as $k => $value) {
|
|
$value->user_pic = $value->dreamFindUser;
|
|
$value->user_pic = $value->dreamFindUser;
|
|
$value->dream_img = $value->dreamImgsFirst->pic;
|
|
$value->dream_img = $value->dreamImgsFirst->pic;
|
|
@@ -356,7 +358,7 @@ class IndexController extends Controller
|
|
$dream->dream_find_user = $dream->dreamFindUser;
|
|
$dream->dream_find_user = $dream->dreamFindUser;
|
|
// 计算被关注总人数
|
|
// 计算被关注总人数
|
|
$user_id = UserDream::where('dream_id',$dream->id)->first()->user_id;
|
|
$user_id = UserDream::where('dream_id',$dream->id)->first()->user_id;
|
|
- $data = UserCareUser::where('other_user_id',$user_id)->get();
|
|
|
|
|
|
+ $data = UserCareUser::where('other_user_id',$user_id)->paginate(20);
|
|
$dream->care_num = count($data);
|
|
$dream->care_num = count($data);
|
|
$dream->dream_first_pic = $dream->dreamImgsFirst;
|
|
$dream->dream_first_pic = $dream->dreamImgsFirst;
|
|
}
|
|
}
|
|
@@ -371,37 +373,46 @@ class IndexController extends Controller
|
|
* @apiParam {int} id 被点击用户ID
|
|
* @apiParam {int} id 被点击用户ID
|
|
* @apiSuccessExample {json} Success-Response:
|
|
* @apiSuccessExample {json} Success-Response:
|
|
* HTTP/1.1 200 OK
|
|
* HTTP/1.1 200 OK
|
|
- {
|
|
|
|
- "status": true,
|
|
|
|
- "status_code": 0,
|
|
|
|
- "message": "",
|
|
|
|
- "data": [
|
|
|
|
- {
|
|
|
|
- "id": 12,
|
|
|
|
- "dream": "123",
|
|
|
|
- "about": "124",
|
|
|
|
- "sign": null,
|
|
|
|
- "videos": "234",
|
|
|
|
- "money": 2345,
|
|
|
|
- "time": 0, 倒计时 s
|
|
|
|
- "get_money": 0,
|
|
|
|
- "mark": 0,
|
|
|
|
- "status": 0,
|
|
|
|
- "score": 3,
|
|
|
|
- "created_at": "2017-06-15 08:46:52",
|
|
|
|
- "updated_at": "2017-06-15 08:46:52",
|
|
|
|
- "deleted_at": null,
|
|
|
|
- "imgs": [
|
|
|
|
- {
|
|
|
|
- "id": 8,
|
|
|
|
- "dream_id": 12,
|
|
|
|
- "title": "",
|
|
|
|
- "pic": "....png", 梦想图片
|
|
|
|
- },
|
|
|
|
- ],
|
|
|
|
- }
|
|
|
|
- ]
|
|
|
|
- }
|
|
|
|
|
|
+ *{
|
|
|
|
+ * "status": true,
|
|
|
|
+ * "status_code": 0,
|
|
|
|
+ * "message": "",
|
|
|
|
+ * "data": [
|
|
|
|
+ * {
|
|
|
|
+ * "dream": "1的梦想",
|
|
|
|
+ * "about": "介绍",
|
|
|
|
+ * "video": "",
|
|
|
|
+ * "time": 0,
|
|
|
|
+ * "status": 0,
|
|
|
|
+ * "updated_at": null,
|
|
|
|
+ * "dream_imgs": [
|
|
|
|
+ * {
|
|
|
|
+ * "title": "1", 梦想图片介绍
|
|
|
|
+ * "pic": "111", 梦想图片
|
|
|
|
+ * },
|
|
|
|
+ * ],
|
|
|
|
+ * "comments": [
|
|
|
|
+ * {
|
|
|
|
+ * "user_id": 2,
|
|
|
|
+ * "level": 0,
|
|
|
|
+ * "content": "评论内容", 评论内容
|
|
|
|
+ * "updated_at": null,
|
|
|
|
+ * "pic": "", 评论者头像
|
|
|
|
+ * "replay": [
|
|
|
|
+ * {
|
|
|
|
+ * "level": 0,
|
|
|
|
+ * "content": "回复内容", 回复内容
|
|
|
|
+ * "updated_at": null,
|
|
|
|
+ * "pic": "" 回复者头像
|
|
|
|
+ * }
|
|
|
|
+ * ]
|
|
|
|
+ * }
|
|
|
|
+ * ],
|
|
|
|
+ * }
|
|
|
|
+ * ]
|
|
|
|
+ * }
|
|
|
|
+ * ]
|
|
|
|
+ *}
|
|
* @apiErrorExample {json} Error-Response:
|
|
* @apiErrorExample {json} Error-Response:
|
|
* HTTP/1.1 400 Bad Request
|
|
* HTTP/1.1 400 Bad Request
|
|
*/
|
|
*/
|
|
@@ -414,7 +425,15 @@ class IndexController extends Controller
|
|
UserCareUser::where('user_id',$user->id)->where('other_user_id',$other_id)->update(['dream_num'=>0]);
|
|
UserCareUser::where('user_id',$user->id)->where('other_user_id',$other_id)->update(['dream_num'=>0]);
|
|
$data = UserInfoModel::find($other_id)->UserDream;
|
|
$data = UserInfoModel::find($other_id)->UserDream;
|
|
foreach ($data as $item) {
|
|
foreach ($data as $item) {
|
|
- $item->imgs = $item->dreamImgs ;
|
|
|
|
|
|
+ $item->dream_imgs = $item->dreamImgs ;
|
|
|
|
+ $item->comments = $item->DreamInfo;
|
|
|
|
+ foreach ( $item->comments as $k => $v){
|
|
|
|
+ $v->pic = UserInfoModel::find($v->user_id)->pic;
|
|
|
|
+ $v->replay = $v->replay;
|
|
|
|
+ foreach ($v->replay as $k1 => $v1){
|
|
|
|
+ $v1->pic = UserInfoModel::find($v1->user_id)->pic;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|
|
return $this->api($data);
|
|
return $this->api($data);
|
|
}
|
|
}
|