解决冲突

master
jbRotk 5 years ago
commit c968e54cf8

@ -5887,6 +5887,10 @@ class ExportController extends Controller
if (strlen(I('company_belong'))) {
$map['company_belong'] = I("company_belong");
}
if (!is_null(I('admin_uid', null))) {
$map['admin_id'] = I('admin_uid');
}
//为数据权限添加
setPowerPromoteIds($map, 'tab_promote.id');
@ -7114,6 +7118,7 @@ class ExportController extends Controller
$xlsCell = array(
array('game_name','游戏'),
array('game_type_name','游戏类型'),
array('partner_name','合作公司'),
array('cash_count','游戏现金金额'),
array('balance_coin_count','平台币直充支出'),
@ -7145,6 +7150,10 @@ class ExportController extends Controller
$map['_string'] .= " s.pay_time < {$timeend}";
}
if (!empty(I('game_type_id'))) {
$map['g.game_type_id'] = I('game_type_id');
}
$xlsData = D("spend")->gameStatistics($map);
foreach ($xlsData as $key => $value) {
$xlsData[$key]['all_cash_count'] = $value['cash_count'] + $value['balance_coin_count'] + $value['inside_cash_count'];

@ -725,6 +725,10 @@ class FinanceController extends ThinkController
}
$map['_string'] .= " s.pay_time < {$timeend}";
}
if (!empty(I('game_type_id'))) {
$map['g.game_type_id'] = I('game_type_id');
}
$startTime = time();
//游戏统计列表
$data = D("spend")->gameStatistics($map, $row, $p);
@ -749,6 +753,8 @@ class FinanceController extends ThinkController
$sumInside = $totalData['inside_cash_count'];
$sumAll = $sumCash + $sumBalance + $sumInside;
$game_types = M("game_type", 'tab_')->field('id, type_name')->select();
$this->assign('game_types', $game_types);
$this->assign('sumCash', $sumCash);
$this->assign('sumBalance', $sumBalance);
$this->assign('sumInside', $sumInside);

@ -99,6 +99,11 @@ class PromoteController extends ThinkController
if (strlen(I('company_belong'))) {
$map['company_belong'] = I("company_belong");
}
if (!is_null(I('admin_uid', null))) {
$map['admin_id'] = I('admin_uid');
}
$this->m_title = '推广员列表';
$this->assign('commonset', M('Kuaijieicon')->where(['url'=>'Promote/lists/type/1','status'=>1])->find());
if (isset($_REQUEST['row'])) {
@ -176,6 +181,8 @@ class PromoteController extends ThinkController
if ($page) {
$this->assign('_page', $page);
}
$admins = M('member')->field('uid,nickname')->select();
$this->assign('admins', $admins);
$this->assign('list_data', $list_data);
$this->display();
}
@ -1216,6 +1223,13 @@ class PromoteController extends ThinkController
$map['pb.can_view_recharge'] = I('can_view_recharge');
}
if (!is_null(I('company_id', null))) {
$map['p.company_id'] = I('company_id');
}
if (!is_null(I('admin_id', null))) {
$map['p.admin_id'] = I('admin_id');
}
$this->m_title = '推广公会归属管理';
$this->assign('commonset', M('Kuaijieicon')->where(['url'=>'Promote/belong','status'=>1])->find());
if (isset($_REQUEST['row'])) {
@ -1229,8 +1243,9 @@ class PromoteController extends ThinkController
$model = M('promote_belong', 'tab_');
$list_data = $model->alias('pb')
->join('left join tab_promote as p on p.id=pb.promote_id')
->join('left join tab_promote_company as pc on pc.id = p.company_id')
->where($map)
->field('p.*,pb.*')
->field('p.*,pb.*, pc.company_name')
->page($p, $row)
->order('verify_status asc,applicant_time asc')
->select();
@ -1241,8 +1256,12 @@ class PromoteController extends ThinkController
if ($page) {
$this->assign('_page', $page);
}
$companys = M('promote_company', 'tab_')->field('id, company_name')->select();
$admins = M('member')->field('uid,nickname')->select();
$this->assign('is_admin', is_administrator());
$this->assign('list_data', $list_data);
$this->assign('companys', $companys);
$this->assign('admins', $admins);
$this->display();
}

