From 1501b379ea03b9ce5df8833787bf8972cb36ff20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= <leave1988@163.com>
Date: Wed, 17 Sep 2025 11:05:42 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E5=85=85=E7=A4=BC=E7=89=A9=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=BC=98=E5=8C=96=20=E5=85=BC=E5=AE=B9=E7=A4=BC?=
 =?UTF-8?q?=E7=89=A9=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/Activities.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/application/api/controller/Activities.php b/application/api/controller/Activities.php
index 4fa530c..768c103 100644
--- a/application/api/controller/Activities.php
+++ b/application/api/controller/Activities.php
@@ -49,11 +49,13 @@ class Activities extends BaseCom
                     $list[$kk]['base_image'] = localpath_to_netpath("static/image/icon/gold.png");
                 }elseif ($vv['type'] == 2) {
                     $gift = DB::name('vs_gift')->where(['gid'=>$vv['foreign_id']])->find();
-                    $list[$kk]['gift_name'] = $gift['gift_name'];
-                    $list[$kk]['num']  = $vv['quantity'];
-                    $list[$kk]['gift_price'] = $gift['gift_price'];
-                    $list[$kk]['type'] =2;
-                    $list[$kk]['base_image'] = $gift['base_image'];
+                    if($gift){
+                        $list[$kk]['gift_name'] = $gift['gift_name'];
+                        $list[$kk]['num']  = $vv['quantity'];
+                        $list[$kk]['gift_price'] = $gift['gift_price'];
+                        $list[$kk]['type'] =2;
+                        $list[$kk]['base_image'] = $gift['base_image'];
+                    }
                 } elseif ($vv['type'] == 3) {
                     $decorate_price = DB::name('vs_decorate_price')->where(['id'=>$vv['foreign_id']])->find();
                     if($decorate_price){