edit

act/database/invite.php

@@ -124,10 +124,22 @@ return array
 				'uid' => 'yes',
 				'data_id' => 'yes',
 				'type' => 'yes',
+				'temp' => array('yes-t_2.temp'),
 				'state' => 1,
 			),
+			# 联表
+			'join' => array
+			(
+				array
+				(
+					'table' => 'passport/user',
+					'type' => 'left join',
+					'on' => array('uid','id'),
+					'col' => 't_2.username,t_2.avatar',
+				),
+			),
 			'type' => 'all',
-			'order' => array('id' => 'desc'),
+			'order' => array('t_1.id' => 'desc'),
 			'page' => array(10, 'list'),
 			'col' => '*',
 		),

act/database/subscribe.php

@@ -126,10 +126,22 @@ return array
 			(
 				'data_id' => 'yes',
 				'type' => 'yes',
+				'temp' => array('yes-t_2.temp'),
 				'state' => 1,
 			),
+			# 联表
+			'join' => array
+			(
+				array
+				(
+					'table' => 'passport/user',
+					'type' => 'left join',
+					'on' => array('uid','id'),
+					'col' => 't_2.username,t_2.avatar',
+				),
+			),
 			'type' => 'all',
-			'order' => array('id' => 'desc'),
+			'order' => array('t_2.id' => 'desc'),
 			'page' => array(6, 'list'),
 			'col' => '*',
 		),

act/lib/Invite.php

@@ -15,8 +15,10 @@ class Invite
         if ($num > 0) {
             $where['page'] = array(6, 'list');
         }
+        $where['temp'] = 2;
         $data = Dever::db('act/invite')->getAll($where);
 
+        /*
         if ($data) {
             foreach ($data as $k => $v) {
                 $user = Dever::load('passport/api')->info($v['uid']);
@@ -24,6 +26,7 @@ class Invite
                 $data[$k]['avatar'] = $user['avatar'];
             }
         }
+        */
         return $data;
     }
 

act/lib/Subscribe.php

@@ -27,8 +27,10 @@ class Subscribe
     {
         $where['type'] = $type;
         $where['data_id'] = $id;
+        $where['temp'] = 2;
         $data = Dever::db('act/subscribe')->getAll($where);
 
+        /*
         if ($data) {
             foreach ($data as $k => $v) {
                 $user = Dever::load('passport/api')->info($v['uid']);
@@ -36,6 +38,7 @@ class Subscribe
                 $data[$k]['avatar'] = $user['avatar'];
             }
         }
+        */
         return $data;
     }