diff --git a/application/api/controller/Index.php b/application/api/controller/Index.php index 1cf658e..0d91d19 100644 --- a/application/api/controller/Index.php +++ b/application/api/controller/Index.php @@ -20,7 +20,7 @@ class Index extends BaseCom $is_top = input('is_top', 0); //1非置顶2置顶 $label_id = input('label_id', 0); $page = input('page', 1); - $page_limit = input('page_limit', 15); + $page_limit = input('page_limit', 20); $reslut = model('Room')->room_list($label_id,$is_top, $page, $page_limit); return V($reslut['code'], $reslut['msg'], $reslut['data'], $reslut['api_version']); diff --git a/application/api/model/Room.php b/application/api/model/Room.php index 909f720..e78f2ee 100644 --- a/application/api/model/Room.php +++ b/application/api/model/Room.php @@ -197,17 +197,17 @@ class Room extends Model } $list = db::name('vs_room')->field('id as room_id,room_number,user_id,room_name,room_cover,room_password,today_hot_value as hot_value,label_id,is_show_room') - ->where($map)->order('hot_value desc')->page($page, $page_limit)->select(); + ->where($map)->order('hot_value desc, id desc')->page($page, $page_limit)->select(); // var_dump($list); foreach ($list as $k => &$v){ - if($v['is_show_room'] == 2){ //是否显示房间 1是2否 - //查询当前房间是否有主持在麦上 - $room_host_info = db::name('vs_room_pit')->where(['room_id' => $v['room_id'], 'pit_number' => 9])->value('user_id'); - if($room_host_info == 0){ - unset($list[$k]); - continue; - } - } +// if($v['is_show_room'] == 2){ //是否显示房间 1是2否 +// //查询当前房间是否有主持在麦上 +// $room_host_info = db::name('vs_room_pit')->where(['room_id' => $v['room_id'], 'pit_number' => 9])->value('user_id'); +// if($room_host_info == 0){ +// unset($list[$k]); +// continue; +// } +// } // $v['hot_value'] = $v['hot_value'] * 10; $v['user_list'] = model('RoomUser')->get_room_user_list($v['room_id']); $v['label_name'] = db::name('vs_room_label')->where('id', $v['label_id'])->value('label_name');