edit

service/option/database/account.php

@@ -43,7 +43,7 @@ $is_idcard = array
 
 $col = Dever::input('col');
 
-$search_type = Dever::input('option_search_type');
+$search_type = Dever::input('search_option_type');
 
 return array
 (
@@ -297,7 +297,7 @@ return array
         //'edit' => false,
         'list_button' => array
         (
-            'list' => array('查看详情', '"cash&aid={id}&page_type=1"'),
+            'list' => array('查看详情', '"cash&aid={id}&page_type=1&search_type='.$search_type.'"'),
 
             'edit' => array('审核', 'audit,audit_desc', '{audit} == 2'),
             //'edit' => array('退款', 'status,tk_time,tk_pic,tk_desc,tk_admin,tk_status', '{status} == 6'),

service/option/database/agreement.php

@@ -17,9 +17,14 @@ $status = array
 $aid = Dever::input('search_option_aid');
 $button = array();
 if ($aid) {
+    $option_aid = $aid;
+    $search_type = Dever::input('search_type');
+    if ($search_type) {
+        $option_aid .= '&search_type=' . $search_type;
+    }
     $button = array
     (
-        '返回上一页' => array('location', 'l=project/database/list&project=option&table=cash&page_type=1&aid=' . $aid),
+        '返回上一页' => array('location', 'l=project/database/list&project=option&table=cash&page_type=1&aid=' . $option_aid),
     );
 }
 return array
@@ -27,9 +32,8 @@ return array
     # 表名
     'name' => 'agreement',
     # 显示给用户看的名称
-    'lang' => '合同管理',
+    'lang' => '期权合同管理',
     'order' => 10,
-    'menu' => false,
     'status' => $status,
     # 数据结构
     'struct' => array

service/option/database/bill_duifu.php

@@ -23,9 +23,14 @@ $audit_manage = array
 $aid = Dever::input('search_option_aid');
 $button = array();
 if ($aid) {
+    $option_aid = $aid;
+    $search_type = Dever::input('search_type');
+    if ($search_type) {
+        $option_aid .= '&search_type=' . $search_type;
+    }
     $button = array
     (
-        '返回上一页' => array('location', 'l=project/database/list&project=option&table=cash&page_type=1&aid=' . $aid),
+        '返回上一页' => array('location', 'l=project/database/list&project=option&table=cash&page_type=1&aid=' . $option_aid),
     );
 }
 

service/option/database/bill_fafang.php

@@ -23,9 +23,14 @@ $audit_manage = array
 $aid = Dever::input('search_option_aid');
 $button = array();
 if ($aid) {
+    $option_aid = $aid;
+    $search_type = Dever::input('search_type');
+    if ($search_type) {
+        $option_aid .= '&search_type=' . $search_type;
+    }
     $button = array
     (
-        '返回上一页' => array('location', 'l=project/database/list&project=option&table=cash&page_type=1&aid=' . $aid),
+        '返回上一页' => array('location', 'l=project/database/list&project=option&table=cash&page_type=1&aid=' . $option_aid),
     );
 }
 

service/option/database/bill_jiaofu.php

@@ -29,9 +29,14 @@ $col = Dever::input('col');
 $aid = Dever::input('search_option_aid');
 $button = array();
 if ($aid) {
+    $option_aid = $aid;
+    $search_type = Dever::input('search_type');
+    if ($search_type) {
+        $option_aid .= '&search_type=' . $search_type;
+    }
     $button = array
     (
-        '返回上一页' => array('location', 'l=project/database/list&project=option&table=cash&page_type=1&aid=' . $aid),
+        '返回上一页' => array('location', 'l=project/database/list&project=option&table=cash&page_type=1&aid=' . $option_aid),
     );
 }
 

service/option/lib/Account.php

@@ -165,36 +165,52 @@ class Account
         }
 
         if ($aid) {
+            $search_type = Dever::input('search_type');
+            $option_aid = $aid;
+            if ($search_type) {
+                $option_aid .= '&search_type=' . $search_type;
+            }
             $button[0]['btn'][] = array
             (
                 'type' => 'edit',
-                'link' => Dever::url('project/database/update?project=option&table=push_cash&search_option_aid='.$aid, 'manage'),
+                'link' => Dever::url('project/database/update?project=option&table=push_cash&search_option_aid='.$option_aid, 'manage'),
                 'name' => '发放期权',
             );
 
             $button[1]['btn'][] = array
             (
                 'type' => 'link',
-                'link' => Dever::url('project/database/list?project=option&table=bill_jiaofu&search_option_aid='.$aid.'', 'manage'),
+                'link' => Dever::url('project/database/list?project=option&table=bill_jiaofu&search_option_aid='.$option_aid.'', 'manage'),
                 'name' => '期权交付记录',
             );
 
             $button[1]['btn'][] = array
             (
                 'type' => 'link',
-                'link' => Dever::url('project/database/list?project=option&table=bill_fafang&search_option_aid='.$aid.'', 'manage'),
+                'link' => Dever::url('project/database/list?project=option&table=bill_fafang&search_option_aid='.$option_aid.'', 'manage'),
                 'name' => '期权发放记录',
             );
 
             $button[1]['btn'][] = array
             (
                 'type' => 'link',
-                'link' => Dever::url('project/database/list?project=option&table=bill_duifu&search_option_aid='.$aid.'', 'manage'),
+                'link' => Dever::url('project/database/list?project=option&table=bill_duifu&search_option_aid='.$option_aid.'', 'manage'),
                 'name' => '期权兑付记录',
             ); 
+
+            $button[1]['btn'][] = array
+            (
+                'type' => 'link',
+                'link' => Dever::url('project/database/list?project=option&table=agreement&search_option_aid='.$option_aid.'', 'manage'),
+                'name' => '期权合同',
+            ); 
         }
 
+        
         $url = Dever::url('project/database/list?project=option&table=account', 'manage');
+        if ($search_type) {
+            $url .= '&search_option_type=' . $search_type;
+        }
         $head_btn[] = array
         (
             'type' => 'link',
@@ -228,7 +244,7 @@ class Account
         if ($account['email']) {
             $account['email'] .= '（'.$config['is_email'][$account['is_email']].'）';
         }
-        
+
         $result = array
         (
             'type' => 'info',