edit

service/agent/database/member.php

@@ -179,6 +179,7 @@ return array
             'match'     => 'is_numeric',
             'search'    => 'order',
             //'list'        => true,
+            'search_name' => '代理商姓名/手机号',
             'search'    => array
             (
                 'api' => 'agent/member-getSearch',

service/agent/database/order.php

@@ -143,7 +143,7 @@ if($search_auth == 1){
         $excel[] = array('归店业绩统计导出','归店业绩统计导出', 'agent/lib/order.out_guidian');
     }
 }
-$list_button['oper'] = array('删除订单', '"agent/lib/manage.setOrderStatus?id={id}&value=7"', '{status} <= 1 || {status} == 5');
+$list_button['oper'] = array('取消订单', '"agent/lib/manage.setOrderStatus?id={id}&status=7"', '{status} <= 1 || {status} == 4');
 $search_pmid = Dever::input('search_in_parent_mid');
 
 $invite_type = array

service/agent/lib/Member.php

@@ -324,24 +324,23 @@ class Member
         );
         */
         $url = '';
-        if (Dever::load('manage/auth')->checkFunc('agent.member', 'bun', '禁用账号')) {
-            if ($member['status'] == 5) {
-                $button[0]['btn'][] = array
-                (
-                    'type' => 'action',
-                    'link' => Dever::url('lib/member.setStatus?id=' . $member['id'] . '&value=2', 'agent'),
-                    'name' => '恢复账号',
-                );
-            } elseif ($member['status'] == 2) {
-                $button[0]['btn'][] = array
-                (
-                    'type' => 'action',
-                    'link' => Dever::url('lib/member.setStatus?id=' . $member['id'] . '&value=5', 'agent'),
-                    'name' => '禁用账号',
-                );
-            }
+        if ($member['status'] == 5) {
+            $button[0]['btn'][] = array
+            (
+                'type' => 'action',
+                'link' => Dever::url('lib/member.setStatus?id=' . $member['id'] . '&value=2', 'agent'),
+                'name' => '恢复账号',
+                'auth' => array('agent.member', 'bun', '禁用账号'),
+            );
+        } elseif ($member['status'] == 2) {
+            $button[0]['btn'][] = array
+            (
+                'type' => 'action',
+                'link' => Dever::url('lib/member.setStatus?id=' . $member['id'] . '&value=5', 'agent'),
+                'name' => '禁用账号',
+                'auth' => array('agent.member', 'bun', '禁用账号'),
+            );
         }
-        
 
         $button[0]['btn'][] = array
         (
@@ -364,23 +363,21 @@ class Member
             'name' => '升级日志',
         );
 
-       if (Dever::load('manage/auth')->checkFunc('agent.member', 'edit1', '发放资金')) {
-            $button[1]['btn'][] = array
-            (
-                'type' => 'edit',
-                'link' => Dever::url('project/database/update?project=bill&table=push_cash&search_option_mid='.$member['id'], 'manage'),
-                'name' => '发放资金',
-            );
-        } 
+        $button[1]['btn'][] = array
+        (
+            'type' => 'edit',
+            'link' => Dever::url('project/database/update?project=bill&table=push_cash&search_option_mid='.$member['id'], 'manage'),
+            'name' => '发放资金',
+            'auth' => array('agent.member', 'edit1'),
+        );
 
-       if (Dever::load('manage/auth')->checkFunc('agent.member', 'edit2', '发放业绩')) {
-            $button[1]['btn'][] = array
-            (
-                'type' => 'edit',
-                'link' => Dever::url('project/database/update?project=bill&table=push_sell&search_option_mid='.$member['id'], 'manage'),
-                'name' => '发放业绩',
-            );
-        }
+        $button[1]['btn'][] = array
+        (
+            'type' => 'edit',
+            'link' => Dever::url('project/database/update?project=bill&table=push_sell&search_option_mid='.$member['id'], 'manage'),
+            'name' => '发放业绩',
+            'auth' => array('agent.member', 'edit2'),
+        );
         
 
         $button[1]['btn'][] = array
@@ -436,25 +433,25 @@ class Member
         */
 
         $furl = '';
-        if (Dever::load('manage/auth')->checkFunc('agent.member','set','设置直推上级')) {
-            $button[2]['btn'][] = array
-            (
-                'type' => 'edit',
-                'link' => Dever::url('project/database/update?project=agent&table=member_parent&mid='.$member['id'], 'manage'),
-                'name' => '设置直推上级',
-            );
-        }
-        if (Dever::load('manage/auth')->checkFunc('agent.member','setmessage','发送短信')) {
-            $table = 'template';
-            $res = Dever::load('sms/api')->getTable($table);
-            $button[2]['btn'][] = array
-            (
-                'type' => 'edit',
-                
-                'link' => Dever::url($res.'&search_option_state=1&search_option_type=daili_reg_yes,daili_reg_no,daili_goods_no,daili_tixian_yes,daili_tixian_no,daili_hetong_no&search_option_name='.$member['name'].'&search_option_mobile='.$member['mobile'], 'manage'),
-                'name' => '发送短信',
-            );
-        }
+        $button[2]['btn'][] = array
+        (
+            'type' => 'edit',
+            'link' => Dever::url('project/database/update?project=agent&table=member_parent&mid='.$member['id'], 'manage'),
+            'name' => '设置直推上级',
+            'auth' => array('agent.member', 'set'),
+            'log' => false,
+        );
+        $table = 'template';
+        $res = Dever::load('sms/api')->getTable($table);
+        $button[2]['btn'][] = array
+        (
+            'type' => 'edit',
+            
+            'link' => Dever::url($res.'&search_option_state=1&search_option_type=daili_reg_yes,daili_reg_no,daili_goods_no,daili_tixian_yes,daili_tixian_no,daili_hetong_no&search_option_name='.$member['name'].'&search_option_mobile='.$member['mobile'], 'manage'),
+            'name' => '发送短信',
+            'auth' => array('agent.member', 'setmessage'),
+            'log' => false,
+        );
 
 
         /*

service/agent/lib/Order.php

@@ -758,36 +758,37 @@ class Order
             );
         }
 
-        if (Dever::load('manage/auth')->checkFunc('agent.order', 'edit2', '挂起')) {
-            if ($info['status'] <= 3 && $info['status'] > 0) {
-                # 未完成审核的订单，可以随时挂起
-                $button[] = array
-                (
-                    'type' => 'action',
-                    'link' => Dever::url('lib/manage.setOrderStatus?id=' . $info['id'] . '&status=6&manage_log=update.agent.order', 'agent'),
-                    'name' => '挂起',
-                );
-            } elseif ($info['status'] == 6) {
-                # 恢复挂起
-                $button[] = array
-                (
-                    'type' => 'action',
-                    'link' => Dever::url('lib/manage.setOrderStatus?id=' . $info['id'] . '&status=' . $info['history_status'].'&manage_log=update.agent.order', 'agent'),
-                    'name' => '恢复',
-                );
-            }
+        if ($info['status'] <= 3 && $info['status'] > 0) {
+            # 未完成审核的订单，可以随时挂起
+            $button[] = array
+            (
+                'type' => 'action',
+                'link' => Dever::url('lib/manage.setOrderStatus?id=' . $info['id'] . '&status=6&manage_log=update.agent.order', 'agent'),
+                'name' => '挂起',
+                'auth' => array('agent.order', 'edit2'),
+            );
+        } elseif ($info['status'] == 6) {
+            # 恢复挂起
+            $button[] = array
+            (
+                'type' => 'action',
+                'link' => Dever::url('lib/manage.setOrderStatus?id=' . $info['id'] . '&status=' . $info['history_status'].'&manage_log=update.agent.order', 'agent'),
+                'name' => '恢复',
+                'auth' => array('agent.order', 'edit2'),
+            );
         }
 
-        if (Dever::load('manage/auth')->checkFunc('agent.order', 'close', '取消订单')) {
-            if ($info['status'] <= 1 || $info['status'] == 5) {
-                # 未完成审核的订单，可以随时挂起
-                $button[] = array
-                (
-                    'type' => 'action',
-                    'link' => Dever::url('lib/manage.setOrderStatus?id=' . $info['id'] . '&status=7&manage_log=update.agent.order', 'agent'),
-                    'name' => '取消订单',
-                );
-            }
+        if ($info['status'] <= 1 || $info['status'] == 5) {
+            # 未完成审核的订单，可以随时取消
+            $button[] = array
+            (
+                'type' => 'action',
+                'link' => Dever::url('lib/manage.setOrderStatus?id=' . $info['id'] . '&status=7', 'agent'),
+                'name' => '取消订单',
+                'auth' => array('agent.order', 'close'),
+                # 记录日志的表名，如果为空则使用auth里的agent.order
+                //'log' => 'agent.order',
+            );
         }
 
         if ($info['status'] == 1) {
@@ -1345,20 +1346,18 @@ class Order
             $process_status = 2;
             $process_title = '（未发放权益）';
             
-             if (Dever::load('manage/auth')->checkFunc('agent.order', 'edit6', '修改权益')) {
-                $process_button[] = array(
-                    'type' => 'link',
-                    'link' => Dever::url('lib/order_set.home?type='.$info['order_type'].'&order_id='.$info['id'].'&role_id=' . $info['role'] . '&total=' . $t, 'agent'),
-                    'name' => '修改权益'
-                );
-            }
-            if (Dever::load('manage/auth')->checkFunc('agent.order', 'edit7', '确认发放权益')) {
-                $process_button[] = array(
-                    'type' => 'action',
-                    'link' => Dever::url('lib/manage.set_commit?json=1&type=2&order_id='.$info['id'], 'agent'),
-                    'name' => '确认发放权益'
-                );
-            }
+            $process_button[] = array(
+                'type' => 'link',
+                'link' => Dever::url('lib/order_set.home?type='.$info['order_type'].'&order_id='.$info['id'].'&role_id=' . $info['role'] . '&total=' . $t, 'agent'),
+                'name' => '修改权益',
+                'auth' => array('agent.order', 'edit6'),
+            );
+            $process_button[] = array(
+                'type' => 'action',
+                'link' => Dever::url('lib/manage.set_commit?json=1&type=2&order_id='.$info['id'], 'agent'),
+                'name' => '确认发放权益',
+                'auth' => array('agent.order', 'edit7'),
+            );
         }
         
         if ($goods) {
@@ -1432,13 +1431,12 @@ class Order
         } else {
             $agreement_title = '（未生成合同）';
             
-            if (Dever::load('manage/auth')->checkFunc('agent.order', 'edit8', '生成代理合同')) {
-                $agreement_button[] = array(
-                    'type' => 'action',
-                    'link' => Dever::url('lib/manage.set_commit?json=1&type=5&order_id='.$info['id'], 'agent'),
-                    'name' => '生成代理合同'
-                );
-            }
+            $agreement_button[] = array(
+                'type' => 'action',
+                'link' => Dever::url('lib/manage.set_commit?json=1&type=5&order_id='.$info['id'], 'agent'),
+                'name' => '生成代理合同',
+                'auth' => array('agent.order', 'edit8'),
+            );
 
             $agreement = Dever::db('setting/agreement')->getData();
             $agreement_status_name = Dever::status($agreement_status, 1);