edit

learn/active/database/order.php

@@ -76,15 +76,15 @@ return array
             'desc'      => '代理商',
             'match'     => 'is_string',
             'update'    => 'text',
-            'search'    => array
-            (
-                'api' => 'agent/member-getSearch',
-                'col' => 'col',
-                'result' => 'id',
-                'search' => 'mid',
-            ),
-            'list_name' => '代理商信息',
-            'list'      => 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true)',
+            // 'search'    => array
+            // (
+            //     'api' => 'agent/member-getSearch',
+            //     'col' => 'col',
+            //     'result' => 'id',
+            //     'search' => 'mid',
+            // ),
+            // 'list_name' => '代理商信息',
+            // 'list'      => 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true)',
         ),
 
         'uid'      => array
@@ -97,7 +97,8 @@ return array
             // 'option'    => $user,
             // 'update'    => 'text',
             // 'search'    => 'text',
-            // 'list'      => true,
+            'list_name' => '用户信息',
+            'list'      => 'Dever::load("active/lib/manage.user", {uid})',
         ),
 
         'active_id'      => array

learn/active/lib/Excel.php

@@ -9,13 +9,14 @@ Class Excel {
 		$header = array('订单单号', '姓名', '手机号', '活动名称', '购买数量', '金额', '支付状态', '支付类型','购买时间');
         $body = array();
         foreach ($data as $k => $v){
-        	$member = Dever::load('active/lib/user')->agent($v);
+                $user = Dever::db('active/user')->find($v['uid']);
+        	$member = Dever::load('active/lib/user')->agent($user);
         	$active = Dever::db('active/info')->find($v['active_id']);
         	$member_name = '';
         	$member_mobile = '';
-        	if($member && $member['name'] && $member['mobile']){
-        		$member_name = $member['name'];
-        		$member_mobile = $member['mobile'];
+        	if($user){
+        		$member_name = $user['name'];
+        		$member_mobile = $user['mobile'];
         	}
         	$active_name = '';
         	if($active && $active['name']){

learn/active/lib/Manage.php

@@ -79,8 +79,18 @@ Class Manage
     }
     public function user($id)
     {
+        $html = '';
         $data = Dever::db('active/user')->find($id);
-        $html = $data['name'].'<br/>'.$data['mobile'];
+        if ($data) {
+            $member = Dever::load('active/lib/user')->agent($data);
+            if ($member) {
+                $user = '<br/>(代理商)';
+            } else {
+                $user = '';
+            }
+            $html = $data['name'].'<br/>'.$data['mobile'].$user;
+        }
+        
         return $html;
     }
     public function dOff($id)
@@ -392,6 +402,8 @@ Class Manage
                 )
             );
            return $result;
+        } else {
+            return array();
         }
     }
     public function setOrder_api($order_id,$code_id){