diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php index 7b869787e..62cb362d5 100644 --- a/Application/Admin/Controller/CompanyStatementPoolController.class.php +++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php @@ -681,8 +681,8 @@ class CompanyStatementPoolController extends ThinkController // // } // - $handle_data = $this->changeDataStructVc($v['statement_info'],$is_export,$cline); - $v['statement_info'] = $handle_data; +// $handle_data = $this->changeDataStructVc($v['statement_info'],$is_export,$cline); +// $v['statement_info'] = $handle_data; // dump($handle_data); @@ -826,8 +826,8 @@ class CompanyStatementPoolController extends ThinkController } } - $handle_data = $this->changeDataStructVc($v['statement_info'],$is_export,$cline); - $v['statement_info'] = $handle_data; +// $handle_data = $this->changeDataStructVc($v['statement_info'],$is_export,$cline); +// $v['statement_info'] = $handle_data; // dump($v['statement_info']); $v['matche_platform'] = $Partner[$v['company_id']]; diff --git a/Application/Admin/View/CompanyStatementPool/viewCpPool.html b/Application/Admin/View/CompanyStatementPool/viewCpPool.html index 7b37383a1..e0cc3468c 100644 --- a/Application/Admin/View/CompanyStatementPool/viewCpPool.html +++ b/Application/Admin/View/CompanyStatementPool/viewCpPool.html @@ -111,7 +111,7 @@ 合作方待结算分成 违规罚款 奖励 - 周结算金额 + 合作待结算金额 是否结算 @@ -154,7 +154,7 @@ {$com['fine']-0} {$com['reward']-0} - {$com['statement_info'][0]['week_amount']} + {$com['statement_money']} @@ -187,10 +187,10 @@ - - - {$it['time']} - + {$it['statement_begin_time']}-{$it['statement_end_time']} + + + {$it['game_name']} {$it['pay_amount']} {$it['pay_amount']} diff --git a/Application/Admin/View/CompanyStatementPool/viewPcPool.html b/Application/Admin/View/CompanyStatementPool/viewPcPool.html index f9f7e170e..e86f97538 100644 --- a/Application/Admin/View/CompanyStatementPool/viewPcPool.html +++ b/Application/Admin/View/CompanyStatementPool/viewPcPool.html @@ -107,7 +107,7 @@ 分成金额/元 罚款 奖励 - 周结算金额 + 合计/元 对账人 结算日期 @@ -137,11 +137,11 @@ {$com['statement_info'][0]['d_statement_money']} {$com['fine']-0} {$com['reward']-0} - {$com['statement_info'][0]['week_amount']} + {$com['statement_money']} {$com.settlement_contact} - - {$com['statement_info'][0]['time']} + {$com['statement_info'][0]['statement_begin_time']}-{$com['statement_info'][0]['statement_end_time']} + {$com.company_info.payee_name} @@ -178,10 +178,13 @@ {$it['increment_ratio']|showNumPercent} {$it['fax_ratio']|showNumPercent} {$it['d_statement_money']} - - - {$it['time']} - + {$it['statement_begin_time']}-{$it['statement_end_time']} + + + + + + @@ -195,7 +198,7 @@ {$count.fine} {$count.reward} {$count.statement_money} - {$count.statement_money} +