edit

service/agent/lib/Order.php

@@ -805,7 +805,7 @@ class Order
     {
         # 这里要获取上级信息
         $table = array();
-        $table['head'] = array('名称', '手机', '角色', '级别', '类型', '比例', '分润（元）');
+        $table['head'] = array('类型', '姓名', '手机', '角色', '级别', '比例/数量', '金额/名称');
         $table['body'] = array();
 
         $parents[0] = array('uid' => $parent_member['id'], 'level' => 0);
@@ -890,7 +890,7 @@ class Order
 
                     $cash = '<a style="color:blue" class="set_cash" data-param="'.$data_param.'">' . $cash . '</a>';
 
-                    $table['body'][] = array($parent_info['name'], $parent_info['mobile'], $parent_role['name'], $parent_level['name'], '团队', $parent_level['value'] . '%', $cash);
+                    $table['body'][] = array('团队佣金', $parent_info['name'], $parent_info['mobile'], $parent_role['name'], $parent_level['name'], $parent_level['value'] . '%', $cash);
                 } else {              
                     $param['cash'] = 0;
                     $param['per'] = 0;
@@ -927,6 +927,7 @@ class Order
             );
         }
         
+        $parent_name = '';
         $result['分润信息' . $parent_title] = array
         (
             'type' => 'table',
@@ -940,7 +941,7 @@ class Order
         $parent_name = '邀请人：'.$parent_info['name'].'，'.$parent_info['mobile'].'&nbsp;&nbsp;邀请人角色：';
 
         $order_cash = Dever::db('agent/order_cash')->getData(array('order_id' => $info['id'], 'parent_mid' => $v['uid'], 'type' => 1));
-        $parent_name .= $parent_role['name'] . '（'.$parent_level['name'].'）';
+        //$parent_name .= $parent_role['name'] . '（'.$parent_level['name'].'）';
         # 根据角色获取佣金 直推
         if (!$order_cash) {
             $reward = Dever::db('setting/role_reward')->find(array('role_id' => $parent_info['role'], 't_role_id' => $info['role']));
@@ -1036,6 +1037,10 @@ class Order
 
                 if ($param['cash'] > 0) {
                     
+                    $data_param = Dever::array_encode($param);
+                    $param['cash'] = '<a style="color:blue" class="set_cash" data-param="'.$data_param.'">' . $param['cash'] . '</a>';
+
+                    /*                    
                     if (isset($prize)) {
                         $parent_name .= '&nbsp;&nbsp;赠送名额：'.$prize['name'];
                     }
@@ -1045,32 +1050,41 @@ class Order
                     if ($param['per'] > 0) {
                         $parent_name .= '&nbsp;&nbsp;直推佣金比例：'.$param['per'].'%';
                     }
-                    $data_param = Dever::array_encode($param);
-                    $param['cash'] = '<a style="color:blue" class="set_cash" data-param="'.$data_param.'">' . $param['cash'] . '</a>';
+                    
                     $parent_name .= '&nbsp;&nbsp;直推佣金：' . $param['cash'] . '元';
                     if (isset($parent_goods)) {
 
                     }
-                    $table['body'][] = array($parent_info['name'], $parent_info['mobile'], $parent_role['name'], $parent_level['name'], '直推', $param['per'] . '%', $param['cash']);
+                    */
+                }
+                $table['body'][] = array('直推佣金', $parent_info['name'], $parent_info['mobile'], $parent_role['name'], $parent_level['name'], $param['per'] . '%', $param['cash']);
 
-                } else {
-                    $table['body'][] = array($parent_info['name'], $parent_info['mobile'], $parent_role['name'], $parent_level['name'], '直推', $param['per'] . '%', $param['cash']);
+                if (isset($prize)) {
+                    $table['body'][] = array('赠送名额', $parent_info['name'], $parent_info['mobile'], $parent_role['name'], $parent_level['name'], '1', $prize['name']);
+                }
+                if (isset($card)) {
+                    $parent_name .= '&nbsp;&nbsp;赠送权益：'.$card['name'];
                 }
             }
         } else {
+            $order_cash['cash'] = '<a style="color:blue">' . $order_cash['cash'] . '</a>';
+            
+            $table['body'][] = array('直推佣金', $parent_info['name'], $parent_info['mobile'], $parent_role['name'], $parent_level['name'], $order_cash['per'] . '%', $order_cash['cash']);
+
             if ($order_cash['prize_id'] && $order_cash['prize_id'] > 0) {
                 $prize = Dever::db('setting/prize')->find($order_cash['prize_id']);
                 if ($prize) {
-                    $parent_name .= '&nbsp;&nbsp;赠送名额：'.$prize['name'];
+                    $table['body'][] = array('赠送名额', $parent_info['name'], $parent_info['mobile'], $parent_role['name'], $parent_level['name'], '1', $prize['name']);
                 }
             }
+
+            /*
             if ($order_cash['per'] > 0) {
                 $parent_name .= '&nbsp;&nbsp;直推佣金比例：'.$order_cash['per'].'%';
             }
-            $order_cash['cash'] = '<a style="color:blue">' . $order_cash['cash'] . '</a>';
+            
             $parent_name .= '&nbsp;&nbsp;直推佣金：' . $order_cash['cash'] . '元';
-
-            $table['body'][] = array($parent_info['name'], $parent_info['mobile'], $parent_role['name'], $parent_level['name'], '直推', $order_cash['per'] . '%', $order_cash['cash']);
+            */
         }
 
         return $parent_name;