From 88d62cd6dc493c3e282b0e19519fa8b63941bd2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= <leave1988@163.com>
Date: Thu, 14 Aug 2025 19:04:06 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=9A=E5=8E=9F?=
 =?UTF-8?q?=E5=A7=8B=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                   | 1 +
 application/adminapi/controller/Decorate.php | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 38346b3..9fecc42 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@
 /public/uploads/*
 .idea
 *.log
+.env
 
diff --git a/application/adminapi/controller/Decorate.php b/application/adminapi/controller/Decorate.php
index 3661947..b9fed60 100644
--- a/application/adminapi/controller/Decorate.php
+++ b/application/adminapi/controller/Decorate.php
@@ -374,10 +374,11 @@ class Decorate extends adminApi
         $user_id = input('user_id', '');
         $decorate_id = input('decorate_id', '');
         $day = input('day', '');
-        $user = db::name('user')->where(['id'=>$user_id])->find();
+        $user = db::name('user')->where(['user_code'=>$user_id])->find();
         if(!$user){
             return V(0,"用户不存在");
         }
+        $user_id = $user['id'];
         $decorate = db::name('vs_decorate')->where(['did'=>$decorate_id])->find();
         if(!$decorate){
             return V(0,"装扮不存在");

From e21e0d9ac3ef88bef05df4cb85d7cc1f3758124d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= <leave1988@163.com>
Date: Fri, 15 Aug 2025 14:30:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=A1=86=E6=9E=B6?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/adminapi/controller/Activities.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application/adminapi/controller/Activities.php b/application/adminapi/controller/Activities.php
index d974414..09ae280 100644
--- a/application/adminapi/controller/Activities.php
+++ b/application/adminapi/controller/Activities.php
@@ -498,6 +498,7 @@ class Activities extends adminApi
         $meet = input('meet','');
         $num = input('num', 0);
         $content = input('content', 0);
+        $title = input('title', "");
         if($gift_bag_id==""){
             return V(0,"请选择礼包类型");
         }
@@ -516,6 +517,7 @@ class Activities extends adminApi
             'num' => $num
         ];
         $data['ext'] = json_encode($ext);
+        $data['title'] = $title;
         $res = db::name($this->table)->where(['id'=>$gift_bag_id])->update($data);
         if(!$res){
             return V(0,"失败");