diff --git a/application/api/model/Chat.php b/application/api/model/Chat.php index 9f4e7334..7100e204 100644 --- a/application/api/model/Chat.php +++ b/application/api/model/Chat.php @@ -155,6 +155,10 @@ class Chat extends Model // BarRoomLiaoTa = 1200, //酒吧房开私密房 // BarRoomOpenPrivateRoom = 1201, + //酒吧房抱麦 + // BarRoomUpSeat = 1202, + //酒吧房上麦后设置自定义礼物设置 + // BarRoomSetCustomGift = 1203, diff --git a/application/api/model/GiftNew.php b/application/api/model/GiftNew.php index f2be887d..e68b3cff 100644 --- a/application/api/model/GiftNew.php +++ b/application/api/model/GiftNew.php @@ -154,7 +154,7 @@ class GiftNew extends Model $text['user_id'] = $user_id; $text['pit_number'] = $user_on_pit; //聊天室推送系统消息 - model('Chat')->sendMsg(1203,$room_id,$text); + model('api/Chat')->sendMsg(1203,$room_id,$text); } return ['code' => 1, 'msg' => '设置成功','data' =>null]; } diff --git a/application/api/model/Room.php b/application/api/model/Room.php index eaadf001..64ca279c 100644 --- a/application/api/model/Room.php +++ b/application/api/model/Room.php @@ -244,7 +244,7 @@ class Room extends Model $api_version = 0; if ($system == 'iOS') { $api_versions = db::name('version')->where(['type' => 2, 'status' => 1])->order('id', 'desc')->find(); - $result = version_compare($api_versions['apiversion'],$app_version); + $result = version_compare($api_versions['newversion'],$app_version); if ($result < 0) { $api_version = 1; }