edit

service/option/database/account.php

@@ -58,10 +58,10 @@ $button = $list_button = array();
 
 $list_button = array
 (
-    'list' => array('查看详情', '"cash&mid={mid}&page_type=1&search_audit='.$search_audit.'"'),
+    'list' => array('查看详情', '"cash&mid={mid}&page_type=1&search_stype='.$search_stype.'"'),
 );
 
-if (!$search_audit) {
+if (!$search_stype) {
     $button = array
     (
         '创建账户' => array('fast', '', 'member'),
@@ -187,7 +187,7 @@ return array
             'option'    => $is_idcard,
             'search'    => 'select',
             //'update'    => 'radio',
-            'list'      => !$search_audit ? false : true,
+            'list'      => !$search_stype ? false : true,
             'list_order' => 3,
         ),
 
@@ -206,7 +206,7 @@ return array
             ),
             # 读取另外表的关联方式
             'sync'      => array('mid', 'id'),
-            'list'      => !$search_audit ? 'Dever::load("option/lib/account.getCash#daijiaofu", {id})' : false,
+            'list'      => !$search_stype ? 'Dever::load("option/lib/account.getCash#daijiaofu", {id})' : false,
             'list_name' => '待交付',
             'list_order' => 4,
         ),
@@ -221,7 +221,7 @@ return array
             'update'    => $col ? 'image' : false,
             'key'       => '8',
             //'place'     => '660*660',
-            'list'      => !$search_audit ? 'Dever::load("option/lib/account.getCash#qiquan", {id})' : false,
+            'list'      => !$search_stype ? 'Dever::load("option/lib/account.getCash#qiquan", {id})' : false,
             'list_name' => '期权',
             'list_order' => 5,
         ),
@@ -236,7 +236,7 @@ return array
             'update'    => $col ? 'image' : false,
             'key'       => '8',
             //'place'     => '660*660',
-            'list'      => !$search_audit ? 'Dever::load("option/lib/account.getCash#yuanshiqiquan", {id})' : false,
+            'list'      => !$search_stype ? 'Dever::load("option/lib/account.getCash#yuanshiqiquan", {id})' : false,
             'list_name' => '原始期权',
             'list_order' => 6,
         ),
@@ -244,7 +244,7 @@ return array
         'audit'        => array
         (
             'type'      => 'tinyint-1',
-            'name'      => !$search_audit ? '账户认证' : '审核状况',
+            'name'      => !$search_stype ? '账户认证' : '审核状况',
             'default'   => $col ? '3' : '1',
             'desc'      => '审核状况',
             'match'     => 'is_numeric',
@@ -252,7 +252,7 @@ return array
             'search'    => 'select',
             'update'    => $col ? 'radio' : false,
             'list'      => 'Dever::load("option/lib/account.getAudit", {id})',
-            'list_order' => !$search_audit ? 3 : 5,
+            'list_order' => !$search_stype ? 3 : 5,
             'value'     => $col ? '3' : '1',
             'control'   => 'audit',
         ),
@@ -285,7 +285,7 @@ return array
             'match'     => 'is_numeric',
             'option'    => $status,
             //'search'    => 'select',
-            'list'      => !$search_audit ? true : false,
+            'list'      => !$search_stype ? true : false,
             'list_order' => 100,
         ),
 

service/option/database/member.php

