Merge branch 'master' of ssh://git.dever.cc:10022/dever-product/churen

service/agent/database/member.php

@@ -307,13 +307,13 @@ return array
             'desc'      => '邀请人',
             'match'     => 'is_string',
             //'update'    => 'text',
-            'search'    => $search_auth == 1 ? array
+            'search'    => $admin_auth ? false : ($search_auth == 1 ? array
             (
                 'api' => 'agent/member-getSearch',
                 'col' => 'col',
                 'result' => 'id',
                 'search' => 'parent_mid',
-            ) : false,
+            ) : false),
             'list_name' => '推荐人信息',
             'list'      => $admin_auth ? 'Dever::load("agent/lib/member.getOne", {parent_mid},"agent/member", false, true)' : ($search_auth == 1 ? 'Dever::load("agent/lib/member.getOne", {parent_mid})' : false),
         ),

service/agent/database/order.php

@@ -283,19 +283,19 @@ return array
         'parent_mid'      => array
         (
             'type'      => 'int-11',
-            'name'      => '邀请人姓名/手机号',
+            'name'      => '推荐人姓名/手机号',
             'default'   => '-1',
             'desc'      => '邀请人',
             'match'     => 'is_string',
             //'update'    => 'text',
-            'search'    => $search_pmid ? false : array
+            'search'    => $admin_auth ? false : ($search_pmid ? false : array
             (
                 'api' => 'agent/member-getSearch',
                 'col' => 'col',
                 'result' => 'id',
                 'search' => 'parent_mid',
-            ),
-            'list_name' => '邀请人信息',
+            )),
+            'list_name' => '推荐人信息',
             'list'      => $admin_auth ? 'Dever::load("agent/lib/member.getOne", {parent_mid}, "agent/member", false,true)' : ($search_auth == 1 ? 'Dever::load("agent/lib/member.getOne", {parent_mid})' : false),
         ),