Merge remote-tracking branch 'origin/develop' into develop

application/api/model/GiveGift.php

@@ -73,10 +73,10 @@ class GiveGift extends Model
             $is_real = db::name('user_auth')->where('mobile' , $mobile)->field('id,is_real')->find();
             if($is_real){
                 if($is_real['is_real'] != 1){
-                    return ['code' => 0, 'msg' => '收礼用户中有未实名', 'data' => null];
+                    return ['code' => 0, 'msg' => '该用户未实名，暂不支持收礼', 'data' => null];
                 }
             }else{
-                return ['code' => 0, 'msg' => '收礼用户中有未实名', 'data' => null];
+                return ['code' => 0, 'msg' => '该用户未实名，暂不支持收礼', 'data' => null];
             }
         }
 

application/api/model/Room.php

@@ -1756,8 +1756,6 @@ class Room extends Model
                 if($room_pit){
                     model('api/RoomPit')->DownPit($user_id, $room_id, $room_pit['pit_number']);
                 }
-            }else{
-                return ['code' => 0, 'msg' => '互娱游戏麦不能退出', 'data' => null];
             }
             if($room_pit){
                 if($roomInfoStep == 2 && ( $room_pit['pit_number'] == 9 || $room_pit['pit_number'] == 10)){
@@ -2285,11 +2283,16 @@ class Room extends Model
 
         // 第一页特殊处理，显示麦上用户
         if ($page == 1) {
-            $onPitUser = db::name('vs_room_visitor')->alias('a')
-                ->join('user b', 'a.user_id = b.id','left')
-                ->field('a.id,a.user_id,b.nickname,b.avatar,b.hide_status,a.is_onpit')
-                ->where(['a.room_id' => $room_id,'a.is_onpit' => 0])//is_onpit：1-未上麦，0-已上麦
+//            $onPitUser = db::name('vs_room_visitor')->alias('a')
+//                ->join('user b', 'a.user_id = b.id','left')
+//                ->field('a.id,a.user_id,b.nickname,b.avatar,b.hide_status,a.is_onpit')
+//                ->where(['a.room_id' => $room_id])//is_onpit：1-未上麦，0-已上麦
+//                ->select();
+            $onPitUser = db::name('vs_room_visitor')
+                ->field('id,user_id,is_onpit')
+                ->where(['room_id' => $room_id])
                 ->select();
+
             $validOnPitUsers = [];
             if(!empty($onPitUser)){
                 foreach ($onPitUser as $k => $v) {
@@ -2298,6 +2301,9 @@ class Room extends Model
                         db::name('vs_room_visitor')->where(['id' => $v['id']])->update(['is_onpit' => 1]);
                         continue;
                     }
+
+                    $v['nickname'] = db::name('user')->where(['id' => $v['user_id']])->value('nickname');
+                    $v['avatar'] = db::name('user')->where(['id' => $v['user_id']])->value('avatar');
                     $v['icon'][0] = model('UserData')->user_wealth_icon($v['user_id']);//财富图标
                     $v['icon'][1] = model('UserData')->user_charm_icon($v['user_id']);//魅力图标
                     //判断是否是歌手 如果是 返回等级图标