diff --git a/application/adminapi/controller/Gift.php b/application/adminapi/controller/Gift.php
index 57507fa..e7d8672 100644
--- a/application/adminapi/controller/Gift.php
+++ b/application/adminapi/controller/Gift.php
@@ -44,8 +44,12 @@ class Gift extends adminApi
             }
         }
         if($type == 2){
-            $type_id = input('type_id', 1);
-            $giftTypeData = db::name('vs_gift_label')->where('delete_time',0)->where('tid',$type_id)->order("sort asc,id desc")->select();
+            $type_id = input('type_id', 0);
+            $where['delete_time'] = 0;
+            if(!empty($type_id)){
+                $where['tid'] = $type_id;
+            }
+            $giftTypeData = db::name('vs_gift_label')->where($where)->order("sort asc,id desc")->select();
             foreach ($giftTypeData as $key => $value) {
                 $giftType[$key]['id'] = $value['id'];
                 $giftType[$key]['name'] = $value['name'];