edit

service/agent/database/dh_order.php

@@ -93,19 +93,20 @@ return array
         'mid'      => array
         (
             'type'      => 'int-11',
-            'name'      => '行权人',
+            'name'      => '代理商姓名/手机号',
             'default'   => '-1',
             'desc'      => '代理商',
             'match'     => 'is_string',
             'update'    => 'text',
-            'searchs'    => array
+            'search'    => array
             (
-                'api' => 'agent/member-find',
-                'col' => 'mobile',
+                'api' => 'agent/member-getSearch',
+                'col' => 'col',
                 'result' => 'id',
+                'search' => 'mid',
             ),
-            'search'    => 'hidden',
-            'list'      => 'Dever::load("agent/lib/member.getOne", {mid})',
+            'list_name' => '行权人',
+            'list'      => 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true)',
             'list_order' => 3,
         ),
 
@@ -116,7 +117,7 @@ return array
             'default'   => '',
             'desc'      => '手机号',
             'match'     => 'option',
-            'search'    => $mid ? 'hidden' : 'fulltext',
+            //'search'    => $mid ? 'hidden' : 'fulltext',
             // 'list'      => true,
             'list'      =>'Dever::load("agent/lib/member.set_mobile", {id})',
             'list_order' => 4,
@@ -127,7 +128,7 @@ return array
             'default'   => '',
             'desc'      => '手机号',
             'match'     => 'option',
