From 4eae7d8375b0b45f0f84d4705149ced1ccc47840 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= Date: Sun, 12 Oct 2025 17:43:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=9C=80=E6=B1=82-=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E9=9C=80=E6=B1=82-=E5=A4=A9=E9=99=8D=E5=A5=BD=E7=A4=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/controller/Activities.php | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/application/api/controller/Activities.php b/application/api/controller/Activities.php index 7378e37..a1b926a 100644 --- a/application/api/controller/Activities.php +++ b/application/api/controller/Activities.php @@ -215,6 +215,8 @@ class Activities extends BaseCom $data = []; $data['name'] = $activities_title??""; $data['gift_bag'] = []; + //一键领取 + $bag_receive_all = DB::name('vs_gift_bag_receive_log')->where(['gift_bag_id'=>17,'user_id'=>$this->uid])->find(); foreach ($gift_bag as $k=>$v){ $data['gift_bag'][$k]['gift_bag_id'] = $v['id']??0; $data['gift_bag'][$k]['name'] = $v['title']??""; @@ -261,12 +263,19 @@ class Activities extends BaseCom } } $data['gift_bag'][$k]['gift_list'] = array_values($list); - $bag_receive_log = DB::name('vs_gift_bag_receive_log')->where(['gift_bag_id'=>$v['id'],'user_id'=>$this->uid])->find(); - if($bag_receive_log){ + if($bag_receive_all){ $data['gift_bag'][$k]['status'] = 0; - } else { - $data['gift_bag'][$k]['status'] = 1; + }else{ + if($v['id']!=17){ + $bag_receive_log = DB::name('vs_gift_bag_receive_log')->where(['gift_bag_id'=>$v['id'],'user_id'=>$this->uid])->find(); + if($bag_receive_log){ + $data['gift_bag'][$k]['status'] = 0; + } else { + $data['gift_bag'][$k]['status'] = 1; + } + } } + } return V(1,'操作成功', $data);