diff --git a/application/api/model/Room.php b/application/api/model/Room.php index d9e6eee..29406d7 100644 --- a/application/api/model/Room.php +++ b/application/api/model/Room.php @@ -841,6 +841,7 @@ class Room extends Model $friend = null; } + $xlh_info['xlh_info'] = model('BlindBoxTurntableGift')->get_user_xlh_info($room_id); return ['code' => 1, 'msg' => '成功', @@ -854,6 +855,7 @@ class Room extends Model 'pk_info' => $pk_info, 'song_pit_list' => $song_pit_list, 'friend_info' => $friend, + 'gift_cycle' => $xlh_info, ] ]; } @@ -1988,6 +1990,8 @@ class Room extends Model $friend = null; } + $xlh_info['xlh_info'] = model('BlindBoxTurntableGift')->get_user_xlh_info($room_id); + return ['code' => 1, 'msg' => '成功', 'data' => ['room_info' => $room_info, @@ -2000,6 +2004,7 @@ class Room extends Model 'pk_info'=>$pk_info, 'song_pit_list'=>$song_pit_list, 'friend_info' => $friend, + 'gift_cycle' => $xlh_info, ] ]; } diff --git a/application/api/model/UserMessage.php b/application/api/model/UserMessage.php index 50e6cbe..9bd8b22 100644 --- a/application/api/model/UserMessage.php +++ b/application/api/model/UserMessage.php @@ -54,6 +54,7 @@ class UserMessage extends Model $system_no_read_count = $system_message - $user_read_message; $system_last_message = db::name('system_message') + ->field('id,type,title,content,url') ->where('type', 1)//1系统消息 3公告下的房间推荐,4公告下的活动' ->where('FIND_IN_SET(:user_id, receiving_id)', ['user_id' => $uid]) ->order('id desc') @@ -77,6 +78,7 @@ class UserMessage extends Model $announcement_read_count = count($system_message1) - count($user_read_message1); unset($map['user_id']); $announcement_last_message = db::name('system_message') + ->field('id,type,title,content,url') ->where($map) ->where('FIND_IN_SET(:user_id, receiving_id)', ['user_id' => $uid]) ->order('id desc')