diff --git a/application/api/model/Room.php b/application/api/model/Room.php
index ef1be98..1f52c86 100644
--- a/application/api/model/Room.php
+++ b/application/api/model/Room.php
@@ -1704,18 +1704,19 @@ class Room extends Model
         }
 
         if($uid <= 0){
+            db::name('vs_room_user_charm')->where(['room_id' => $room_id])->update(['charm' => 0,'clear_time' => time()]);
             //获取房间内所有用户
-            $list = db::name('vs_room_visitor')->field('user_id')->where(['room_id' => $room_id])->select();
-
-            //循环清除用户魅力值
-            if($list){
-                foreach ($list as $v){
-                    //清除有魅力值的用户
-                    if(db::name('vs_room_user_charm')->where(['room_id' => $room_id,'user_id' => $v['user_id']])->find()){
-                        db::name('vs_room_user_charm')->where(['room_id' => $room_id,'user_id' => $v['user_id']])->update(['charm' => 0,'clear_time' => time()]);
-                    }
-                }
-            }
+//            $list = db::name('vs_room_visitor')->field('user_id')->where(['room_id' => $room_id])->select();
+//
+//            //循环清除用户魅力值
+//            if($list){
+//                foreach ($list as $v){
+//                    //清除有魅力值的用户
+//                    if(db::name('vs_room_user_charm')->where(['room_id' => $room_id,'user_id' => $v['user_id']])->find()){
+//                        db::name('vs_room_user_charm')->where(['room_id' => $room_id,'user_id' => $v['user_id']])->update(['charm' => 0,'clear_time' => time()]);
+//                    }
+//                }
+//            }
             //发送消息
             $text['text'] = '清除魅力成功';
             model('Chat')->sendMsg(1021,$room_id,$text);
diff --git a/application/api/model/Tencent.php b/application/api/model/Tencent.php
index 09d33c4..416c98d 100644
--- a/application/api/model/Tencent.php
+++ b/application/api/model/Tencent.php
@@ -937,9 +937,9 @@ class Tencent extends Model
         }elseif ($action == 'Logout'){
             Db::name('user')->where('id', $uid)->update(['is_online' => 0, 'updatetime' => time()]);
             $room = Db::name('vs_room_visitor')->where('user_id', $uid)->order('id desc')->value('room_id');
-            $text['text'] = '重新上线！';
+            $text['text'] = '掉线！';
             $text['user_id'] = $uid;
-            $text['type'] = 0;
+            $text['type'] = 2;
             model('Chat')->sendMsg(1058,$room,$text);
         }
         return true;