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

application/api/model/User.php

@@ -222,9 +222,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);//魅力图标
         //判断是否是歌手 如果是 返回等级图标
-        $isSinger = db::name('vs_singer')->where(['user_id' => $uid,'status' => 1])->find();
-        if($isSinger){
-            $user_info['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinger['level'],'deletetime' => 0])->value('image');//等级图标
+        $singer = model('api/SingerSong')->singerAuthStatus($uid);
+        $user_info['singer_status'] = $singer['status'];//歌手认证状态0-待审核，1-通过，2-拒绝  -1-未认证
+        $user_info['singer_level'] = $singer['level'];
+        if($singer['status'] == 1){
+            $user_info['icon'][2] = db::name('vs_singer_level')->where(['level' =>$singer['level'],'deletetime' => 0])->value('image');//等级图标
         }
         return $user_info;
     }