diff --git a/Application/Admin/Controller/PromoteGameRatioController.class.php b/Application/Admin/Controller/PromoteGameRatioController.class.php
index c55fb6c5a..110270c14 100644
--- a/Application/Admin/Controller/PromoteGameRatioController.class.php
+++ b/Application/Admin/Controller/PromoteGameRatioController.class.php
@@ -116,14 +116,23 @@ class PromoteGameRatioController extends ThinkController
$thisTurnoverRatios = $promoteGameRatio['turnover_ratio'] ? json_decode($promoteGameRatio['turnover_ratio'], true) : [];
$thisRatioDtl = "默认:{$promoteGameRatio['ratio']}%";
if ($thisTurnoverRatios) {
+ if (I('export', 0) == 1) {
+ $symbol = "\n";
+ } else {
+ $symbol = "
";
+ }
foreach ($thisTurnoverRatios as $thisTurnoverRatio) {
$thisIntervalClosedStatusText = isset($thisTurnoverRatio['instanceof']) ? ($thisTurnoverRatio['instanceof'] == 1 ? '≥' : '>') : '≥';
- $thisRatioDtl .= "
月流水{$thisIntervalClosedStatusText}{$thisTurnoverRatio['turnover']},比例:{$thisTurnoverRatio['ratio']}%";
+ $thisRatioDtl .= "{$symbol}月流水{$thisIntervalClosedStatusText}{$thisTurnoverRatio['turnover']},比例:{$thisTurnoverRatio['ratio']}%";
}
}
$thisLastRatioStatus = $promoteGameRatio['last_ratio_status'];
$thisStatusText = self::$statusList[$promoteGameRatio['status']];
- $thisStatusText = ($promoteGameRatio['status'] == -1) ? '' . $thisStatusText . '' : $thisStatusText;
+ if (I('export', 0) == 1) {
+ $thisStatusText = ($promoteGameRatio['status'] == -1) ? $thisStatusText : $thisStatusText;
+ } else {
+ $thisStatusText = ($promoteGameRatio['status'] == -1) ? '' . $thisStatusText . '' : $thisStatusText;
+ }
$thisApplicant = get_admin_account($promoteGameRatio['applicant_id']);
$thisReviewer = $promoteGameRatio['reviewer_id'] ? get_admin_account($promoteGameRatio['reviewer_id']) : '待确认';
$thisBeninTime = date('Y/m', $promoteGameRatio['begin_time']);
@@ -181,9 +190,12 @@ class PromoteGameRatioController extends ThinkController
'promote_create_time' => '注册时间',
'promote_status_text' => '状态',
'promote_ver_status_text' => '身份状态',
+ 'company_name' => '推广公司',
+ 'company_belong' => '工会归属',
'game_name' => '已申请游戏',
+ 'game_type_name' => '游戏类型',
'last_ratio' => '原分成比例',
- 'ratio' => '当前分成比例',
+ 'ratio_dtl' => '公会阶梯比例详细信息',
'valid_date' => '开始时间',
'remark' => '备注',
'status_text' => '分成比例审核',
diff --git a/Application/Admin/Controller/StatementMangementController.class.php b/Application/Admin/Controller/StatementMangementController.class.php
index 6532fb38c..5cadcf02b 100644
--- a/Application/Admin/Controller/StatementMangementController.class.php
+++ b/Application/Admin/Controller/StatementMangementController.class.php
@@ -242,6 +242,9 @@ class StatementMangementController extends ThinkController
if (!empty(I('partner_id'))) {
$map['company_id'] = I('partner_id');
}
+ if (strlen(I('company_type'))) {
+ $map['company_type'] = I('company_type');
+ }
if (!empty(I('account'))) {
$map['accounts'] = ['like', '%' . I('account') . '%'];
}
diff --git a/Application/Admin/View/StatementMangement/rewardManageList.html b/Application/Admin/View/StatementMangement/rewardManageList.html
index 6b79eaee0..064f94ca5 100644
--- a/Application/Admin/View/StatementMangement/rewardManageList.html
+++ b/Application/Admin/View/StatementMangement/rewardManageList.html
@@ -64,7 +64,15 @@