@ -230,4 +230,103 @@ class StatementMangementController extends ThinkController
}
public function rewardManageList($row = 10, $p = 1)
{
$map = [];
$list = M('reward_record', 'tab_')->where($map)->page($p, $row)->select();
if ($list) {
$companys[1] = array_column(M('partner', 'tab_')->field('id, partner as name')->select(), 'name', 'id');
$companys[2] = array_column(M('promote_company', 'tab_')->field('id, company_name as name')->select(), 'name', 'id');
$games = array_column(M('game', 'tab_')->field('relation_game_id, relation_game_name')->group('relation_game_id')->select(), 'relation_game_name', 'relation_game_id');
foreach ($list as &$item) {
$item['company_name'] = $companys[$item['company_type']][$item['company_id']];
$item['accounts'] = json_decode($item['accounts'], true) ?: [];
$item['reward_type_desc'] = $item['reward_type'] == 1 ? "奖励" : "惩罚";
$item['company_type_desc'] = $item['company_type'] == 1 ? "上游公司" : "下游公司";
$item['relation_game_name'] = $games[$item['relation_game_id']];
// if ($item['company_type'] == 1) {
// } else {
// }
}
}
$count = M('reward_record', 'tab_')->where($map)->count();
$page = set_pagination($count, $row);
if ($page) {
$this->assign('_page', $page);
}
$this->assign('list', $list);
$this->display();
}
public function rewardManageSave($id=0)
{
if (IS_POST) {
$data = [
'reward_type' => I('reward_type'),
'company_type' => I('company_type'),
'company_id' => I('company_id'),
'relation_game_id' => I('relation_game_id'),
'money' => I('money'),
'content' => I('content'),
'remark' => I('remark'),
];
$accounts = I('account');
$user_types = I('user_type');
if ($accounts) {
foreach ($accounts as $index => $account) {
$data['accounts'][] = array_merge(['account'=>$account], ['user_type'=>$user_types[$index]]);
}
} else {
$data['accounts'] = [];
}
$data['accounts'] = json_encode($data['accounts']);
if (!is_numeric(I('money'))) {
return $this->error('请输入正确的金额');
}
if (empty(I('content'))) {
return $this->error('请填写事件内容');
}
if ($id) {
$upt = M('reward_record', 'tab_')->where(['id'=>$id])->save($data);
return $upt ? $this->success('更新成功', U('StatementMangement/rewardManageList')) : $this->error('更新失败');
} else {
$data['create_time'] = time();
$data['creater_id'] = is_login();
$ins = M('reward_record', 'tab_')->add($data);
return $ins ? $this->success('新增成功', U('StatementMangement/rewardManageList')) : $this->error('新增失败');
}
} else {
$games = M('game', 'tab_')->field('relation_game_id, relation_game_name')->group('relation_game_id')->select();
$this->assign('games', $games);
if ($id) {
if (I('delete')) {
$upt = M('reward_record', 'tab_')->where(['id'=>$id])->delete();
return $upt ? $this->success('删除成功') : $this->error('删除失败');
} else {
$data = M('reward_record', 'tab_')->where(['id'=>$id])->find();
if (!$data) return $this->error("未找到该记录");
$data['accounts'] = json_decode($data['accounts'], true) ?: [];
$this->assign('data', $data);
}
}
$this->display();
}
}
public function getCompanys($type=1)
{
if ($type == 1) {
$data = M('partner', 'tab_')->field('id, partner as name')->select();
} elseif ($type == 0) {
$data = [];
} else {
$data = M('promote_company', 'tab_')->field('id, company_name as name')->select();
}
return $this->success($data, '', true);
}
}

