踢人

api/Appapi/Model/Home.php

@@ -508,7 +508,7 @@ class Model_Home extends PhalApi_Model_NotORM {
         $where=" islive='1' and lng!='' and lat!='' ";
         $where=" islive='1' and lng!='' and lat!='' ";
         $configpri=getConfigPri();
         $configpri=getConfigPri();
         $result=DI()->notorm->users_live
         $result=DI()->notorm->users_live
-            ->select("uid,title,province,city,stream,lng,lat,pull,isvideo,thumb,islive,type,type_val,game_action,goodnum,anyway,getDistance('{$lat}','{$lng}',lat,lng) as distance")
+            ->select("uid,thumb,title,province,city,stream,lng,lat,pull,isvideo,thumb,islive,type,type_val,game_action,goodnum,anyway,getDistance('{$lat}','{$lng}',lat,lng) as distance")
             ->where($where)
             ->where($where)
             ->order("distance asc")
             ->order("distance asc")
             ->limit($start,$pnum)
             ->limit($start,$pnum)
@@ -517,9 +517,16 @@ class Model_Home extends PhalApi_Model_NotORM {
             $nums=DI()->redis->zSize('user_'.$v['stream']);
             $nums=DI()->redis->zSize('user_'.$v['stream']);
             $v['nums']=(string)$nums;
             $v['nums']=(string)$nums;
 
 
+            $image = DI()->notorm->users_live_image
+                ->where('uid=?',$v['uid'])
+                ->fetchOne();
+            $avatar = $v['thumb'];
+            if (!empty($image) && $image['status'] == 1) {
+                $avatar = $image['thumb'];
+            }
             $userinfo=getUserInfo($v['uid']);
             $userinfo=getUserInfo($v['uid']);
-            $v['avatar']=$userinfo['avatar'];
-            $v['avatar_thumb']=$userinfo['avatar_thumb'];
+            $v['avatar']=$avatar;
+            $v['avatar_thumb']=$avatar;
             $v['user_nicename']=$userinfo['user_nicename'];
             $v['user_nicename']=$userinfo['user_nicename'];
             $v['sex']=$userinfo['sex'];
             $v['sex']=$userinfo['sex'];
             $v['level']=$userinfo['level'];
             $v['level']=$userinfo['level'];