From dcb4c840bae7fb4b8a0b8003d3771b0cdf6f2992 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= <leave1988@163.com>
Date: Fri, 29 Aug 2025 10:36:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E4=B9=90=E4=BC=9A=E6=8A=BD=E5=A5=96?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=8F=90=E4=BA=A4.-=E7=A4=BC=E7=89=A9?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/adminapi/controller/BlindBox.php | 10 +++++++++-
 application/api/model/Gift.php               |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

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'];