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

This commit is contained in:
2026-01-19 09:18:40 +08:00

View File

@@ -481,10 +481,8 @@ class User extends Model
$data = []; $data = [];
if($result){ if($result){
//获取数组中的礼物ID集合 foreach ($result as $item){
// $giftIds = array_column($result, 'gift_id'); $userInfo = [];
$userInfo = [];
foreach ($result as &$item){
$users = explode(',', $item['give_user_ids']); $users = explode(',', $item['give_user_ids']);
foreach ($users as $userId){ foreach ($users as $userId){
$user = db::name('user')->where(['id' => $userId])->field('id user_id,nickname,avatar')->find(); $user = db::name('user')->where(['id' => $userId])->field('id user_id,nickname,avatar')->find();
@@ -504,7 +502,6 @@ class User extends Model
} }
} }
//查询所有的礼物 //查询所有的礼物
$gift_list = db::name('vs_gift') $gift_list = db::name('vs_gift')
->field('gid as gift_id,gift_name,base_image,gift_price') ->field('gid as gift_id,gift_name,base_image,gift_price')