-            'search'    => array
+            'searchs'    => array
             (
                 'api' => 'agent/member-find',
                 'col' => 'name',
@@ -143,7 +144,7 @@ return array
             'default'   => '',
             'desc'      => '手机号',
             'match'     => 'option',
-            'search'    => array
+            'searchs'    => array
             (
                 'api' => 'agent/member-find',
                 'col' => 'idcard',

service/agent/database/member.php

@@ -2,13 +2,13 @@
 
 $role = function()
 {
-	$array = array();
-	$data = Dever::load('setting/role-state');
-	if($data)
-	{
-		$array += $data;
-	}
-	return $array;
+    $array = array();
+    $data = Dever::load('setting/role-state');
+    if($data)
+    {
+        $array += $data;
+    }
+    return $array;
 };
 
 $status = array
@@ -59,20 +59,20 @@ $source_id = function()
 
 $level = function()
 {
-	$array = array
-	(
-		-1 => array
-		(
-			'id' => -1,
-			'name' => '普通',
-		),
-	);
-	$data = Dever::load('setting/level-state');
-	if($data)
-	{
-		$array += $data;
-	}
-	return $array;
+    $array = array
+    (
+        -1 => array
+        (
+            'id' => -1,
+            'name' => '普通',
+        ),
+    );
+    $data = Dever::load('setting/level-state');
+    if($data)
+    {
+        $array += $data;
+    }
+    return $array;
 };
 
 $info = '';
@@ -106,26 +106,12 @@ return array
         'id'        => array
         (
             'type'      => 'int-11',
-            'name'      => 'ID',
+            'name'      => '代理商姓名/手机号',
             'default'   => '',
             'desc'      => '',
             'match'     => 'is_numeric',
             'search'    => 'order',
             //'list'        => true,
-        ),
-
-        'name'      => array
-        (
-            'type'      => 'varchar-100',
-            'name'      => '代理商姓名/手机号',
-            'default'   => '',
-            'desc'      => '姓名',
-            'match'     => 'is_string',
-            'update'    => 'text',
-
-            'search'    => ($parent_mid) ? 'hidden' : 'fulltext',
-
-            //'search'    => 'fulltext',
             'search'    => array
             (
                 'api' => 'agent/member-getSearch',
@@ -137,6 +123,16 @@ return array
             'list'      => 'Dever::load("agent/lib/member.getOne", {id}, "agent/member", true)',
         ),
 
+        'name'      => array
+        (
+            'type'      => 'varchar-100',
+            'name'      => '代理商姓名',
+            'default'   => '',
+            'desc'      => '姓名',
+            'match'     => 'is_string',
+            'update'    => 'text',
+        ),
+
         'rdate'     => array
         (
             'type'      => 'int-11',
@@ -151,17 +147,17 @@ return array
             'list_order' => 100,
         ),
 
-        'avatar'		=> array
-		(
-			'type' 		=> 'varchar-150',
-			'name' 		=> '头像',
-			'default' 	=> '',
-			'desc' 		=> '请选择头像',
-			'match' 	=> 'option',
-			'update'	=> 'image',
-			'key' 		=> '1',
-			//'place'		=> '150',
-		),
+        'avatar'        => array
+        (
+            'type'      => 'varchar-150',
+            'name'      => '头像',
+            'default'   => '',
+            'desc'      => '请选择头像',
+            'match'     => 'option',
+            'update'    => 'image',
+            'key'       => '1',
+            //'place'       => '150',
+        ),
 
         'mobile'      => array
         (
@@ -170,7 +166,7 @@ return array
             'default'   => '',
             'desc'      => '请输入手机号',
             'match'     => Dever::rule('mobile'),
-            'update'    => 'text',
+            //'update'    => 'text',
             //'search'    => 'fulltext',
             //'list'      => true,
         ),
@@ -206,16 +202,16 @@ return array
             'callback'  => 'maketime',
         ),
 
-        'password'		=> array
-		(
-			'type' 		=> 'varchar-50',
-			'name' 		=> '密码',
-			'default' 	=> '',
-			'desc' 		=> '请输入密码',
-			'match' 	=> 'option',
-			'update'	=> 'password',
-			'callback'	=> 'sha1',
-		),
+        'password'      => array
+        (
+            'type'      => 'varchar-50',
+            'name'      => '密码',
+            'default'   => '',
+            'desc'      => '请输入密码',
+            'match'     => 'option',
+            'update'    => 'password',
+            'callback'  => 'sha1',
+        ),
 
         'parent_mid'      => array
         (
@@ -266,25 +262,25 @@ return array
             'default'   => '',
             'desc'      => '代理角色',
             'match'     => 'is_numeric',
-            'search'	=> 'select',
+            'search'    => 'select',
             'update'    => 'select',
             'option'    => $role,
         ),
 
-        'level_id'		=> array
-		(
-			'type' 		=> 'int-11',
-			'name' 		=> '代理商等级',
-			'default' 	=> '-1',
-			'desc' 		=> '代理商等级',
-			'match' 	=> 'is_numeric',
-			'search'	=> 'select',
-			'update'	=> 'select',
-			'option'	=> $level,
-			//'list'		=> true,
-		),
-
-		'area'       => array
+        'level_id'      => array
+        (
+            'type'      => 'int-11',
+            'name'      => '代理商等级',
+            'default'   => '-1',
+            'desc'      => '代理商等级',
+            'match'     => 'is_numeric',
+            'search'    => 'select',
+            'update'    => 'select',
+            'option'    => $level,
+            //'list'        => true,
+        ),
+
+        'area'       => array
         (
             'type'      => 'varchar-500',
             'name'      => '代理区域',

service/agent/database/member_account_log.php

@@ -53,19 +53,20 @@ return array
         'mid'      => array
         (
             'type'      => 'int-11',
-            'name'      => '手机号',
+            'name'      => '代理商姓名/手机号',
             'default'   => '-1',
             'desc'      => '代理商',
             'match'     => 'is_string',
             'update'    => 'text',
-            'search'    => $mid ? 'hidden' : array
+            'search'    => array
             (
-                'api' => 'agent/member-find',
-                'col' => 'mobile',
+                'api' => 'agent/member-getSearch',
+                'col' => 'col',
                 'result' => 'id',
+                'search' => 'mid',
             ),
-            'list_name' => '代理商',
-            'list'      => 'Dever::load("agent/lib/member.getOne", {mid})',
+            'list_name' => '代理商信息',
+            'list'      => 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true)',
             'list_order' => 1,
         ),
 

service/agent/database/member_agreement.php

@@ -49,22 +49,21 @@ return array
         'mid'      => array
         (
             'type'      => 'int-11',
-            'name'      => '手机号',
+            'name'      => '代理商姓名/手机号',
             'default'   => '-1',
             'desc'      => '代理商',
             'match'     => 'is_string',
             'update'    => 'text',
-            /*
-            'search'    => $mid ? 'hidden' : array
+            'search'    => array
             (
-                'api' => 'agent/member-select',
-                'col' => 'mobile',
+                'api' => 'agent/member-getSearch',
+                'col' => 'col',
                 'result' => 'id',
-            ),*/
-            //'list_name' => '手机号',
-            'list'      => 'Dever::load("agent/lib/member.getOne", {mid})',
-            'list_order' => 1,
-            //'list_order' => 2,
+                'search' => 'mid',
+            ),
+            'list_name' => '代理商信息',
+            'list'      => 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true)',
+            'list_order' => 3,
         ),
 
         'agent-member-name'=> array
