edit

service/option/database/account.php

@@ -51,24 +51,28 @@ $is_idcard = array
 
 $col = Dever::input('col');
 
-$search_audit = Dever::input('search_option_audit');
-$search_stype = Dever::input('search_option_stype');
+# 权限设置 1是审核列表、2是账户列表、3是展示列表
+$search_auth = Dever::input('search_option_dever_auth', 1);
 
 $button = $list_button = array();
 
-$list_button = array
-(
-    'list' => array('查看详情', '"cash&mid={mid}&page_type=1&search_stype='.$search_stype.'"'),
-);
+if ($search_auth <= 2) {
+    $list_button = array
+    (
+        'list' => array('查看详情', '"cash&mid={mid}&page_type=1&search_auth='.$search_auth.'"'),
+    );
+}
 
-if (!$search_stype) {
+if ($search_auth == 1) {
+    $list_button['edit'] = array('审核', 'audit,audit_desc', '{audit} == 2');
+} elseif ($search_auth == 2) {
     $button = array
     (
         '创建账户' => array('fast', '', 'member'),
     );
-    $list_button['list1'] = array('子账户列表', '"member&search_option_aid={id}&search_option_main=2&oper_table=account"');
-} else {
-    $list_button['edit'] = array('审核', 'audit,audit_desc', '{audit} == 2');
+    $list_button['list1'] = array('子账户列表', '"member&search_option_aid={id}&search_option_main=2&oper_table=account&search_option_dever_auth='.$search_auth.'"');
+} elseif ($search_auth == 3) {
+    $list_button['list1'] = array('子账户列表', '"member&search_option_aid={id}&search_option_main=2&oper_table=account&search_option_dever_auth='.$search_auth.'"');
 }
 
 return array
@@ -187,7 +191,7 @@ return array
             'option'    => $is_idcard,
             'search'    => 'select',
             //'update'    => 'radio',
-            'list'      => !$search_stype ? false : 'Dever::load("option/lib/account.getIdcard", {id})',
+            'list'      => $search_auth == 1 ? 'Dever::load("option/lib/account.getIdcard", {id})' : false,
             'list_order' => 3,
         ),
 
@@ -206,7 +210,7 @@ return array
             ),
             # 读取另外表的关联方式
             'sync'      => array('mid', 'id'),
-            'list'      => !$search_stype ? 'Dever::load("option/lib/account.getCash#daijiaofu", {id})' : false,
+            'list'      => $search_auth == 2 ? 'Dever::load("option/lib/account.getCash#daijiaofu", {id})' : false,
             'list_name' => '待交付',
             'list_order' => 4,
         ),
@@ -221,7 +225,7 @@ return array
             'update'    => $col ? 'image' : false,
             'key'       => '8',
             //'place'     => '660*660',
-            'list'      => !$search_stype ? 'Dever::load("option/lib/account.getCash#qiquan", {id})' : false,
+            'list'      => $search_auth == 2 ? 'Dever::load("option/lib/account.getCash#qiquan", {id})' : false,
             'list_name' => '期权',
             'list_order' => 5,
         ),
@@ -236,7 +240,7 @@ return array
             'update'    => $col ? 'image' : false,
             'key'       => '8',
             //'place'     => '660*660',
-            'list'      => !$search_stype ? 'Dever::load("option/lib/account.getCash#yuanshiqiquan", {id})' : false,
+            'list'      => $search_auth == 2 ? 'Dever::load("option/lib/account.getCash#yuanshiqiquan", {id})' : false,
             'list_name' => '原始期权',
             'list_order' => 6,
         ),
@@ -244,7 +248,7 @@ return array
         'audit'        => array
         (
             'type'      => 'tinyint-1',
-            'name'      => !$search_stype ? '账户认证' : '审核状况',
+            'name'      => $search_auth == 1 ? '审核状况' : '账户认证',
             'default'   => $col ? '3' : '1',
             'desc'      => '审核状况',
             'match'     => 'is_numeric',
@@ -252,7 +256,7 @@ return array
             'search'    => 'select',
             'update'    => $col ? 'radio' : false,
             'list'      => 'Dever::load("option/lib/account.getAudit", {id})',
-            'list_order' => !$search_stype ? 3 : 5,
+            'list_order' => $search_auth == 1 ? 5 : 3,
             'value'     => $col ? '3' : '1',
             'control'   => 'audit',
         ),
