diff --git a/application/api/controller/RoomPit.php b/application/api/controller/RoomPit.php
index 3b64d4f..1e2061c 100644
--- a/application/api/controller/RoomPit.php
+++ b/application/api/controller/RoomPit.php
@@ -33,9 +33,9 @@ class RoomPit extends BaseCom
         $room_label = $res['data']['label_id'];
         $room_type = $res['data']['type_id'];
 
-        if(($room_label == 1 && ($room_type == 1 || $room_type == 3 || $room_type == 4))|| $room_type == 2 || $room_type == 7){
+        if(($room_label == 1 && ($room_type == 1 || $room_type == 3 || $room_type == 4 || $room_type == 8))|| $room_type == 2 || $room_type == 7){
             $reslut = model('RoomPit')->apply_pit($this->uid, $room_id,$pit_number);
-        }elseif ($room_label == 2 && ($room_type == 1 || $room_type == 3 || $room_type == 4)){
+        }elseif ($room_label == 2 && ($room_type == 1 || $room_type == 3 || $room_type == 4 || $room_type == 8)){
             $reslut = model('RoomSong')->apply_kpit($this->uid, $room_id,$pit_number);
         }else{
             return V(0, '房间不存在', null);
@@ -113,9 +113,9 @@ class RoomPit extends BaseCom
         }
         $room_label = $res['data']['label_id'];
         $room_type = $res['data']['type_id'];
-        if(($room_label == 1 && ($room_type == 1 || $room_type == 3 || $room_type == 4)) || $room_type == 2 || $room_type == 7){
+        if(($room_label == 1 && ($room_type == 1 || $room_type == 3 || $room_type == 4 || $room_type == 8)) || $room_type == 2 || $room_type == 7){
             $reslut = model('RoomPit')->DownPit($this->uid, $room_id,$pit_number);
-        }elseif ($room_label == 2 && ($room_type == 1 || $room_type == 3 || $room_type == 4)){
+        }elseif ($room_label == 2 && ($room_type == 1 || $room_type == 3 || $room_type == 4 || $room_type == 8)){
             $reslut = model('RoomSong')->down_kpit($this->uid, $room_id);
         }
 
diff --git a/application/api/model/User.php b/application/api/model/User.php
index 814247d..15dd83e 100644
--- a/application/api/model/User.php
+++ b/application/api/model/User.php
@@ -339,10 +339,11 @@ class User extends Model
     public function get_user_gift_wall_info($uid)
     {
         //查询用户礼物墙 以gift_id,send_user_id分组  同一用户送的同一礼物相加
-        $result = db::name('vs_give_gift')
-            ->where(['gift_user' => $uid])
-            ->field('gift_id,user_id,sum(number) as total')
-            ->group('gift_id,user_id')
+        $result = db::name('vs_give_gift')->alias('a')
+            ->join('vs_gift g', 'a.gift_id = g.gid')
+            ->where(['a.gift_user' => $uid,'g.label'=>['<>',2]])
+            ->field('a.gift_id,a.user_id,sum(a.number) as total')
+            ->group('a.gift_id,a.user_id')
             ->order('total desc')
             ->select();
 //        var_dump($result);exit;
@@ -391,7 +392,7 @@ class User extends Model
         }
         $data = array_values($data);
         //查询所有的礼物
-        $gift_list = db::name('vs_gift')->field('gid as gift_id,gift_name,base_image,gift_price')->where(['delete_time' => 0,'is_show' => 1])->select();
+        $gift_list = db::name('vs_gift')->field('gid as gift_id,gift_name,base_image,gift_price')->where(['delete_time' => 0,'is_show' => 1,'label'=>['<>',2]])->select();
         //对比去除$data 里面的礼物
         $gift_list = array_filter((array)$gift_list, function ($item) use ($data) {
             return !in_array($item['gift_id'], array_column($data, 'gift_id'));