@ -841,7 +841,7 @@ class SpendModel extends Model
public function gameStatistics($map, $row = 0, $page = 1)
{
$query = $this->alias("s")
->field("s.game_id,s.game_name,p.partner as partner_name,
->field("s.game_id,s.game_name,p.partner as partner_name, g.game_type_name,
SUM(CASE WHEN pay_way > 0 THEN pay_amount ELSE 0 END) as cash_count,
SUM(CASE WHEN pay_way = 0 THEN pay_amount ELSE 0 END) as balance_coin_count,
SUM(CASE WHEN pay_way = -1 THEN pay_amount ELSE 0 END) as inside_cash_count")

@ -107,6 +107,15 @@
</select>
</div>
<div class="input-list input-list-game search_label_rehab">
<select id="game_type_id" name="game_type_id" class="select_gallery" >
<option value="">请选择游戏类型</option>
<volist name="game_types" id="type">
<option value="{$type.id}" <if condition="$type.id eq I('game_type_id', null)">selected</if> >{$type.type_name}</option>
</volist>
</select>
</div>
<div class="input-list">
<input type="text" readonly id="time-start" name="timestart" class="" value="{$startDate}"
placeholder="开始时间"/>
@ -152,6 +161,8 @@
<th >游戏</th>
<th>游戏类型</th>
<th ><div class="tooltip">游戏现金金额<span class="tooltiptext"><span style="margin-left: -10px">第三方支付(微信,支付宝,快捷)。</span></span></div></th>
<th ><div class="tooltip">平台币直充支出<span class="tooltiptext"><span style="margin-left: -10px">平台币购买游戏道具所产生的金额</span></span></div></th>
@ -180,6 +191,7 @@
<tr>
<td ><if condition="$data.partner_name neq ''">{$data.partner_name}<else/></if></td>
<td ><if condition="$data.game_name neq ''">{$data.game_name}<else/></if></td>
<td ><if condition="$data.game_type_name neq ''">{$data.game_type_name}<else/></if></td>
<td ><if condition="$data.cash_count neq ''">{$data.cash_count}<else/>0</if></td>
<td class="coin-detail" data-pay_type="0" style="color: #0066cc;cursor: pointer"
data-url="{:U('Finance/coinDetail',array(
@ -215,7 +227,7 @@
</tr>
</volist>
<tr>
<td colspan="2" ><span>总计</span></td>
<td colspan="3" ><span>总计</span></td>
<td ><span><if condition="$sumCash neq ''">{$sumCash}<else/>0</if></span></td>
<td><if condition="$sumBalance neq ''">{$sumBalance}<else/>0</if></td>
<td><if condition="$sumInside neq ''">{$sumInside}<else/>0</if></td>

@ -57,6 +57,22 @@
<div class="input-list">
<input type="text" name="account" placeholder="请输入会长账号" value="{:I('account')}">
</div>
<div class="input-list input-list-game search_label_rehab">
<select id="company_id" name="company_id" class="select_gallery" >
<option value="">推广公司</option>
<volist name="companys" id="c">
<option value="{$c.id}" <if condition="$c.id eq I('company_id', null)">selected</if> >{$c.company_name}</option>
</volist>
</select>
</div>
<div class="input-list input-list-game search_label_rehab">
<select id="admin_id" name="admin_id" class="select_gallery" >
<option value="">归属管理员</option>
<volist name="admins" id="admin">
<option value="{$admin.uid}" <if condition="$admin.uid eq I('admin_id')">selected</if> >{$admin.nickname}</option>
</volist>
</select>
</div>
<div class="input-list input-list-channelstatus">
<select name="company_relation">
@ -101,6 +117,7 @@
<th>会长ID</th>
<th>会长账号</th>
<th>手机号码</th>
<th>推广公司</th>
<th ><a class="paixu" data-order='create_time'>注册时间</a></th>
<th>状态</th>
<th>身份状态</th>
@ -112,6 +129,7 @@
<th>审核</th>
<th>申请人</th>
<th>确认人</th>
<th>归属管理员</th>
<th>操作</th>
</tr>
</thead>
@ -144,6 +162,7 @@
</if>-->
{$data.mobile_phone}
</td>
<td>{$data.company_name}</td>
<td>{:set_show_time($data['create_time'])}</td>
<td>
<?php $status_str = get_info_status($data['status'],3); $status_str = $status_str ?: '待审核';?>
@ -213,6 +232,7 @@
</td>
<td>{$data['applicant_name']}</td>
<td>{$data['approver_name']}</td>
<td>{:get_admin_nickname($data['admin_id'])}</td>
<td>
<a href="{:U('belong_edit',array('id'=>$data['id']))}" class="">编辑</a>
</td>

@ -102,6 +102,14 @@
<option value="4">组员</option>
</select>
</div>
<div class="input-list input-list-game search_label_rehab">
<select id="admin_uid" name="admin_uid" class="select_gallery" >
<option value="">归属管理员</option>
<volist name="admins" id="admin">
<option value="{$admin.uid}" <if condition="$admin.uid eq I('admin_uid')">selected</if> >{$admin.nickname}</option>
</volist>
</select>
</div>
<div class="input-list input-list-admin search_label_rehab">
<select id="admin_id" name="admin_id" class="select_gallery" >
<option value="">商务专员</option>
@ -196,6 +204,7 @@
<th>所属会长</th>
<th>工会归属</th>
<th>工会关系</th>
<th>归属管理员</th>
<th>商务专员</th>
<th>状态</th>
<th>身份状态</th>
@ -248,6 +257,7 @@
</td>
<td>{$data['company_belong_str']}</td>
<td>{$data['company_relation_str']}</td>
<td>{:get_admin_nickname($data['admin_id'])}</td>
<td>{:get_business_affairs_account($data['ba_id'])}</td>
<td>
<?php $status_str = get_info_status($data['status'],3); $status_str = $status_str ?: '待审核';?>
@ -325,7 +335,7 @@
<tbody>
<if condition = "empty($list_data)">
<tr>
<td colspan="7" class="text-center">aOh! 暂时还没有内容!</td>
<td colspan="10" class="text-center">aOh! 暂时还没有内容!</td>
</tr>
</if>
<notemtpy name = "list_data">

@ -0,0 +1,152 @@
<extend name="Public/base"/>
<block name="body">
<link rel="stylesheet" href="__CSS__/select2.min.css" type="text/css" />
<link rel="stylesheet" href="__CSS__/pro_promote.css" type="text/css" />
<script src="__STATIC__/jquery.form.js"></script>
<script src="__STATIC__/layer/layer.js"></script>
<script type="text/javascript" src="__JS__/bootstrap.min.js"></script>
<script type="text/javascript" src="__JS__/select2.min.js"></script>
<script type="text/javascript" src="__STATIC__/layer3/layer.js"></script>
<style>
.select2-container--default .select2-selection--single {
color: #000;
resize: none;
border-width: 1px;
border-style: solid;
border-color: #a7b5bc #ced9df #ced9df #a7b5bc;
box-shadow: 0px 3px 3px #F7F8F9 inset;height:35px;
height:28px;border-radius:3px;font-size:12px;
}
.select2-container--default .select2-selection--single .select2-selection__rendered {
line-height:35px;
line-height:28px;
}
.select2-container--default .select2-selection--single .select2-selection__arrow {
height:26px;
}
.select2-container--default .select2-search--dropdown .select2-search__field {
height:26px;line-height:26px;font-size:12px;
}
.select2-results__option[aria-selected] {font-size:12px;}
.layui-layer-dialog .layui-layer-content{color:red}
.butnbox {padding:10px 0 10px;}
.butnbox .butnlist {overflow:hidden;clear:both;}
.butnbox .butnlist .butn,.butnbox .butnlist .butn:hover {text-decoration:none;border:none;}
.butnbox .butnlist .butn {display:inline-block;width:120px;height:28px;line-height:28px;text-align:center;color:#FFF;background:#3C95C8;border-radius:3px;}
.butnbox .butnlist .butn.last {background:#009900;}
.butnbox .butnlist .butn~.butn {margin-left:20px;}
.data_list table tbody tr a.disabled,.data_list table tbody tr a.disabled:hover {color:#999;cursor:default;}
.layui-layer-title {
text-align: center;
height: 80px;
line-height: 80px;
font-weight: 600;
font-size: 18px;
}
</style>
<div class="cf main-place top_nav_list navtab_list">
<h3 class="page_title">奖罚记录管理</h3>
<p class="description_text">上下游奖罚记录管理</p>
</div>
<div class="butnbox" >
<div class="butnlist jscheckbutn" style="margin-left: 2px">
<a class="butn" href="{:U('StatementMangement/rewardManageSave')}">添加</a>
</div>
</div>
<!-- 数据列表 -->
<div class="data_list">
<div class="">
<table>
<!-- 表头 -->
<thead>
<tr>
<th>奖罚类型</th>
<th>公司类型</th>
<th>公司名称</th>
<th>涉及账号</th>
<th>游戏</th>
<th>事件</th>
<th>金额</th>
<th>备注</th>
<th>添加人</th>
<th>操作</th>
</tr>
</thead>
<!-- 列表 -->
<tbody>
<if condition = "empty($list)">
<tr>
<td colspan="10" class="text-center">aOh! 暂时还没有内容!</td>
</tr>
</if>
<notemtpy name = "list">
<volist name="list" id="data">
<tr>
<td>{$data.reward_type_desc}</td>
<td>{$data.company_type_desc}</td>
<td>{$data.company_name}</td>
<td>
<?php foreach ($data['accounts'] as $account):?>
<div>
<?php if ($account['user_type'] == 1):?>推广员/<?php else:?>玩家/<?php endif;?>{$account['account']}
</div>
<?php endforeach;?>
</td>
<td>{$data.relation_game_name}</td>
<td>{$data.content}</td>
<td>{$data.money}</td>
<td>{$data.remark}</td>
<td>{:get_admin_nickname($data['creater_id'])}</td>
<td>
<a href="{:U('StatementMangement/rewardManageSave',array('id'=>$data['id']))}">编辑 </a>
<a class="confirm ajax-get" href="{:U('StatementMangement/rewardManageSave',array('id'=>$data['id'], 'delete'=>1))}">删除 </a>
</td>
</tr>
</volist>
</notemtpy>
</tbody>
</table>
</div>
</div>
<div class="page">
{$_page|default=''}
</div>
<div class="common_settings">
<span class="plus_icon"><span><img src="__IMG__/zwmimages/icon_jia.png"></span></span>
<form class="addShortcutIcon">
<input type="hidden" name="title" value="{$m_title}">
<input type="hidden" name="url" value="Promote/lists/type/{:I('type',1)}">
</form>
<a class="ajax-post add-butn <notempty name='commonset'>addSIsetted</notempty>" href="javascript:;" target-form="addShortcutIcon" url="{:U('Think/addShortcutIcon')}"><img src="__IMG__/zwmimages/icon_jia.png"><span><notempty name='commonset'>已添加<else />添加至常用设置</notempty></span></a>
</div>
</block>
<block name="script">
<link href="__STATIC__/datetimepicker/css/datetimepicker.css" rel="stylesheet" type="text/css">
<php>if(C('COLOR_STYLE')=='blue_color') echo '
<link href="__STATIC__/datetimepicker/css/datetimepicker_blue.css" rel="stylesheet" type="text/css">
';
</php>
<link href="__STATIC__/datetimepicker/css/dropdown.css" rel="stylesheet" type="text/css">
<script type="text/javascript" src="__STATIC__/datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
<script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js"
charset="UTF-8"></script>
<script src="__STATIC__/layer/layer.js" type="text/javascript"></script>
<script type="text/javascript">
</script>
<script>
<volist name=":I('get.')" id="vo">
Think.setValue('{$key}',"{$vo}");
</volist>
$(".select_gallery").select2();
highlight_subnav("{:U('StatementMangement/rewardManageList')}");
</script>
</block>

@ -0,0 +1,186 @@
<extend name="Public/base" />
<block name="css">
<link rel="stylesheet" type="text/css" href="__CSS__/admin_table.css" media="all">
<link rel="stylesheet" type="text/css" href="__STATIC__/webuploader/webuploader.css" media="all">
<style>
#form .txt_area.download_url {width:400px;}
.tabcon1711 .table_radio2 .table_btn {width:215px;}
.bnt_add,.bnt_remove,.bnt_save{
height: 30px;
width: 20px;
font-size: 20px;
line-height: 10px;
color: #3399ff;
background: none;
border: none;
margin-left: 20px;
cursor: pointer;
}
.bnt_remove{
color: #F70909;
}
.bnt_save{
color: #4DB361;
}
</style>
<style>
.select2-container--default .select2-selection--single {
color: #000;
resize: none;
border-width: 1px;
border-style: solid;
border-color: #a7b5bc #ced9df #ced9df #a7b5bc;
box-shadow: 0px 3px 3px #F7F8F9 inset;height:35px;
height:28px;border-radius:3px;font-size:12px;
}
.select2-container--default .select2-selection--single .select2-selection__rendered {
line-height:35px;
line-height:28px;
}
.select2-container--default .select2-selection--single .select2-selection__arrow {
height:26px;
}
.select2-container--default .select2-search--dropdown .select2-search__field {
height:26px;line-height:26px;font-size:12px;
}
.select2-results__option[aria-selected] {font-size:12px;}
</style>
</block>
<!-- 管理员用户组新增和编辑页面 -->
<block name="body">
<script src="__STATIC__/layer/layer.js" type="text/javascript"></script>
<script src="__STATIC__/layer/extend/layer.ext.js" type="text/javascript"></script>
<script type="text/javascript" src="__STATIC__/uploadify/jquery.uploadify.min.js"></script>
<form action="{:U('StatementMangement/rewardManageSave')}" enctype="application/x-www-form-urlencoded" method="POST"
class="form-horizontal form_info_ml">
<div class="formtitle"><span>奖惩编辑</span></div>
<ul class="form_info ">
<input type="hidden" name="id" value="{$data.id}" />
<li>
<label>奖惩类型</label>
<select id="reward_type" name="reward_type" class="select_gallery">
<option value="1" <?php if ($data['reward_type'] == 1):?>selected<?php endif;?>>奖励</option>
<option value="2" <?php if ($data['reward_type'] == 2):?>selected<?php endif;?>>惩罚</option>
</select>
</li>
<li>
<label>公司类型</label>
<select id="company_type" name="company_type" class="select_gallery" onchange="companyTypeChange()">
<option value="1" <?php if ($data['company_type'] == 1):?>selected<?php endif;?>>上游公司</option>
<option value="2" <?php if ($data['company_type'] == 2):?>selected<?php endif;?>>下游公司</option>
</select>
</li>
<li>
<label>公司名称</label>
<select id="company_id" name="company_id" class="select_gallery">
</select>
</li>
<?php if ($data['accounts']):?>
<?php foreach ($data['accounts'] as $k => $account):?>
<?php if ($k == 0):?>
<li class="user-account">
<label>涉及账号</label>
<select name="user_type[]" class="select_gallery user_type" onchange="userAccountChange(this)">
<option value="1" <?php if ($account['user_type'] == 1):?>selected<?php endif;?>>推广员</option>
<option value="2" <?php if ($account['user_type'] == 2):?>selected<?php endif;?>>玩家</option>
</select>
<input type="text" class="txt table_text_input" name="account[]" value="{$account['account']}" placeholder="账号">
<button type="button" class="bnt_add"></button>
</li>
<?php else:?>
<li class="user-account">
<label>涉及账号</label>
<select name="user_type[]" class="select_gallery user_type" onchange="userAccountChange(this)">
<option value="1" <?php if ($account['user_type'] == 1):?>selected<?php endif;?>>推广员</option>
<option value="2" <?php if ($account['user_type'] == 2):?>selected<?php endif;?>>玩家</option>
</select>
<input type="text" class="txt table_text_input" name="account[]" value="{$account['account']}" placeholder="账号">
<button type="button" class="bnt_remove"></button>
</li>
<?php endif;?>
<?php endforeach;?>
<?php else:?>
<li class="user-account">
<label>涉及账号</label>
<select name="user_type[]" class="select_gallery user_type" onchange="userAccountChange(this)">
<option value="1">推广员</option>
<option value="2">玩家</option>
</select>
<input type="text" class="txt table_text_input" name="account[]" value="" placeholder="账号">
<button type="button" class="bnt_add"></button>
</li>
<?php endif;?>
<li>
<label>游戏</label>
<select id="relation_game_id" name="relation_game_id" class="select_gallery">
<?php foreach ($games as $game):?>
<option value="{$game['relation_game_id']}" <?php if ($game['relation_game_id'] == $data['relation_game_id']):?>selected<?php endif;?> >{$game['relation_game_name']}</option>
<?php endforeach;?>
</select>
</li>
<li>
<label>事件</label>
<textarea name="content" class="" placeholder="事件" >{$data.content}</textarea>
</li>
<li>
<label>金额</label>
<input name="money" type="text" class="" placeholder="金额" value="{$data.money}" />
</li>
<li>
<label>备注</label>
<textarea name="remark" class="" placeholder="备注" >{$data.remark}</textarea>
</li>
<li>
<label>&nbsp;</label><input type="submit" id="submit" value="确认保存" target-form="form-horizontal" class="form_btn">
<input type="button" value="返 回" target-form="form-horizontal" class="form_btn ajax-post" onclick="javascript:void(window.history.go(-1))">
</li>
</ul>
</form>
<div class="common_settings">
<span class="plus_icon"><span><img src="__IMG__/zwmimages/icon_jia.png"></span></span>
<form class="addShortcutIcon">
<input type="hidden" name="title" value="{$m_title}">
<input type="hidden" name="url" value="AuthManager/index">
</form>
<a class="ajax-post add-butn <notempty name='commonset'>addSIsetted</notempty>" href="javascript:;" target-form="addShortcutIcon" url="{:U('Think/addShortcutIcon')}"><img src="__IMG__/zwmimages/icon_jia.png"><span><notempty name='commonset'>已添加<else />添加至常用设置</notempty></span></a>
</div>
</block>
<block name="script">
<script type="text/javascript">
highlight_subnav('{:U('StatementMangement/rewardManageList')}');
$(".bnt_add").bind("click",function(){
var a= '<li class="user-account"><label>涉及账号</label><select name="user_type[]" class="select_gallery user_type" onchange="userAccountChange(this)"><option value="1">推广员</option><option value="2">玩家</option></select><input type="text" class="txt table_text_input" name="account[]" value="" placeholder="账号"><button type="button" class="bnt_remove"></button>';
$(".user-account:last").after(a);
});
$(document).on('click', '.bnt_remove', function(){
$(this).parents('li').remove();
});
var company_id = '{$data["company_id"]}';
function companyTypeChange()
{
var companyType = $('#company_type').val();
$.ajax({
url:"{:U('StatementMangement/getCompanys')}",
dataType:'JSON',
data: {'type':companyType},
success:function(response){
var companyData = '';
$.each(response.info, function(index, item){
if (company_id == item.id) {
companyData += "<option value='"+item.id+"' selected >"+item.name+"</option>";
} else {
companyData += "<option value='"+item.id+"' >"+item.name+"</option>";
}
});
$('#company_id').html(companyData);
}
});
}
companyTypeChange();
</script>
</block>

@ -1113,3 +1113,19 @@ ALTER TABLE `tab_promote`
ADD COLUMN `auto_review_withdraw_updated_time` int(10) NOT NULL DEFAULT 0 COMMENT '提现自动审核状态更新时间';
ALTER TABLE `tab_promote`
ADD INDEX `auto_review_withdraw_status`(`auto_review_withdraw_status`) USING BTREE;
-- 奖罚记录
CREATE TABLE `tab_reward_record` (
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
`reward_type` tinyint(1) unsigned NOT NULL DEFAULT '1' COMMENT '奖罚类型 1奖励 2惩罚',
`company_type` tinyint(1) unsigned NOT NULL DEFAULT '1' COMMENT '公司类型 1上游公司 2下游公司',
`company_id` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '公司ID 当公司类型为上游CP公司时展示合作方管理下的公司反之展示推广公司管理下的公司',
`accounts` json NOT NULL,
`relation_game_id` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '游戏id',
`content` varchar(1000) COLLATE utf8mb4_bin NOT NULL DEFAULT '' COMMENT '事件内容',
`money` double(11,2) unsigned NOT NULL DEFAULT '0.00' COMMENT '金额',
`remark` varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '' COMMENT '备注',
`create_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '创建时间',
`creater_id` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '创建者ID',
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;

Loading…
Cancel
Save