diff --git a/application/api/model/Room.php b/application/api/model/Room.php index 4e91fe4..2c2c773 100644 --- a/application/api/model/Room.php +++ b/application/api/model/Room.php @@ -2188,12 +2188,9 @@ class Room extends Model $headline = db::name('vs_headline')->where('end_time' , '>', time())->where('is_now', 1)->find(); $headline_data = null; if($headline){ - $config = get_system_config(); - $headline_data = [ - 'countdown' => $config['headline_time'],//倒计时时间 单位分钟 - 'now_money' => $headline['money'], - 'next_money' => $config['headline_incremental_money'] + $headline['money'], - ]; + $headline_data = $headline; + $headline_data['nickname'] = db::name('user')->where('id', $headline['user_id'])->value('nickname'); + $headline_data['avatar'] = db::name('user')->where('id', $headline['user_id'])->value('avatar'); } if($room['label_id'] == 3){ $label_id = 2;