@@ -172,7 +171,7 @@ return array
             'desc'      => '请输入手机号',
             'match'     => Dever::rule('mobile'),
             'update'    => 'text',
-            'search'    => $mid ? 'hidden' : 'fulltext',
+            //'search'    => $mid ? 'hidden' : 'fulltext',
             //'list'      => $mid ? false : true,
             //'list_order' => 2,
         ),
@@ -213,7 +212,7 @@ return array
             'desc'      => '身份证号码',
             'match'     => 'is_string',
             'update'    => 'text',
-            'search'    => 'fulltext',
+            //'search'    => 'fulltext',
         ),
 
         'idcard_front'     => array

service/agent/database/member_area.php

@@ -44,18 +44,20 @@ return array
         'mid'      => array
         (
             'type'      => 'int-11',
-            'name'      => '代理商',
+            'name'      => '代理商姓名/手机号',
             'default'   => '-1',
             'desc'      => '代理商',
             'match'     => 'is_string',
             'update'    => 'text',
-            'searchs'    => array
+            'search'    => array
             (
-                'api' => 'agent/member-find',
-                'col' => 'mobile',
+                'api' => 'agent/member-getSearch',
+                'col' => 'col',
                 'result' => 'id',
+                'search' => 'mid',
             ),
-            'list'      => 'Dever::load("agent/lib/member.getOne", {mid})',
+            'list_name' => '代理商信息',
+            'list'      => 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true)',
         ),
 
         'order_id'      => array

service/agent/database/member_area_log.php

@@ -53,19 +53,20 @@ return array
         'mid'      => array
         (
             'type'      => 'int-11',
-            'name'      => '手机号',
+            'name'      => '代理商姓名/手机号',
             'default'   => '-1',
             'desc'      => '代理商',
             'match'     => 'is_string',
             'update'    => 'text',
-            'search'    => $mid ? 'hidden' : array
+            'search'    => array
             (
-                'api' => 'agent/member-find',
-                'col' => 'mobile',
+                'api' => 'agent/member-getSearch',
+                'col' => 'col',
                 'result' => 'id',
+                'search' => 'mid',
             ),
-            'list_name' => '代理商',
-            'list'      => 'Dever::load("agent/lib/member.getOne", {mid})',
+            'list_name' => '代理商信息',
+            'list'      => 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true)',
             'list_order' => 1,
         ),
 

service/agent/database/member_goods.php