@@ -180,7 +180,8 @@ return array
         'list_button' => array
         (
             //'list' => array('查看详情', '"cash&mid={id}&page_type=1&search_audit=-1"'),
-            'fast_add' => array('期权价值交付与发放', 'push_cash&search_option_aid={aid}&search_option_mid={id}'),
+            'fast_add' => array('期权价值交付', 'push_cash&search_option_aid={aid}&search_option_mid={id}&type=1'),
+            'fast_add1' => array('期权价值发放', 'push_cash&search_option_aid={aid}&search_option_mid={id}type=2'),
             'list1' => array('交付记录', '"bill_jiaofu&search_option_main=2&search_option_aid={aid}&search_option_mid={id}&oper_table=member&top_table=account"'),
             'list2' => array('发放记录', '"bill_fafang&search_option_main=2&search_option_aid={aid}&search_option_mid={id}&oper_table=member&top_table=account"'),
             'list3' => array('兑付记录', '"bill_duifu&search_option_main=2&search_option_aid={aid}&search_option_mid={id}&oper_table=member&top_table=account"'),

service/option/database/push_cash.php

@@ -3,15 +3,31 @@
 $aid = Dever::input('search_option_aid');
 $mid = Dever::input('search_option_mid');
 
-$type = array
-(
-    1 => '期权交付',
-    2 => '期权发放',
-    //3 => '期权兑付',
-    4 => '原始期权交付',
-    5 => '原始期权发放',
-    //6 => '原始期权兑付',
-);
+$option_type = Dever::input('type');
+if ($option_type == 1) {
+    $type = array
+    (
+        1 => '期权交付',
+        //2 => '期权发放',
+        //3 => '期权兑付',
+        4 => '原始期权交付',
+        //5 => '原始期权发放',
+        //6 => '原始期权兑付',
+    );
+    $type_value = 1;
+} else {
+    $type = array
+    (
+        //1 => '期权交付',
+        2 => '期权发放',
+        //3 => '期权兑付',
+        //4 => '原始期权交付',
+        5 => '原始期权发放',
+        //6 => '原始期权兑付',
+    );
+    $type_value = 2;
+}
+
 $status = array
 (
     1 => '操作成功',
@@ -70,7 +86,7 @@ return array
         (
             'type'      => 'tinyint-1',
             'name'      => '操作类型',
-            'default'   => '1',
+            'default'   => $type_value,
             'desc'      => '操作类型',
             'match'     => 'is_numeric',
             'option'    => $type,

service/option/lib/Account.php

@@ -124,10 +124,10 @@ class Account
 
         $result['账户信息'] = $this->getMemberInfo($member, $member_config);
 
-        $search_audit = Dever::input('search_audit');
+        $search_stype = Dever::input('search_stype');
         $option_aid = $aid;
-        if ($search_audit) {
-            $option_aid .= '&search_audit=' . $search_audit;
+        if ($search_stype) {
+            $option_aid .= '&search_stype=' . $search_stype;
         }
 
         if ($member['main'] == 1) {
@@ -247,8 +247,15 @@ class Account
         $button[0]['btn'][] = array
         (
             'type' => 'edit',
-            'link' => Dever::url('project/database/update?project=option&table=push_cash&search_option_mid='.$mid.'&search_option_aid='.$option_aid, 'manage'),
-            'name' => '期权价值交付与发放',
+            'link' => Dever::url('project/database/update?project=option&table=push_cash&search_option_mid='.$mid.'&search_option_aid='.$option_aid . '&type=1', 'manage'),
+            'name' => '期权价值交付',
+        );
+
+        $button[0]['btn'][] = array
+        (
+            'type' => 'edit',
+            'link' => Dever::url('project/database/update?project=option&table=push_cash&search_option_mid='.$mid.'&search_option_aid='.$option_aid . '&type=2', 'manage'),
+            'name' => '期权价值发放',
         );
 
         $button[1]['btn'][] = array
@@ -272,12 +279,12 @@ class Account
             'name' => '期权兑付记录',
         ); 
         
-        if ($search_audit == -1) {
+        if ($search_stype == -2) {
             $url = Dever::url('project/database/list?project=option&table=member&search_option_main=2&search_option_aid=' . $aid, 'manage');
         } else {
             $url = Dever::url('project/database/list?project=option&table=account', 'manage');
-            if ($search_audit) {
-                $url .= '&search_option_audit=' . $search_audit;
+            if ($search_stype) {
+                $url .= '&search_option_stype=' . $search_stype;
             }
         }
         

service/option/lib/Import.php

@@ -62,7 +62,7 @@ class Import
                         if (!isset($member[$key])) {
                             $member[$key] = array();
                         }
-                        $account = Dever::db('option/member')->find(array('mid' => $id));
+                        $account = Dever::db('option/account')->find(array('mid' => $id));
                         if (!$account) {
                             $member[$key] = Dever::db('option/account')->insert(array('mid' => $id, 'audit' => 1));
                         } else {