edit

app/collection/src/Api.php

@@ -553,16 +553,35 @@ class Api extends Core
         $where['info_id'] = $this->id;
         $where['ranking_id'] = Dever::input('ranking_id');
 
+        $type = 1;
+        $ranking = Dever::db('collection/ranking')->find($where['ranking_id']);
+        if ($ranking && $ranking['type'] == 10) {
+            $type = 2;
+        }
+
         # 获取所有期数
         $data['ranking_periods'] = Dever::db('collection/ranking_periods')->getAll($where);
 
         if ($data['ranking_periods']) {
             $where['periods_id'] = Dever::input('ranking_periods', $data['ranking_periods'][0]['id']);
-            $data['ranking_data'] = Dever::db('collection/ranking_data')->getAll($where);
 
-            if ($data['ranking_data']) {
+            if ($type == 2) {
-                foreach ($data['ranking_data'] as $k => $v) {
+                $data['ranking_data'] = Dever::db('collection/ranking_vote')->getAll($where);
-                    $data['ranking_data'][$k]['user'] = $this->getUser($v['uid'], $this->id, true);
+
+                if ($data['ranking_data']) {
+                    foreach ($data['ranking_data'] as $k => $v) {
+                        //$data['ranking_data'][$k]['user'] = $this->getUser($v['uid'], $this->id, true);
+                        $data['ranking_data'][$k]['user']['username_text'] = $v['name'];
+                        $data['ranking_data'][$k]['user']['avatar'] = $v['logo'];
+                    }
+                }
+            } else {
+                $data['ranking_data'] = Dever::db('collection/ranking_data')->getAll($where);
+
+                if ($data['ranking_data']) {
+                    foreach ($data['ranking_data'] as $k => $v) {
+                        $data['ranking_data'][$k]['user'] = $this->getUser($v['uid'], $this->id, true);
+                    }
                 }
             }
         }