@@ -76,21 +76,21 @@ return array
         'mid'      => array
         (
             'type'      => 'int-11',
-            'name'      => '手机号',
+            'name'      => '代理商姓名/手机号',
             'default'   => '-1',
             'desc'      => '代理商',
             'match'     => 'is_string',
             'update'    => 'text',
-            'search'    => $mid ? 'hidden' : array
+            'search'    => array
             (
-                'api' => 'agent/member-find',
-                'col' => 'mobile',
+                'api' => 'agent/member-getSearch',
+                'col' => 'col',
                 'result' => 'id',
+                'search' => 'mid',
             ),
-            'list_name' => '代理商',
-            //'list'      => $mid ? false : 'Dever::load("agent/member-find#mobile", {mid})',
-            'list'      => 'Dever::load("agent/lib/member.getOne", {mid})',
-            'list_order' => 2,
+            'list_name' => '代理商信息',
+            'list'      => 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true)',
+            'list_order' => 3,
         ),
 
         'agent-member-name'=> array
@@ -99,7 +99,7 @@ return array
             'default'   => '',
             'desc'      => '姓名',
             'match'     => 'option',
-            'search'    => array
+            'searchs'    => array
             (
                 'api' => 'agent/member-find',
                 'col' => 'name',
@@ -117,7 +117,7 @@ return array
             'default'   => '',
             'desc'      => '手机号',
             'match'     => 'option',
-            'search'    => array
+            'searchs'    => array
             (
                 'api' => 'agent/member-find',
                 'col' => 'idcard',

service/agent/database/member_goods_log.php

@@ -37,19 +37,20 @@ return array
         'mid'      => array
         (
             'type'      => 'int-11',
-            'name'      => '手机号',
+            'name'      => '代理商姓名/手机号',
             'default'   => '-1',
             'desc'      => '代理商',
             'match'     => 'is_string',
             'update'    => 'text',
-            'search'    => $mid ? 'hidden' : array
+            'search'    => array
             (
-                'api' => 'agent/member-select',
-                'col' => 'mobile',
+                'api' => 'agent/member-getSearch',
+                'col' => 'col',
                 'result' => 'id',
+                'search' => 'mid',
             ),
-            'list_name' => '代理商',
-            'list'      => 'Dever::load("agent/lib/member.getOne", {mid})',
+            'list_name' => '代理商信息',
+            'list'      => 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true)',
             'list_order' => 1,
         ),
 

service/agent/database/member_level_log.php

@@ -53,19 +53,20 @@ return array
         'mid'      => array
         (
             'type'      => 'int-11',
-            'name'      => '手机号',
+            'name'      => '代理商姓名/手机号',
             'default'   => '-1',
             'desc'      => '代理商',
             'match'     => 'is_string',
             'update'    => 'text',
-            'search'    => $mid ? 'hidden' : array
+            'search'    => array
             (
-                'api' => 'agent/member-find',
-                'col' => 'mobile',
+                'api' => 'agent/member-getSearch',
+                'col' => 'col',
                 'result' => 'id',
+                'search' => 'mid',
             ),
-            'list_name' => '代理商',
-            'list'      => 'Dever::load("agent/lib/member.getOne", {mid})',
+            'list_name' => '代理商信息',
+            'list'      => 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true)',
             'list_order' => 1,
         ),
 

service/agent/database/order.php

@@ -182,7 +182,7 @@ return array
                 'search' => 'mid',
             ),
             'list_name' => '代理商信息',
-            'list'      => 'Dever::load("agent/lib/member.getOne", {id}, "agent/order", true)',
+            'list'      => 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true)',
             'list_order' => 3,
         ),
 

service/agent/database/user_bind.php

@@ -47,13 +47,24 @@ return array
             'list_order' => 1,
         ),
 
-        'mid'       => array
+        'mid'      => array
         (
             'type'      => 'int-11',
-            'name'      => '代理商id',
-            'default'   => '',
-            'desc'      => '代理商id',
-            'match'     => 'is_numeric',
+            'name'      => '代理商姓名/手机号',
+            'default'   => '-1',
+            '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)',
+            'list_order' => 3,
         ),
 
         'name'      => array
