Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release

推广分成特殊申请
master
廖金灵 4 years ago committed by Gogs
commit 5f0917220c

@ -126,7 +126,7 @@ class CompanyGameRatioController extends AdminController
unset($GetData['export']); unset($GetData['export']);
addOperationLog(['op_type'=>3,'key'=>getNowDate(),"op_name"=>"导出",'url'=>U(CONTROLLER_NAME.'/'.ACTION_NAME,$GetData)]); addOperationLog(['op_type'=>3,'key'=>getNowDate(),"op_name"=>"导出",'url'=>U(CONTROLLER_NAME.'/'.ACTION_NAME,$GetData)]);
data2csv($dbres,'推广游戏分成管理',array( data2csv($dbres,'特殊比例申请管理',array(
"company_name"=>"公司名称", "company_name"=>"公司名称",
"company_belong"=>"内外团", "company_belong"=>"内外团",
"settlement_type"=>"结算周期", "settlement_type"=>"结算周期",
@ -295,7 +295,7 @@ class CompanyGameRatioController extends AdminController
unset($GetData['export']); unset($GetData['export']);
addOperationLog(['op_type'=>3,'key'=>getNowDate(),"op_name"=>"导出",'url'=>U(CONTROLLER_NAME.'/'.ACTION_NAME,$GetData)]); addOperationLog(['op_type'=>3,'key'=>getNowDate(),"op_name"=>"导出",'url'=>U(CONTROLLER_NAME.'/'.ACTION_NAME,$GetData)]);
data2csv($dbres,'推广游戏分成管理',array( data2csv($dbres,'特殊比例申请管理',array(
"company_name"=>"公司名称", "company_name"=>"公司名称",
"company_belong"=>"内外团", "company_belong"=>"内外团",
"settlement_type"=>"结算周期", "settlement_type"=>"结算周期",
@ -572,7 +572,7 @@ class CompanyGameRatioController extends AdminController
{ {
$addurl = U("addRatio"); $addurl = U("addRatio");
$mentBtn = [ $mentBtn = [
"addRatio"=>"<a class='butn' href='{$addurl}'>新增推广游戏分成</a>", "addRatio"=>"<a class='butn' href='{$addurl}'>新增特殊比例</a>",
"marketAgree"=>"<a class='butn' id='marketAgree'>市场部审批通过</a>", "marketAgree"=>"<a class='butn' id='marketAgree'>市场部审批通过</a>",
"marketRefuse"=>"<a class='butn' id='marketRefuse' style='background-color: red;'>市场部审核拒绝</a>", "marketRefuse"=>"<a class='butn' id='marketRefuse' style='background-color: red;'>市场部审核拒绝</a>",
"adminAgree"=>"<a class='butn' id='adminAgree'>管理员审核通过</a>", "adminAgree"=>"<a class='butn' id='adminAgree'>管理员审核通过</a>",

@ -56,7 +56,7 @@
<a class="tabchose" href="{:U('index')}">生效列表</a> <a class="tabchose" href="{:U('index')}">生效列表</a>
<a href="{:U('lists')}">审核列表</a> <a href="{:U('lists')}">审核列表</a>
</div> </div>
<h3 class="page_title">推广游戏分成</h3> <h3 class="page_title">特殊比例申请</h3>
<p class="description_text">删除后游戏比例将读取模板值</p> <p class="description_text">删除后游戏比例将读取模板值</p>
</div> </div>
<!-- <div class="fl button_list"> <!-- <div class="fl button_list">

@ -56,7 +56,7 @@
<a href="{:U('index')}">生效列表</a> <a href="{:U('index')}">生效列表</a>
<a class="tabchose" href="{:U('lists')}">审核列表</a> <a class="tabchose" href="{:U('lists')}">审核列表</a>
</div> </div>
<h3 class="page_title">推广游戏分成审核列表</h3> <h3 class="page_title">特殊比例申请审核列表</h3>
<p class="description_text">如需修改已审核完成的游戏分成,请新增一个分成进行审核,未审核通过的,请直接编辑</p> <p class="description_text">如需修改已审核完成的游戏分成,请新增一个分成进行审核,未审核通过的,请直接编辑</p>
</div> </div>
<!-- <div class="fl button_list"> <!-- <div class="fl button_list">

Loading…
Cancel
Save