edit

database/yspay_merchant.php

@@ -25,7 +25,7 @@ $list_button = array
 (
     'edit' => array('编辑'),
 
-    'add' => array('签约资料', '"yspay_sign&search_option_merchant_id={id}&where_id={id}&oper_table=account&oper_save_table=yspay_merchant"', '{status} == 2'),
+    'add' => array('签约资料', '"yspay_sign&search_option_merchant_id={id}&search_option_account_id={account_id}&where_id={id}&oper_table=account&oper_save_table=yspay_merchant"', '{status} == 2'),
 
     'oper' => array('签约提审', 'pay/yspay/sign.handle?sign_id={id}', '"{pay/yspay_sign-one#step}" == -1 && {status} == 2'),
     'fast' => array('签约打款', '"yspay_sign&where_id={id}&col=cash"', '"{pay/yspay_sign-one#step}" == 2 && {status} == 2'),
@@ -40,7 +40,7 @@ if ($yspay_type == 1) {
     $list_button['list2'] = array('提现管理', '"yspay_tixian&search_option_merchant_id={id}&search_option_account_id={account_id}&oper_table=yspay_merchant&top_table=account"', '{status} == 1');
 }
 
-$list_button['list1'] = array('签约日志', '"yspay_sign_log&search_option_merchant_id={id}&oper_table=yspay_merchant&top_table=account"');
+$list_button['list1'] = array('签约日志', '"yspay_sign_log&search_option_account_id={account_id}&search_option_merchant_id={id}&oper_table=yspay_merchant&top_table=account"');
 
 return array
 (

database/yspay_sign.php

@@ -64,6 +64,18 @@ return array
             'order'     => 'desc',
         ),
 
+        'account_id'      => array
+        (
+            'type'      => 'int-11',
+            'name'      => '账户id',
+            'default'   => '',
+            'desc'      => '账户id',
+            'match'     => 'option',
+            'search'    => 'hidden',
+            'update'    => 'hidden',
+            'value'     => Dever::input('search_option_account_id'),
+        ),
+
         'merchant_id'      => array
         (
             'type'      => 'int-11',

database/yspay_sign_log.php

@@ -28,6 +28,18 @@ return array
             'order'     => 'desc',
         ),
 
+        'account_id'      => array
+        (
+            'type'      => 'int-11',
+            'name'      => '账户id',
+            'default'   => '',
+            'desc'      => '账户id',
+            'match'     => 'option',
+            'search'    => 'hidden',
+            'update'    => 'hidden',
+            'value'     => Dever::input('search_option_account_id'),
+        ),
+
         'merchant_id'      => array
         (
             'type'      => 'int-11',

yspay/Cash.php

@@ -9,6 +9,7 @@ class Cash
     	$merchant = Dever::db('pay/yspay_merchant')->one(array('mid' => $mid));
     	if ($merchant) {
     		$data = array();
+    		$data['account_id'] = $merchant['account_id'];
 			$data['merchant_id'] = $merchant['id'];
     		$data['order_num'] = $order_num;
 	        $data['source_order_num'] = $source_order_num;