diff --git a/application/api/model/Level.php b/application/api/model/Level.php
index 2dd172b..01e604a 100644
--- a/application/api/model/Level.php
+++ b/application/api/model/Level.php
@@ -292,7 +292,7 @@ class Level extends Model
             $user_wealth_exp = $user['wealth_exp'] + $wealth_exp;
             //判断是否达到下一级别
             $user_wealth = $this->get_wealth_level_to_level($user_wealth_level);
-            if($user_wealth_exp>= $user_wealth['exp']){
+            if($user_wealth_exp>= $user_wealth['next_level_exp']){
                 $user_wealth_level= $user_wealth['next_level'];
             }
             $update_data = [];
@@ -302,7 +302,7 @@ class Level extends Model
             $return = db('user_data')->where('user_id',$uid)->update($update_data);
             if($return){
                 //发放特权礼物
-                if($user_wealth_exp>= $user_wealth['exp']){
+                if($user_wealth_exp>= $user_wealth['next_level_exp']){
                     $wealth_level_rights = db('vs_wealth_level_rights')->where('level_id',$user_wealth_level)->find();
                     if(isset($wealth_level_rights['type']) && $wealth_level_rights['type'] ==1 ){//发座驾礼物
                         $log_remark = "财富等级达到".$user_wealth_level."级 发放座驾礼物";
@@ -322,7 +322,7 @@ class Level extends Model
             $user_charm_exp = $user['charm_exp'] + $charm_exp;
             //判断是否达到下一级别
             $user_charm = $this->get_charm_level_to_level($user_charm_level);
-            if($user_charm_exp>= $user_charm['exp']){
+            if($user_charm_exp>= $user_charm['next_level_exp']){
                 $user_charm_level= $user_charm['next_level'];
             }
             $update_data = [];
diff --git a/application/api/model/Login.php b/application/api/model/Login.php
index ff108af..019b0b2 100644
--- a/application/api/model/Login.php
+++ b/application/api/model/Login.php
@@ -107,16 +107,40 @@ class Login extends Model
         $block = db::name('block')->where(['type_text' => $user_info['id'],'type' => 1])->find();
 
         if ($block) {
-            return ['code' => 0, 'msg' => '用户已被封禁', 'data' => null];
+            if($block['block_time'] != 0 && $block['block_time'] <= time()){
+                db('block')->where(['id' => $block['id']])->delete();
+            }else{
+                if($block['block_time'] == 0){
+                    return ['code' => 301, 'msg' => '用户已被永久封禁', 'data' => null];
+                }else{
+                    return ['code' => 301, 'msg' => '用户已被封禁,解封时间:'.date('Y-m-d H:i:s',$block['block_time']), 'data' => null];
+                }
+            }
         }
         $block = db::name('block')->where(['type_text' => $login_device,'type' => 2])->find();
         if ($block) {
-            return ['code' => 0, 'msg' => '设备已被封禁', 'data' => null];
+            if($block['block_time'] != 0 && $block['block_time'] <= time()){
+                db('block')->where(['id' => $block['id']])->delete();
+            }else{
+                if($block['block_time'] == 0){
+                    return ['code' => 301, 'msg' => '设备已被永久封禁', 'data' => null];
+                }else{
+                    return ['code' => 301, 'msg' => '设备已被封禁,解封时间:'.date('Y-m-d H:i:s',$block['block_time']), 'data' => null];
+                }
+            }
         }
         $ip = request()->ip();
         $block = db::name('block')->where(['type_text' => $ip,'type' => 3])->find();
         if ($block) {
-            return ['code' => 0, 'msg' => 'ip已被封禁', 'data' => null];
+            if($block['block_time'] != 0 && $block['block_time'] <= time()){
+                db('block')->where(['id' => $block['id']])->delete();
+            }else{
+                if($block['block_time'] == 0){
+                    return ['code' => 301, 'msg' => 'ip已被永久封禁', 'data' => null];
+                }else{
+                    return ['code' => 301, 'msg' => 'ip已被封禁,解封时间:'.date('Y-m-d H:i:s',$block['block_time']), 'data' => null];
+                }
+            }
         }
 
         $save_data = [];
@@ -269,9 +293,6 @@ class Login extends Model
         if (empty($user_info)) {
             return ['code' => 0, 'msg' => '用户不存在', 'data' => null];
         }
-        if ($user_info['status'] != 1) {
-            return ['code' => 301, 'msg' => '用户被禁用,请联系管理员', 'data' => null];
-        }
 
         if (md5($password) != $user_info['password']) {
             return ['code' => 0, 'msg' => '密码错误', 'data' => null];
diff --git a/application/api/model/Room.php b/application/api/model/Room.php
index d635580..5dc301c 100644
--- a/application/api/model/Room.php
+++ b/application/api/model/Room.php
@@ -272,7 +272,7 @@ class Room extends Model
             $roomInfo = db::name('vs_room')
                 ->field('id as room_id,room_number,user_id,room_name,room_cover,apply_status,type_id,room_status,label_id')
                 ->where('user_id' , $uid)
-                ->where(['type_id' => ['<>',6],'room_status' =>1,'apply_status' => 2])
+                ->where(['type_id' => ['<>',6],'room_status' =>1,'apply_status' => ['<>',3]])
                 ->page($page, $page_limit)
                 ->select();
         }
@@ -1285,6 +1285,15 @@ class Room extends Model
         if ($label_type['code'] != 1) {
             return ['code' => 0, 'msg' => '房间不存在', 'data' => null];
         }
+        //查询房间里面的用户
+        $room_user = db::name('vs_room_visitor')->where(['room_id' => $room_id])->select();
+        if($room_user){
+            foreach ($room_user as $vv){
+                if(Db::name('user')->where('id', $vv['user_id'])->value('is_online') == 0){
+                    model('Room')->quit_room($vv['user_id'], $room_id,$vv['user_id'],2);
+                }
+            }
+        }
 
         $list = db::name('vs_room_visitor')->alias('a')
             ->join('user b', 'a.user_id = b.id')
@@ -1368,15 +1377,7 @@ class Room extends Model
             }
 
         }
-        //查询房间里面的用户
-        $room_user = db::name('vs_room_visitor')->where(['room_id' => $room_id])->select();
-        if($room_user){
-            foreach ($room_user as $vv){
-                if(Db::name('user')->where('id', $vv['user_id'])->value('is_online') == 0){
-                    model('Room')->quit_room($vv['user_id'], $room_id,$vv['user_id'],2);
-                }
-            }
-        }
+
         return ['code' => 1, 'msg' => '成功', 'data' => $lists];
     }
 
@@ -1707,12 +1708,8 @@ class Room extends Model
         db::name('vs_room_pit_simulate')->where(['room_id' => $room_id])->delete();
         //申请上麦的全部下麦
         model('RoomPit')->clear_apply_pit_list($uid, $room_id);
-        //处理之前修改的用户房间信息
-        if($type == 1 || $type == 3 || $type == 4){
-            db::name('vs_room_pit')->where(['pit_number' =>['>',10]])->update(['status' => 2]);
-        }
 
-        if($type == 1 || $type == 3 || $type == 4 || $type == 7){
+        if($type == 1 || $type == 3 || $type == 4 || $type == 7 || $type == 8){
             //查询拍卖房的状态
             $room_auction = db::name('vs_room_auction')->where(['room_id' => $room_id,'status' => 2])->select();
             if($room_auction){
@@ -1720,6 +1717,12 @@ class Room extends Model
                     model('RoomAuction')->room_auction_end($room_id,$v['auction_id']);
                 }
             }
+            //拍卖位上是否有人
+            $an = Cache::get('auction_user_'.$room_id);
+            if($an){
+                //拍卖位下麦
+                model('api/RoomPit')->host_user_pit($uid,$room_id,888,$an,2);
+            }
         }
         if($type == 2){
             //清除房间此前的魅力值
diff --git a/application/api/model/RoomPit.php b/application/api/model/RoomPit.php
index 4f72e09..9116893 100644
--- a/application/api/model/RoomPit.php
+++ b/application/api/model/RoomPit.php
@@ -925,7 +925,7 @@ class RoomPit extends Model
 
             if(!$pit_number || $pit_number == 888){
                 $roomInfo = db::name('vs_room')->where('id',$room_id)->field('label_id,type_id')->find();
-                if($roomInfo['type_id'] == 2){//拍卖
+                if($roomInfo['type_id'] == 2 || Cache::get('auction_user_'.$room_id)){//拍卖
                     //查询当前是否处于拍卖中
                     $auctioning = db::name('vs_room_auction')
                         ->where(['room_id' => $room_id, 'status' => 2, 'user_id' => $accept_user_id])->find();