diff --git a/Application/Admin/Controller/GameRebateController.class.php b/Application/Admin/Controller/GameRebateController.class.php index 5be7aab0d..1435a425d 100644 --- a/Application/Admin/Controller/GameRebateController.class.php +++ b/Application/Admin/Controller/GameRebateController.class.php @@ -109,6 +109,7 @@ class GameRebateController extends ThinkController $pageTitle = $pageTitles[$awardType]; $pageName = $pageNames[$awardType]; + $newLine = I('export', 0) == 1 ? "\n" : '
'; if (count($records) > 0) { foreach ($records as $key => $record) { $records[$key]['review_status_text'] = $reviewStatusList[$record['review_status']]; @@ -117,7 +118,7 @@ class GameRebateController extends ThinkController $records[$key]['send_time'] = $record['send_time'] > 0 ? date('Y-m-d H:i:s', $record['send_time']) : '--'; $records[$key]['award_date_range'] = is_null($record['award_started_at']) || is_null($record['award_ended_at']) ? '' : $record['award_started_at'] . ' ~ ' . $record['award_ended_at']; - $records[$key]['gift_content'] = implode('
', explode('|', $record['gift_content'])); + $records[$key]['gift_content'] = implode($newLine, explode('|', $record['gift_content'])); } if (I('export', 0) == 1) { $field = [ @@ -126,7 +127,6 @@ class GameRebateController extends ThinkController 'user_account' => '账号', 'role_id' => '角色ID', 'role_name' => '角色名称', - 'pay_amount' => '充值金额', 'gift_content' => '奖励内容', 'review_status_text' => '审核状态', 'review_time' => '审核时间', @@ -134,6 +134,15 @@ class GameRebateController extends ThinkController 'send_time' => '发放时间', 'reviewer_username' => '审核人', ]; + + if ($awardType == 'A') { + $field['pay_amount'] = '充值金额'; + } elseif ($awardType == 'B') { + $field['pay_amount'] = '当日累计充值金额'; + $field['award_date_range'] = '可领取福利日期'; + } elseif ($awardType == 'C') { + $field['amount'] = '达到档位金额'; + } addOperationLog(['op_type'=>3,'key'=>getNowDate(),'op_name'=>'导出' . $pageTitle . '记录','url'=>U('GameRebate/' . $pageName),'menu'=>'推广员-发放福利管理-' . '导出' . $pageTitle . '记录']); diff --git a/Application/Admin/View/GameRebate/records.html b/Application/Admin/View/GameRebate/records.html index 643f792bf..f7ec79eee 100644 --- a/Application/Admin/View/GameRebate/records.html +++ b/Application/Admin/View/GameRebate/records.html @@ -240,10 +240,8 @@
- - 导出 - + 导出 {$_page|default=''}