YUSHENG/yusheng-php
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
赵钊
2025-11-19 14:19:13 +08:00
parent fd94c7815d 1552ff51c4
commit ea50e5678e
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
application/adminapi/controller/UserCp.php
View File

@@ -37,10 +37,9 @@ class UserCp extends adminApi
if(empty($list)){ if(empty($list)){
return V(0,"数据不存在"); return V(0,"数据不存在");
} }
$list['rights_icon'] = db::name('vs_decorate')->where('did',$list['rights_icon_id'])->value('base_image');
$list['dress'] = db::name('vs_decorate')->where('did',$list['dress_id'])->value('base_image'); $list['dress'] = db::name('vs_decorate')->where('did',$list['dress_id'])->value('base_image');
$list['jiajia'] = db::name('vs_decorate')->where('did',$list['jiajia_id'])->value('base_image'); $list['jiajia'] = db::name('vs_decorate')->where('did',$list['jiajia_id'])->value('base_image');
$list['guajian'] = db::name('vs_decorate')->where('did',$list['guajian_id'])->value('base_image');
return V(1,"成功", $list); return V(1,"成功", $list);
} }
@@ -56,7 +55,8 @@ class UserCp extends adminApi
'rights_icon' => input('rights_icon', ''), 'rights_icon' => input('rights_icon', ''),
'dress_id' => input('dress_id', ''), 'dress_id' => input('dress_id', ''),
'jiajia_id' => input('jiajia_id', ''), 'jiajia_id' => input('jiajia_id', ''),
'guajian_id' => input('guajian_id', ''), 'pendant' => input('pendant', ''),//挂件（装扮）地址
'direction' => input('direction', 0),//挂件上的头像位置：0-上，1-右上，2-右，3-右下，4-下，5-左下，6-左，7-左上
]; ];
//没有 id就是新增 //没有 id就是新增
if(empty($id)){ if(empty($id)){

8
application/api/controller/UserCp.php
View File

@@ -12,7 +12,13 @@ class UserCp extends BaseCom
{ {
$user_id = input('user_id', 0); $user_id = input('user_id', 0);
$gift_id = input('gift_id', 0); $gift_id = input('gift_id', 0);
$reslut = model('GiveGift')->give_gift($this->uid, $user_id, $gift_id, 1,1,1); $room_id = input('room_id', 0);
if($room_id){
$from_type = 2;
}else{
$from_type = 1;
}
$reslut = model('GiveGift')->give_gift($this->uid, $user_id, $gift_id, 1,$from_type,1,$room_id);
return V($reslut['code'], $reslut['msg'], $reslut['data']); return V($reslut['code'], $reslut['msg'], $reslut['data']);
} }