首页房间排行和默认选择类型

application/api/model/Room.php

@@ -190,22 +190,20 @@ class Room extends Model
 //        $map['is_show_room'] = 1;//是否显示房间 1是2否
         $map['apply_status'] = 2;//1待审核 2审核通过 3审核失败
 
-        if(!empty($label_id) && $label_id > 0){
-            $map['type_id'] = $label_id;
-            if($label_id == 1){
-                $map['label_id'] = 1;
-            }
-        }
-        if(!empty($label_id) && $label_id == -1){
-            $map['is_hot'] = 2;
-        }
-
-        if(!empty($label_id) && $label_id == -2){
-            $map['label_id'] = 2;
-        }
-
         if($is_top == 2){
             $map['is_top'] = $is_top;
+        }else{
+            if($label_id == -1){
+                $map['is_hot'] = 2;
+            }
+            if($label_id == 0){
+                $map['type_id'] = 2;
+                //label_id == 3 或 label_id == 4
+                $map['label_id'] = ['in', [3, 4]];
+            }
+            if($label_id >= 1){
+                $map['label_id'] = $label_id;
+            }
         }
 
         $list = db::name('vs_room')