diff --git a/application/adminapi/controller/BlindBox.php b/application/adminapi/controller/BlindBox.php
index a0a1455..46ce76e 100644
--- a/application/adminapi/controller/BlindBox.php
+++ b/application/adminapi/controller/BlindBox.php
@@ -170,7 +170,15 @@ class BlindBox extends adminApi
      */
     public function blind_box_gifts(){
         $type = input('type', 2);
-        $list = db::name("vs_gift")->where(['type'=>$type,'delete_time'=>0])->order('sort','asc')->select();
+        $label = input('label', 0);
+        $where['delete_time'] = 0;
+        if($type){
+            $where['type'] = $type;
+        }
+        if($label){
+            $where['label'] = $label;
+        }
+        $list = db::name("vs_gift")->where($where)->order('sort','asc')->select();
         $list_data = [];
         foreach ($list as $k=>$v){
             $list_data[$k]['gid'] = $v['gid'];
diff --git a/application/api/model/Gift.php b/application/api/model/Gift.php
index c5100fc..e76cbfc 100644
--- a/application/api/model/Gift.php
+++ b/application/api/model/Gift.php
@@ -19,7 +19,7 @@ class Gift extends Model
     //获取礼物类型
     public function get_gift_label()
     {
-        $giftTypeData = db::name('vs_gift_label')->where('delete_time',0)->order("sort asc,id desc")->select();
+        $giftTypeData = db::name('vs_gift_label')->where('delete_time',0)->where('tid',1)->order("sort asc,id desc")->select();
         foreach ($giftTypeData as $key => $value) {
             $giftType[$key]['id'] = $value['id'];
             $giftType[$key]['name'] = $value['name'];