MIDI/midi-php
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
赵钊
2025-08-15 14:31:13 +08:00
parent 341c93da80 e21e0d9ac3
commit 78604b0300
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -2,4 +2,5 @@
/public/uploads/* /public/uploads/*
.idea .idea
*.log *.log
.env

2
application/adminapi/controller/Activities.php
View File

@@ -498,6 +498,7 @@ class Activities extends adminApi
$meet = input('meet',''); $meet = input('meet','');
$num = input('num', 0); $num = input('num', 0);
$content = input('content', 0); $content = input('content', 0);
$title = input('title', "");
if($gift_bag_id==""){ if($gift_bag_id==""){
return V(0,"请选择礼包类型"); return V(0,"请选择礼包类型");
} }
@@ -516,6 +517,7 @@ class Activities extends adminApi
'num' => $num 'num' => $num
]; ];
$data['ext'] = json_encode($ext); $data['ext'] = json_encode($ext);
$data['title'] = $title;
$res = db::name($this->table)->where(['id'=>$gift_bag_id])->update($data); $res = db::name($this->table)->where(['id'=>$gift_bag_id])->update($data);
if(!$res){ if(!$res){
return V(0,"失败"); return V(0,"失败");

3
application/adminapi/controller/Decorate.php
View File

@@ -374,10 +374,11 @@ class Decorate extends adminApi
$user_id = input('user_id', ''); $user_id = input('user_id', '');
$decorate_id = input('decorate_id', ''); $decorate_id = input('decorate_id', '');
$day = input('day', ''); $day = input('day', '');
$user = db::name('user')->where(['id'=>$user_id])->find(); $user = db::name('user')->where(['user_code'=>$user_id])->find();
if(!$user){ if(!$user){
return V(0,"用户不存在"); return V(0,"用户不存在");
} }
$user_id = $user['id'];
$decorate = db::name('vs_decorate')->where(['did'=>$decorate_id])->find(); $decorate = db::name('vs_decorate')->where(['did'=>$decorate_id])->find();
if(!$decorate){ if(!$decorate){
return V(0,"装扮不存在"); return V(0,"装扮不存在");