Merge pull request '优化' (#535) from feature/rebate_xlqy into master

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/535

Application/Admin/View/GameRebate/records.html

@@ -185,6 +185,7 @@
                     <th>账号</th>
                     <th>角色ID</th>
                     <th>角色名</th>
+                    <th>所属推广员</th>
                     <?php if($awardType == 'A'):?>
                     <th>充值金额</th>
                     <?php elseif($awardType == 'B'):?>
@@ -229,7 +230,7 @@
                             <td>{$data.user_account}</td>
                             <td>{$data.role_id}</td>
                             <td>{$data.role_name}</td>
-                            
+                            <td>{$data.promote_account}</td>
                             <?php if($awardType == 'A'):?>
                             <td>{$data.pay_amount}</td>
                             <?php elseif($awardType == 'B'):?>

Application/Base/Service/GameRebateService.class.php

@@ -279,6 +279,7 @@ class GameRebateService
             'user_account' => '账号',
             'role_id' => '角色ID',
             'role_name' => '角色名称',
+            'promote_account' => '所属推广员',
         ];
             
         if ($awardType == 'A') {

Application/Home/View/default/GameRebate/records.html

@@ -159,6 +159,7 @@
                   <th>账号</th>
                   <th>角色ID</th>
                   <th>角色名</th>
+                  <th>所属推广员</th>
                   <?php if($awardType == 'A'):?>
                   <th>充值金额</th>
                   <?php elseif($awardType == 'B'):?>
@@ -199,7 +200,7 @@
                       <td>{$data.user_account}</td>
                       <td>{$data.role_id}</td>
                       <td>{$data.role_name}</td>
-                      
+                      <td>{$data.promote_account}</td>
                       <?php if($awardType == 'A'):?>
                       <td>{$data.pay_amount}</td>
                       <?php elseif($awardType == 'B'):?>