edit

service/agent/lib/Manage.php

@@ -1016,7 +1016,7 @@ class Manage
         $where['where_id'] = Dever::input('id');
         $order = Dever::db('agent/order')->find($where['where_id']);
         if ($order) {
-            $where['status'] = Dever::input('value');
+            $where['status'] = Dever::input('status');
             if ($where['status'] == 6) {
                 $where['history_status'] = $order['status'];
             }

service/agent/lib/Order.php

@@ -764,7 +764,7 @@ class Order
                 $button[] = array
                 (
                     'type' => 'action',
-                    'link' => Dever::url('lib/manage.setOrderStatus?id=' . $info['id'] . '&value=6', 'agent'),
+                    'link' => Dever::url('lib/manage.setOrderStatus?id=' . $info['id'] . '&status=6&manage_log=update.agent.order', 'agent'),
                     'name' => '挂起',
                 );
             } elseif ($info['status'] == 6) {
@@ -772,7 +772,7 @@ class Order
                 $button[] = array
                 (
                     'type' => 'action',
-                    'link' => Dever::url('lib/manage.setOrderStatus?id=' . $info['id'] . '&value=' . $info['history_status'], 'agent'),
+                    'link' => Dever::url('lib/manage.setOrderStatus?id=' . $info['id'] . '&status=' . $info['history_status'].'&manage_log=update.agent.order', 'agent'),
                     'name' => '恢复',
                 );
             }
@@ -784,7 +784,7 @@ class Order
                 $button[] = array
                 (
                     'type' => 'action',
-                    'link' => Dever::url('lib/manage.setOrderStatus?id=' . $info['id'] . '&value=7', 'agent'),
+                    'link' => Dever::url('lib/manage.setOrderStatus?id=' . $info['id'] . '&status=7&manage_log=update.agent.order', 'agent'),
                     'name' => '取消订单',
                 );
             }

service/mail/lib/Manage.php

@@ -578,7 +578,7 @@ class Manage
     public function out_option_qiquan_api($data)
     {
         // print_R($data);die;
-        $header = array('索引', '账户名称', '账户类型', '手机号','待交付', '已交付', '发放',  '兑付');
+        $header = array('索引', '账户名称', '账户类型', '手机号', '邮箱', '邮箱认证', '账户认证', '合同审核状态','待交付', '已交付', '发放',  '兑付');
         // $data = Dever::db('option/member')->state();
         $body = array();
         $main = '';
@@ -586,12 +586,26 @@ class Manage
         $j_money = 0;
         $dj_money = 0;
         $d_money = 0;
+        $status = array();
+        $set = Dever::db('option/account')->config['set'];
+        $ag_audit = Dever::db('option/agreement')->config['audit'];
         foreach ($data as $k1 => $v1) {
-            $member[] = Dever::db('option/member')->select(array('aid' => $v1['id']));
-
+            $member[$v1['id']] = Dever::db('option/member')->select(array('aid' => $v1['id']));
+            $agreement = Dever::db('option/agreement')->find(array('aid' => $v1['id']));
+            $status[$v1['id']] = array
+            (
+                'email' => $v1['email'],
+                'is_email' => $v1['is_email'] == 1 ? '已验证' : '未验证',
+                'audit' => $set['audit'][$v1['audit']],
+                'agreement' => $agreement ? $ag_audit[$agreement['audit']] : '未签署',
+            );
         }
         foreach ($member as $k => $v1) {
             foreach ($v1 as $v) {
+                $f_money = 0;
+                $j_money = 0;
+                $dj_money = 0;
+                $d_money = 0;
                 if ($v['main'] == 1) {
                     $main = '主账户';
                 } else {
@@ -622,6 +636,10 @@ class Manage
                     $v['name'],
                     $main,
                     $v['mobile'],
+                    $status[$v['aid']]['email'],
+                    $status[$v['aid']]['is_email'],
+                    $status[$v['aid']]['audit'],
+                    $status[$v['aid']]['agreement'],
                     
                     $dj_money,
                     $j_money,