diff --git a/application/api/controller/UserCp.php b/application/api/controller/UserCp.php index f2f8520..d7ed72d 100644 --- a/application/api/controller/UserCp.php +++ b/application/api/controller/UserCp.php @@ -26,8 +26,10 @@ class UserCp extends BaseCom //Cp 空间 public function cpZone() { + $page = input('page', 1); + $page_limit = input('page_limit', 15); $user_id = input('user_id', 0); - $reslut = model('UserCp')->cpZone($user_id); + $reslut = model('UserCp')->cpZone($user_id, $page, $page_limit); return V($reslut['code'], $reslut['msg'], $reslut['data']); } diff --git a/application/api/model/UserCp.php b/application/api/model/UserCp.php index 69aae42..7bdc1a8 100644 --- a/application/api/model/UserCp.php +++ b/application/api/model/UserCp.php @@ -225,7 +225,7 @@ class UserCp extends Model * Cp空间 * @param $user_id 用户ID */ - public function cpZone($user_id) + public function cpZone($user_id, $page, $page_limit) { $res = Db::name('user_cp_zone')->where(['user_id1' => $user_id,'status' => 1])->find(); if(!$res){ @@ -237,8 +237,9 @@ class UserCp extends Model //升下一级所需经验值 $next_level_exp = Db::name('user_cp_level')->where(['level' => ['>',$res['level']]])->order('level asc')->value('change_value'); $res['next_level_exp'] = $next_level_exp - $res['exp']; + $res['pendant'] = model('api/Decorate')->user_decorate_detail($user_id, 11);//挂件(装扮) //送礼记录 - $res['gift_log'] = Db::name('user_cp_gift_log')->where(['cp_zone_id' => $res['id']])->select(); + $res['gift_log'] = Db::name('user_cp_gift_log')->where(['cp_zone_id' => $res['id']])->page($page,$page_limit)->select(); foreach ($res['gift_log'] as &$v){ $v['gift_name'] = Db::name('vs_gift')->where(['gid' => $v['gift_id']])->value('gift_name'); $v['from_user_info'] = Db::name('user')->where(['id' => $v['from_user_id']])->field('id user_id,nickname,avatar')->find();