diff --git a/application/api/model/Login.php b/application/api/model/Login.php index 5c67e31..43eea36 100644 --- a/application/api/model/Login.php +++ b/application/api/model/Login.php @@ -101,6 +101,11 @@ class Login extends Model $return_res[0]['auth'] = 0; $return_res[0]['icon'][0] = model('UserData')->user_wealth_icon($user_id);//财富图标 $return_res[0]['icon'][1] = model('UserData')->user_charm_icon($user_id);//魅力图标 + //判断是否是歌手 如果是 返回等级图标 + $isSinnger = db::name('vs_singer')->where(['user_id' => $user_id,'status' => 1])->value('level'); + if($isSinnger){ + $return_res[0]['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger])->value('rights_icon');//等级图标 + } return ['code' => 1, 'msg' => '登录成功', 'data' => $return_res]; } @@ -207,6 +212,11 @@ class Login extends Model $return_res[0]['mobile'] = $user_info['mobile']; $return_res[0]['icon'][0] = model('UserData')->user_wealth_icon($user_info['id']);//财富图标 $return_res[0]['icon'][1] = model('UserData')->user_charm_icon($user_info['id']);//魅力图标 + //判断是否是歌手 如果是 返回等级图标 + $isSinnger = db::name('vs_singer')->where(['user_id' => $user_info['id'],'status' => 1])->value('level'); + if($isSinnger){ + $return_res[0]['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger])->value('rights_icon');//等级图标 + } $return_res[0]['dress'] = model('Decorate')->user_decorate_detail($user_info['id'],1); $return_res[0]['chat_bubble'] = model('Decorate')->user_decorate_detail($user_info['id'],9);//聊天气泡 @@ -409,6 +419,11 @@ class Login extends Model $return_res[0]['auth'] = 0; $return_res[0]['icon'][0] = model('UserData')->user_wealth_icon($user_info_data['user_id']);//财富图标 $return_res[0]['icon'][1] = model('UserData')->user_charm_icon($user_info_data['user_id']);//魅力图标 + //判断是否是歌手 如果是 返回等级图标 + $isSinnger = db::name('vs_singer')->where(['user_id' => $user_info_data['user_id'],'status' => 1])->value('level'); + if($isSinnger){ + $return_res[0]['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger])->value('rights_icon');//等级图标 + } return ['code' => 1, 'msg' => '登录成功', 'data' => $return_res]; } diff --git a/application/api/model/Room.php b/application/api/model/Room.php index e9f2734..8604b24 100644 --- a/application/api/model/Room.php +++ b/application/api/model/Room.php @@ -923,6 +923,11 @@ class Room extends Model $user_info['is_management'] = db::name('vs_room_host')->where(['room_id' => $room_id,'user_id' => $user_id,'type' => 2,'delete_time' => null])->find() ? 1 : 0; $user_info['icon'][0] = model('api/UserData')->user_wealth_icon($user_id);//财富图标 $user_info['icon'][1] = model('api/UserData')->user_charm_icon($user_id);//魅力图标 + //判断是否是歌手 如果是 返回等级图标 + $isSinnger = db::name('vs_singer')->where(['user_id' => $user_id,'status' => 1])->value('level'); + if($isSinnger){ + $user_info['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger])->value('rights_icon');//等级图标 + } if($is_join){ $user_info['agora_token'] =model('api/Agora')->agora_token_info($user_id, $room_id); $user_info['agora_rtm_token'] = model('api/Agora')->agora_rtm_token_info($user_id, $room_id);//连麦用的 @@ -1172,6 +1177,11 @@ class Room extends Model $FromUserInfo = db::name('user')->where('id',$user_id)->field('id as user_id,nickname,avatar,sex')->find(); $FromUserInfo['icon'][0] = model('api/UserData')->user_wealth_icon($user_id);//财富图标 $FromUserInfo['icon'][1] = model('api/UserData')->user_charm_icon($user_id);//魅力图标 + //判断是否是歌手 如果是 返回等级图标 + $isSinnger = db::name('vs_singer')->where(['user_id' => $user_id,'status' => 1])->value('level'); + if($isSinnger){ + $FromUserInfo['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger])->value('rights_icon');//等级图标 + } //推送告诉前端下了几号麦位 $text['text'] = $FromUserInfo['nickname'].' 下麦了 '; $text['FromUserInfo'] = $FromUserInfo; @@ -1205,6 +1215,11 @@ class Room extends Model $FromUserInfo = db::name('user')->where('id',$user_id)->field('id as user_id,nickname,avatar,sex')->find(); $FromUserInfo['icon'][0] = model('api/UserData')->user_wealth_icon($user_id);//财富图标 $FromUserInfo['icon'][1] = model('api/UserData')->user_charm_icon($user_id);//魅力图标 + //判断是否是歌手 如果是 返回等级图标 + $isSinnger = db::name('vs_singer')->where(['user_id' => $user_id,'status' => 1])->value('level'); + if($isSinnger){ + $FromUserInfo['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger])->value('rights_icon');//等级图标 + } $FromUserInfo['dress'] = model('api/Decorate')->user_decorate_detail($user_id,1); $text['FromUserInfo'] = $FromUserInfo; @@ -1286,6 +1301,11 @@ class Room extends Model //用户等级标签 $v['icon'][0] = model('UserData')->user_wealth_icon($v['user_id']);//财富图标 $v['icon'][1] = model('UserData')->user_charm_icon($v['user_id']);//魅力图标 + //判断是否是歌手 如果是 返回等级图标 + $isSinnger = db::name('vs_singer')->where(['user_id' => $v['user_id'],'status' => 1])->value('level'); + if($isSinnger){ + $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger])->value('rights_icon');//等级图标 + } } } return ['code' => 1, 'msg' => '成功', 'data' => $list]; @@ -1398,6 +1418,11 @@ class Room extends Model $v['icon'][0] = model('UserData')->user_wealth_icon($v['user_id']);//财富图标 $v['icon'][1] = model('UserData')->user_charm_icon($v['user_id']);//魅力图标 + //判断是否是歌手 如果是 返回等级图标 + $isSinnger = db::name('vs_singer')->where(['user_id' => $v['user_id'],'status' => 1])->value('level'); + if($isSinnger){ + $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger])->value('rights_icon');//等级图标 + } //用户的角色 $role = $this->get_user_role($v['user_id'], $room_id); $v['role'] = $role['role']; @@ -1507,6 +1532,11 @@ class Room extends Model $user_info = db::name('user')->where(['id' => $user_id])->field('id as user_id,user_code,nickname,avatar,sex,profile,red_status')->find(); $user_info['icon'][0] = model('UserData')->user_wealth_icon($user_id);//财富图标 $user_info['icon'][1] = model('UserData')->user_charm_icon($user_id);//魅力图标 + //判断是否是歌手 如果是 返回等级图标 + $isSinnger = db::name('vs_singer')->where(['user_id' => $user_id,'status' => 1])->value('level'); + if($isSinnger){ + $user_info['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger])->value('rights_icon');//等级图标 + } //是否使用靓号 $user_info['is_use_code'] = 0; $user_code = model('Decorate')->user_decorate_detail($user_info['user_id'],6); @@ -1694,6 +1724,11 @@ class Room extends Model foreach ($list as &$v){ $v['icon'][0] = model('UserData')->user_wealth_icon($v['user_id']);//财富图标 $v['icon'][1] = model('UserData')->user_charm_icon($v['user_id']);//魅力图标 + //判断是否是歌手 如果是 返回等级图标 + $isSinnger = db::name('vs_singer')->where(['user_id' => $v['user_id'],'status' => 1])->value('level'); + if($isSinnger){ + $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger])->value('rights_icon');//等级图标 + } $v['earnings'] = db::name('vs_user_money_log')->where(['user_id' => $v['user_id'],'room_id' => $room_id,'money_type' => 2,'change_type' => 19])->sum('change_value'); } } @@ -2712,6 +2747,11 @@ class Room extends Model $v['charm'] = $v['total_price'] * get_system_config_value('coin_charm_exp'); $v['icon'][0] = model('UserData')->user_wealth_icon($v['user_id']);//财富图标 $v['icon'][1] = model('UserData')->user_charm_icon($v['user_id']);//魅力图标 + //判断是否是歌手 如果是 返回等级图标 + $isSinnger = db::name('vs_singer')->where(['user_id' => $v['user_id'],'status' => 1])->value('level'); + if($isSinnger){ + $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger])->value('rights_icon');//等级图标 + } } } return ['code' => 1, 'msg' => '操作成功', 'data' => $list]; diff --git a/application/api/model/User.php b/application/api/model/User.php index cebc36d..f06d5ff 100644 --- a/application/api/model/User.php +++ b/application/api/model/User.php @@ -126,6 +126,11 @@ class User extends Model $user_info['icon'][0] = model('UserData')->user_wealth_icon($uid);//财富图标 $user_info['icon'][1] = model('UserData')->user_charm_icon($uid);//魅力图标 + //判断是否是歌手 如果是 返回等级图标 + $isSinnger = db::name('vs_singer')->where(['user_id' => $uid,'status' => 1])->value('level'); + if($isSinnger){ + $user_info['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger])->value('rights_icon');//等级图标 + } //关注数 $user_info['follow_num'] = db::name('user_follow')->where(['user_id' => $uid,'type'=>1])->count(); @@ -221,6 +226,11 @@ class User extends Model //等级获取对应图标 $v['icon'][0] = model('UserData')->user_wealth_icon($v['follow_id']);//财富图标 $v['icon'][1] = model('UserData')->user_charm_icon($v['follow_id']);//魅力图标 + //判断是否是歌手 如果是 返回等级图标 + $isSinnger = db::name('vs_singer')->where(['user_id' => $v['follow_id'],'status' => 1])->value('level'); + if($isSinnger){ + $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger])->value('rights_icon');//等级图标 + } } return ['code' => 1, 'msg' => '获取成功', 'data' => $list]; } @@ -244,6 +254,11 @@ class User extends Model //等级获取对应图标 $v['icon'][0] = model('UserData')->user_wealth_icon($v['user_id']);//财富图标 $v['icon'][1] = model('UserData')->user_charm_icon($v['user_id']);//魅力图标 + //判断是否是歌手 如果是 返回等级图标 + $isSinnger = db::name('vs_singer')->where(['user_id' => $v['user_id'],'status' => 1])->value('level'); + if($isSinnger){ + $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger])->value('rights_icon');//等级图标 + } } return ['code' => 1, 'msg' => '获取成功', 'data' => $list]; } @@ -344,6 +359,11 @@ class User extends Model $user_info['icon'][0] = model('UserData')->user_wealth_icon($uid) ?? '';//财富图标 $user_info['icon'][1] = model('UserData')->user_charm_icon($uid) ?? '';//魅力图标 + //判断是否是歌手 如果是 返回等级图标 + $isSinnger = db::name('vs_singer')->where(['user_id' => $uid,'status' => 1])->value('level'); + if($isSinnger){ + $user_info['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger])->value('rights_icon');//等级图标 + } //查询用户是否有使用靓号 $user_info['is_use_code'] = 0; diff --git a/application/api/model/UserZone.php b/application/api/model/UserZone.php index f096d69..a71050e 100644 --- a/application/api/model/UserZone.php +++ b/application/api/model/UserZone.php @@ -658,6 +658,11 @@ class UserZone extends Model //用户等级标 $v['icon'][0] = model('UserData')->user_wealth_icon($v['user_id']);//财富图标 $v['icon'][1] = model('UserData')->user_charm_icon($v['user_id']);//魅力图标 + //判断是否是歌手 如果是 返回等级图标 + $isSinnger = db::name('vs_singer')->where(['user_id' => $v['user_id'],'status' => 1])->value('level'); + if($isSinnger){ + $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger])->value('rights_icon');//等级图标 + } $Nobility = model('Nobility')->getUserNobilityInfo($v['user_id']);//nobility_image $v['nobility_image'] = $Nobility['play_image']; $v['nickname_color'] = $Nobility['nick_name_color'];