@@ -285,7 +289,7 @@ return array
             'match'     => 'is_numeric',
             'option'    => $status,
             //'search'    => 'select',
-            'list'      => !$search_stype ? true : false,
+            'list'      => $search_auth == 1 ? false : true,
             'list_order' => 100,
         ),
 
@@ -300,6 +304,15 @@ return array
             'search'    => 'hidden',
         ),
 
+        'dever_auth'      => array
+        (
+            'name'      => '权限',
+            'default'   => '',
+            'desc'      => '类型',
+            'match'     => 'is_string',
+            'search'    => 'hidden',
+        ),
+
         'state'     => array
         (
             'type'      => 'tinyint-1',
@@ -339,7 +352,7 @@ return array
             # 匹配的正则或函数 选填项
             'option' => array
             (
-                //'mid' => 'yes',
+                'mid' => 'yes',
                 'is_email' => 'yes',
                 'is_idcard' => 'yes',
                 'email' => array('yes', 'like'),

service/option/database/agreement.php

@@ -27,9 +27,9 @@ $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;
+    $search_auth = Dever::input('search_auth');
+    if ($search_auth) {
+        $option_aid .= '&search_auth=' . $search_auth;
     }
     $button = array
     (

service/option/database/bill_duifu.php

@@ -26,9 +26,9 @@ $oper_table = Dever::input('oper_table');
 $button = array();
 if (!$oper_table && $aid) {
     $option_aid = $aid;
-    $search_audit = Dever::input('search_audit');
-    if ($search_audit) {
-        $option_aid .= '&search_audit=' . $search_audit;
+    $search_auth = Dever::input('search_auth');
+    if ($search_auth) {
+        $option_aid .= '&search_auth=' . $search_auth;
     }
     $button = array
     (

service/option/database/bill_fafang.php

@@ -26,9 +26,9 @@ $oper_table = Dever::input('oper_table');
 $button = array();
 if (!$oper_table && $aid) {
     $option_aid = $aid;
-    $search_audit = Dever::input('search_audit');
-    if ($search_audit) {
-        $option_aid .= '&search_audit=' . $search_audit;
+    $search_auth = Dever::input('search_auth');
+    if ($search_auth) {
+        $option_aid .= '&search_auth=' . $search_auth;
     }
     $button = array
     (

service/option/database/bill_jiaofu.php

@@ -28,9 +28,9 @@ $oper_table = Dever::input('oper_table');
 $button = array();
 if (!$oper_table && $aid) {
     $option_aid = $aid;
-    $search_audit = Dever::input('search_audit');
-    if ($search_audit) {
-        $option_aid .= '&search_audit=' . $search_audit;
+    $search_auth = Dever::input('search_auth');
+    if ($search_auth) {
+        $option_aid .= '&search_auth=' . $search_auth;
     }
     $button = array
     (

service/option/database/member.php

@@ -18,6 +18,8 @@ $idcard_bind = array
     2 => '身份证未绑定',
 );
 
+$search_auth = Dever::input('search_option_dever_auth', 1);
+
 return array
 (
     # 表名
@@ -150,6 +152,15 @@ return array
             'list'      => true
         ),
 
+        'dever_auth'      => array
+        (
+            'name'      => '权限',
+            'default'   => '',
+            'desc'      => '类型',
+            'match'     => 'is_string',
+            'search'    => 'hidden',
+        ),
+
         'state'     => array
         (
             'type'      => 'tinyint-1',

service/option/lib/Account.php

@@ -144,10 +144,10 @@ class Account
 
         $result['账户信息'] = $this->getMemberInfo($member, $member_config);
 
-        $search_stype = Dever::input('search_stype');
+        $search_auth = Dever::input('search_auth');
         $option_aid = $aid;
-        if ($search_stype) {
-            $option_aid .= '&search_stype=' . $search_stype;
+        if ($search_auth) {
+            $option_aid .= '&search_auth=' . $search_auth;
         }
 
         if ($member['main'] == 1) {
@@ -299,12 +299,12 @@ class Account
             'name' => '期权兑付记录',
         ); 
         
-        if ($search_stype == -2) {
+        if ($search_auth == -1) {
             $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_stype) {
-                $url .= '&search_option_stype=' . $search_stype;
+            if ($search_auth) {
+                $url .= '&search_option_dever_auth=' . $search_auth;
             }
         }