@@ -77,7 +88,7 @@ return array
             'desc'      => '请输入手机号',
             'match'     => Dever::rule('mobile'),
             'update'    => 'text',
-            'search'    => 'fulltext',
+            //'search'    => 'fulltext',
             'list'      => true,
             'list_order' => 2,
         ),

service/agent/lib/Member.php

@@ -309,21 +309,21 @@ class Member
         $button[0]['btn'][] = array
         (
             'type' => 'link',
-            'link' => Dever::url('project/database/list?project=agent&table=order&search_option_mid='.$member['id'].'&[refer]', 'manage'),
+            'link' => Dever::url('project/database/list?project=agent&table=order&search_api_mid='.$member['mobile'].'&[refer]', 'manage'),
             'name' => '代理订单',
         );
 
         $button[0]['btn'][] = array
         (
             'type' => 'link',
-            'link' => Dever::url('project/database/list?project=agent&table=order&search_option_parent_mid='.$member['id'].'&[refer]', 'manage'),
+            'link' => Dever::url('project/database/list?project=agent&table=order&search_api_parent_mid='.$member['mobile'].'&[refer]', 'manage'),
             'name' => '直推代理订单',
         );
 
         $button[0]['btn'][] = array
         (
             'type' => 'link',
-            'link' => Dever::url('project/database/list?project=agent&table=member_level_log&search_option_mid='.$member['id'].'&[refer]', 'manage'),
+            'link' => Dever::url('project/database/list?project=agent&table=member_level_log&search_api_mid='.$member['mobile'].'&[refer]', 'manage'),
             'name' => '升级日志',
         );
 
@@ -349,35 +349,35 @@ class Member
         $button[1]['btn'][] = array
         (
             'type' => 'link',
-            'link' => Dever::url('project/database/list?project=bill&table=cash&search_option_mid='.$member['id'].'&[refer]', 'manage'),
+            'link' => Dever::url('project/database/list?project=bill&table=cash&search_api_mid='.$member['mobile'].'&[refer]', 'manage'),
             'name' => '资金账户',
         );
 
         $button[1]['btn'][] = array
         (
             'type' => 'link',
-            'link' => Dever::url('project/database/list?project=bill&table=sell&search_option_mid='.$member['id'].'&[refer]', 'manage'),
+            'link' => Dever::url('project/database/list?project=bill&table=sell&search_api_mid='.$member['mobile'].'&[refer]', 'manage'),
             'name' => '业绩流水',
         );
 
         $button[1]['btn'][] = array
         (
             'type' => 'link',
-            'link' => Dever::url('project/database/list?project=agent&table=member_goods&search_option_mid='.$member['id'].'&[refer]', 'manage'),
+            'link' => Dever::url('project/database/list?project=agent&table=member_goods&search_api_mid='.$member['mobile'].'&[refer]', 'manage'),
             'name' => '代理商权益',
         );
 
         $button[1]['btn'][] = array
         (
             'type' => 'link',
-            'link' => Dever::url('project/database/list?project=agent&table=dh_order&search_option_mid='.$member['id'].'&[refer]', 'manage'),
+            'link' => Dever::url('project/database/list?project=agent&table=dh_order&search_api_mid='.$member['mobile'].'&[refer]', 'manage'),
             'name' => '权益订单',
         );
 
         $button[2]['btn'][] = array
         (
             'type' => 'link',
-            'link' => Dever::url('project/database/list?project=agent&table=member_agreement&search_option_mid='.$member['id'].'&[refer]', 'manage'),
+            'link' => Dever::url('project/database/list?project=agent&table=member_agreement&search_api_mid='.$member['mobile'].'&[refer]', 'manage'),
             'name' => '代理商合同',
         );
 

service/bill/database/cash.php

@@ -90,20 +90,21 @@ return array
         'mid'      => array
         (
             'type'      => 'int-11',
-            'name'      => '手机号',
+            'name'      => '代理商姓名/手机号',
             'default'   => '-1',
             'desc'      => '代理商',
             'match'     => 'is_string',
             'update'    => 'text',
-            'search'    => $mid ? 'hidden' : array
+            'search'    => array
             (
-                'api' => 'agent/member-find',
-                'col' => 'mobile',
+                'api' => 'agent/member-getSearch',
+                'col' => 'col',
                 'result' => 'id',
+                'search' => 'mid',
             ),
-            // 'list_name' => '手机号',
-            // 'list'      => 'Dever::load("agent/member-find#mobile", {mid})',
-            // 'list_order' => 4,
+            'list_name' => '代理商信息',
+            'list'      => 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true)',
+            'list_order' => 1,
         ),
 
         'agent-member-name'=> array
@@ -114,16 +115,12 @@ return array
             'match'     => 'option',
             # 读取另外表的关联方式
             'sync'      => array('mid', 'id'),
-            'list'      => true,
-            'search'    => array
+            'searchs'    => array
             (
                 'api' => 'agent/member-find',
                 'col' => 'name',
                 'result' => 'id',
             ),
-            'list_name' => '姓名<br />手机号<br />代理角色',
-            'list'      =>'Dever::load("agent/lib/member.getOne", {mid})',
-            'list_order' => 3,
         ),
 
         'agent-member-role'=> array
@@ -147,10 +144,10 @@ return array
             'match'     => 'is_string',
             'update'    => 'text',
             'search'    => 'fulltext',
-            'list'      => true,
-            'list_name' => '流水号<br />交易时间',
-            'list'      =>'Dever::load("bill/lib/cash.order_num#num", {id})',
-            'list_order'  => 1,
+            //'list'      => true,
+            //'list_name' => '流水号<br />交易时间',
+            //'list'      =>'Dever::load("bill/lib/cash.order_num#num", {id})',
+            //'list_order'  => 1,
         ),
 
         'role'      => array
@@ -177,7 +174,7 @@ return array
             'update'    => 'checkbox',
             'option'    => $type,
             'list'      => true,
-            'list_order' => 7,
+            'list_order' => 2,
         ),
 
         'type_id'      => array
@@ -200,7 +197,7 @@ return array
             'update'    => 'text',
             'list_name' => '金额<br />操作后余额',
             'list'      =>'Dever::load("bill/lib/cash.order_num#cash", {id})',
-             'list_order' => 6,
+             'list_order' => 4,
         ),
 
         'yue'      => array
@@ -227,7 +224,7 @@ return array
             'search'    => 'select',
             'list'      => true,
             'list_name' => '交易状态',
-            'list_order' => 8,
+            'list_order' => 3,
         ),
 
         'audit'        => array
@@ -252,7 +249,7 @@ return array
             'match'     => 'is_string',
             'update'    => 'textarea',
             'list'      => '"{audit_desc}" ? "{audit_desc}" : "-"',
-            'list_order'  => 9,
+            'list_order'  => 5,
             'show'      => 'audit=3',
         ),
 
@@ -273,8 +270,8 @@ return array
             'default'   => '',
             'match'     => 'is_numeric',
             'desc'      => '',
-            'list'      => '"{operdate}" > 0 ? date("Y-m-d H:i", {operdate}) : "-"',
-            'list_order'  => 9,
+            //'list'      => '"{operdate}" > 0 ? date("Y-m-d H:i", {operdate}) : "-"',
+            //'list_order'  => 9,
         ),
 
         'state'     => array
@@ -295,8 +292,9 @@ return array
             # 只有insert时才生效
             //'insert'    => true,
             'search'    => 'date',
-            // 'list'      => 'date("Y-m-d H:i", {cdate})',
-            // 'list_order'  => 2,
+            'list_name'      => '交易时间<br />审核时间',
+            'list'      => 'Dever::load("bill/lib/cash.order_num#num", {id})',
+            'list_order'  => 20,
         ),
     ),
 

service/bill/database/sell.php

@@ -66,20 +66,21 @@ return array
         'mid'      => array
         (
             'type'      => 'int-11',
-            'name'      => '手机号',
+            'name'      => '代理商姓名/手机号',
             'default'   => '-1',
             'desc'      => '代理商',
             'match'     => 'is_string',
             'update'    => 'text',
-            'search'    => $mid ? 'hidden' : array
+            'search'    => array
             (
-                'api' => 'agent/member-find',
-                'col' => 'mobile',
+                'api' => 'agent/member-getSearch',
+                'col' => 'col',
                 'result' => 'id',
+                'search' => 'mid',
             ),
-            // 'list_name' => '手机号',
-            // 'list'      => 'Dever::load("agent/member-find#mobile", {mid})',
-            // 'list_order' => 4,
+            'list_name' => '代理商信息',
+            'list'      => 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true)',
+            'list_order' => 1,
         ),
 
         'agent-member-name'=> array
@@ -91,17 +92,13 @@ return array
             # 读取另外表的关联方式
             'sync'      => array('mid', 'id'),
             // 'search'    => 'fulltext',
-            'search'    => array
+            'searchs'    => array
             (
                 'api' => 'agent/member-find',
                 'col' => 'name',
                 'result' => 'id',
                 'search' => 'mid',
             ),
-            'list'      => true,
-            'list_name' => '姓名<br />手机号<br />代理角色',
-            'list'      =>'Dever::load("agent/lib/member.getOne", {mid})',
-            'list_order' => 3,
         ),
 
         'agent-member-role'=> array
@@ -220,7 +217,7 @@ return array
             //'insert'    => true,
             'search'    => 'date',
             'list'      => 'date("Y-m-d H:i", {cdate})',
-            'list_order'  => 2,
+            'list_order'  => 20,
         ),
     ),
 

service/bill/database/tixian.php

@@ -60,20 +60,21 @@ return array
         'mid'      => array
         (
             'type'      => 'int-11',
-            'name'      => '手机号',
+            'name'      => '代理商姓名/手机号',
             'default'   => '-1',
             'desc'      => '代理商',
             'match'     => 'is_string',
             'update'    => 'text',
-            'search'    => $mid ? 'hidden' : array
+            'search'    => array
             (
-                'api' => 'agent/member-find',
-                'col' => 'mobile',
+                'api' => 'agent/member-getSearch',
+                'col' => 'col',
                 'result' => 'id',
+                'search' => 'mid',
             ),
-            // 'list_name' => '手机号',
-            // 'list'      => 'Dever::load("agent/member-find#mobile", {mid})',
-            // 'list_order' => 4,
+            'list_name' => '代理商信息',
+            'list'      => 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true)',
+            'list_order' => 3,
         ),
 
         'agent-member-name'=> array
@@ -84,11 +85,6 @@ return array
             'match'     => 'option',
             # 读取另外表的关联方式
             'sync'      => array('mid', 'id'),
-            'list'      => true,
-            'search'    => 'fulltext',
-            'list_name' => '姓名<br />手机号<br />代理角色',
-            'list'      =>'Dever::load("agent/lib/member.getOne", {mid})',
-            'list_order' => 3,
         ),
 
         'agent-member-role'=> array

service/bill/lib/Cash.php

@@ -252,7 +252,11 @@ class Cash
     public function order_num($id){
         $info = Dever::db('bill/cash')->find($id);
         $cdate = date('Y-m-d H:i',$info['cdate']);
-        $html['num'] = $info['order_num'].'<br/>'.$cdate;
+        $odate = '';
+        if ($info['operdate']) {
+            $odate = date('Y-m-d H:i',$info['operdate']);
+        }
+        $html['num'] = $cdate'<br/>'.$odate;
         $html['cash'] = $info['cash'] . '<br />' . $info['yue'];
         return $html;
     }