解决冲突

master
ELF 5 years ago
commit d72b129596

@ -560,6 +560,27 @@ function getGameByName($game_name=null, $sdk_version=null)
return $result;
}
}
//根据游戏公司,游戏名称,游戏类型
function getGameidByPartnerNameType($partner_id=null,$game_name=null, $sdk_version=null)
{
$map = [];
if($partner_id){
$map['partner_id'] = $partner_id;
}
if ($game_name) {
$map['relation_game_name'] = $game_name;
}
if ($sdk_version) {
$map['sdk_version'] = $sdk_version;
}
$result = D("Game")->field('id')->where($map)->select();
if(empty($result)) {
return [['id' => -1]];
}else
{
return $result;
}
}
function getTopPromote($promote_id)
{

@ -5,6 +5,15 @@ namespace Admin\Controller;
class BehaviorLogController extends ThinkController
{
private $single_type = [
0 => '通知到账',
1 => '补单',
];
/**
* 游戏预下单记录
* @return [type] [description]
*/
public function game()
{
$params = I('get.');
@ -67,7 +76,7 @@ class BehaviorLogController extends ThinkController
$data[$k]['server_name'] = '';
$data[$k]['game_player_name'] = '';
$data[$k]['game_player_id'] = '';
}
}
$count = M('pay_info', 'tab_')->where($map)->count();
@ -82,4 +91,77 @@ class BehaviorLogController extends ThinkController
$this->display('index');
}
/**
* 补单记录
* @return [type] [description]
*/
public function singleSupplement() {
$p = I('get.p', 1);
$row = I('get.row', 10);
$params = I('get.');
if(isset($params['timestart']) && isset($params['timeend'])) {
$startTime = strtotime($params['timestart']);
$endTime = strtotime($params['timeend']) + 86399;
$map['tab_repair_pay.create_time'] = array('BETWEEN', [$startTime, $endTime]);
}
if(isset($params['type'])) {
$map['tab_repair_pay.type'] = $params['type'];
}
if(isset($params['pay_order_number'])) {
$map['tab_repair_pay.pay_order_number'] = $params['pay_order_number'];
}
if(isset($params['admin_name'])) {
$map['tab_repair_pay.admin_name'] = $params['admin_name'];
}
if(!empty(I('get.order_number'))) {
$map['tab_spend.order_number'] = I('get.order_number');
$data = M('repair_pay', 'tab_')->join('tab_spend on tab_spend.pay_order_number = tab_repair_pay.pay_order_number')->where($map)->page($p, $row)->order('tab_repair_pay.id DESC')->select();
} else {
$data = M('repair_pay', 'tab_')->where($map)->page($p, $row)->order('id DESC')->select();
}
$show_data = [];
foreach($data as $k => $v) {
if($v['tab'] == 'spend') {
$order_detail = M('spend', 'tab_')->field('order_number,pay_time,user_account,promote_account,game_name,pay_amount,pay_way')->where(['pay_order_number' => $v['pay_order_number']])->find();
$re_data['pay_time'] = $order_detail['pay_time'];
} elseif($v['tab'] == 'deposit') {
$order_detail = M('deposit', 'tab_')->field('order_number,create_time,user_account,promote_account,pay_amount,pay_way')->where(['pay_order_number' => $v['pay_order_number']])->find();
$re_data['pay_time'] = $order_detail['create_time'];
}
$re_data['order_number'] = !empty($order_detail['order_number']) ? $order_detail['order_number'] : '-';
$re_data['user_account'] = $order_detail['user_account'];
$re_data['promote_account'] = $order_detail['promote_account'];
$re_data['game_name'] = !empty($order_detail['game_name']) ? $order_detail['game_name'] : '-';
$re_data['pay_amount'] = $order_detail['pay_amount'];
$re_data['pay_way'] = get_pay_way($order_detail['pay_way']);
$re_data['pay_order_number'] = $v['pay_order_number'];
$re_data['type'] = $this->single_type[$v['type']];
$re_data['create_time'] = $v['create_time'];
$re_data['admin_name'] = $v['admin_name'];
$show_data[] = $re_data;
}
if(!empty(I('get.order_number'))) {
$map['tab_spend.order_number'] = I('get.order_number');
$count = M('repair_pay', 'tab_')->join('tab_spend on tab_spend.pay_order_number = tab_repair_pay.pay_order_number')->where($map)->count();
} else {
$count = M('repair_pay', 'tab_')->where($map)->count();
}
$page = set_pagination($count, $row);
if ($page) {
$this->assign('_page', $page);
}
$this->assign('show_data', $show_data);
$this->display('singleSupplement');
}
}

@ -2097,6 +2097,70 @@ class ExportController extends Controller
$xlsData[0]['money_all'] = $xlsData[0]['buy_num'] * 10;
$xlsData[0]['authorization_all_num'] = $authorization_all_num;
break;
case 25:
$xlsCell = array(
array('type', '类型'),
array('pay_order_number', '支付订单号'),
array('order_number', 'CP订单号'),
array('pay_time', '充值时间'),
array('user_account', '玩家账号'),
array('promote_account', '所属推广员'),
array('game_name', '游戏名称'),
array('pay_amount', '实付金额'),
array('pay_way', '充值方式'),
array('admin_name', '补单管理员'),
array('create_time', '补单时间'),
);
$params = I('get.');
if(isset($params['timestart']) && isset($params['timeend'])) {
$startTime = strtotime($params['timestart']);
$endTime = strtotime($params['timeend']) + 86399;
$map['tab_repair_pay.create_time'] = array('BETWEEN', [$startTime, $endTime]);
}
if(isset($params['type'])) {
$map['tab_repair_pay.type'] = $params['type'];
}
if(isset($params['pay_order_number'])) {
$map['tab_repair_pay.pay_order_number'] = $params['pay_order_number'];
}
if(isset($params['admin_name'])) {
$map['tab_repair_pay.admin_name'] = $params['admin_name'];
}
if(!empty(I('get.order_number'))) {
$map['tab_spend.order_number'] = I('get.order_number');
$data = M('repair_pay', 'tab_')->join('tab_spend on tab_spend.pay_order_number = tab_repair_pay.pay_order_number')->where($map)->page($p, $row)->order('tab_repair_pay.id DESC')->select();
} else {
$data = M('repair_pay', 'tab_')->where($map)->page($p, $row)->order('id DESC')->select();
}
$xlsData = [];
foreach($data as $k => $v) {
if($v['tab'] == 'spend') {
$order_detail = M('spend', 'tab_')->field('order_number,pay_time,user_account,promote_account,game_name,pay_amount,pay_way')->where(['pay_order_number' => $v['pay_order_number']])->find();
$re_data['pay_time'] = set_show_time($order_detail['pay_time']);
} elseif($v['tab'] == 'deposit') {
$order_detail = M('deposit', 'tab_')->field('order_number,create_time,user_account,promote_account,pay_amount,pay_way')->where(['pay_order_number' => $v['pay_order_number']])->find();
$re_data['pay_time'] = set_show_time($order_detail['create_time']);
}
$re_data['order_number'] = !empty($order_detail['order_number']) ? $order_detail['order_number'] : '-';
$re_data['user_account'] = $order_detail['user_account'];
$re_data['promote_account'] = $order_detail['promote_account'];
$re_data['game_name'] = !empty($order_detail['game_name']) ? $order_detail['game_name'] : '-';
$re_data['pay_amount'] = $order_detail['pay_amount'];
$re_data['pay_way'] = get_pay_way($order_detail['pay_way']);
$re_data['pay_order_number'] = $v['pay_order_number'];
$re_data['type'] = $v['type'] == 1 ? '补单' : '通知到账';
$re_data['create_time'] = set_show_time($v['create_time']);
$re_data['admin_name'] = $v['admin_name'];
$xlsData[] = $re_data;
}
break;
default:
$xlsName = $xlsCell = $xlsData = [];

@ -719,12 +719,17 @@ class FinanceController extends ThinkController
}
if (!empty(I('timeend'))) {
$timeend = strtotime(I('timeend'));
$map['_string'] .= " and s.pay_time < {$timeend}";
$timeend = strtotime(I('timeend') . ' 23:59:59');
if (!empty($map['_string'])) {
$map['_string'] .= " and ";
}
$map['_string'] .= " s.pay_time < {$timeend}";
}
$startTime = time();
//游戏统计列表
$data = D("spend")->gameStatistics($map, $row, $p);
$endTime = time();
foreach ($data as $key => $value) {
$data[$key]['all_cash_count'] = $value['cash_count'] + $value['balance_coin_count'] + $value['inside_cash_count'];
}
@ -777,8 +782,11 @@ class FinanceController extends ThinkController
}
if (!empty(I('timeend'))) {
$timeend = strtotime(I('timeend'));
$map['_string'] .= " and pay_time < {$timeend}";
$timeend = strtotime(I('timeend') . ' 23:59:59');
if (!empty($map['_string'])) {
$map['_string'] .= " and ";
}
$map['_string'] .= " pay_time < {$timeend}";
}
if (!empty(I("promote_id"))) {
@ -807,7 +815,7 @@ class FinanceController extends ThinkController
} else {
$row = 10;
}
$map['pay_status'] = 1;
$map['pay_game_status'] = 1;
if (!empty(I("game_id"))) {
$map['game_id'] = I("game_id");
}
@ -821,12 +829,14 @@ class FinanceController extends ThinkController
$field = "pay_order_number,FROM_UNIXTIME(pay_time) as pay_time,user_account,user_nickname,game_name,promote_account,spend_ip,server_name,game_player_name,pay_amount,cost,pay_way";
$group = "";
$order = "pay_time DESC";
$data = D('spend')->getSpendData($map,$field,$group,$order,$page,$row);
foreach($data as $key => $value) {
$data[$key]['pay_way'] = getPayType($value['pay_way']);
}
$totalData = D('spend')->totalGameStatistics($map, false);
$sumCash = $totalData['cash_count'] ?? 0;
$sumBalance = $totalData['balance_coin_count'] ?? 0;
$sumInside = $totalData['inside_cash_count'] ?? 0;

@ -121,6 +121,7 @@ class FinancePromoteController extends AdminController
}
private function getJoinPromoteData($map,$istimeselect,$type="spend")
{
setPowerPromoteIds($map,"s.promote_id");
if ($_REQUEST['promote_id'] != '') {
if ($_REQUEST['promote_id'] == 0) {
$map['s.promote_id'] = 0;
@ -276,6 +277,7 @@ class FinancePromoteController extends AdminController
}
private function promoteUserData($map,$istimeselect,$type="spend")
{
setPowerPromoteIds($map,"s.promote_id");
if ($_REQUEST['promote_id'] != '') {
if ($_REQUEST['promote_id'] == 0) {
$map['s.promote_id'] = 0;
@ -436,14 +438,8 @@ class FinancePromoteController extends AdminController
$map['pay_order_number'] = $_REQUEST['pay_order_number'];
}
if (!empty(I('partner_id'))) {
$wherePartner = I('partner_id');
$gameId = M("game","tab_")->field("id")->where("partner_id={$wherePartner}")->select();
$gameId = implode(',',array_column($gameId,'id'));
$map['game_id'] = ['in',$gameId];
}
if (isset($_REQUEST['game_name']) || isset($_REQUEST['game_type'])) {
$map["game_id"] = array("in",implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')) );
if (isset($_REQUEST['game_name']) || isset($_REQUEST['game_type']) || isset($_REQUEST['partner_id'])) {
$map["game_id"] = array("in",implode(',', array_column(getGameidByPartnerNameType($_REQUEST['partner_id'],$_REQUEST['game_name'], $_REQUEST['game_type']), 'id')) );
}
if (isset($_REQUEST['time_start']) && isset($_REQUEST['time_end'])) {
@ -595,18 +591,21 @@ class FinancePromoteController extends AdminController
$map['pay_order_number'] = $_REQUEST['pay_order_number'];
}
if (!empty(I('partner_id'))&&empty(I("game_id"))) {
$wherePartner = I('partner_id');
$gameId = M("game","tab_")->field("id")->where("partner_id={$wherePartner}")->select();
$gameId = implode(',',array_column($gameId,'id'));
$map['tab_spend.game_id'] = ['in',$gameId];
}
// if (!empty(I('partner_id'))&&empty(I("game_id"))) {
// $wherePartner = I('partner_id');
// $gameId = M("game","tab_")->field("id")->where("partner_id={$wherePartner}")->select();
// $gameId = implode(',',array_column($gameId,'id'));
// $map['tab_spend.game_id'] = ['in',$gameId];
// }
if (!empty(I("game_id"))) {
$map['tab_spend.game_id'] = I("game_id");
}
if (isset($_REQUEST['game_name']) || isset($_REQUEST['game_type'])) {
$map["tab_spend.game_id"] = array("in",implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')) );
if (isset($_REQUEST['game_name']) || isset($_REQUEST['game_type']) || isset($_REQUEST['partner_id'])) {
$map["tab_spend.game_id"] = array("in",implode(',', array_column(getGameidByPartnerNameType($_REQUEST['partner_id'],$_REQUEST['game_name'], $_REQUEST['game_type']), 'id')) );
}
// if (isset($_REQUEST['game_name']) || isset($_REQUEST['game_type'])) {
// $map["tab_spend.game_id"] = array("in",implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')) );
// }
if (isset($_REQUEST['time_start']) && isset($_REQUEST['time_end'])) {
$map['pay_time'] = ['between', [strtotime($_REQUEST['time_start']), strtotime($_REQUEST['time_end']) + 86399]];

@ -187,7 +187,7 @@ class MendController extends ThinkController {
private function checkPromote($order_time,$account)
{
$res = M("Spend","tab_")->field("promote_id")->where(["pay_time"=>array("EGT",$order_time),"user_account"=>$account])->group("promote_id")->select();
if(count($res)>0) return true;
if(count($res)>1) return true;
return false;
}
//补链详情

@ -873,6 +873,7 @@ SUM(CASE WHEN pay_way = -1 THEN pay_amount ELSE 0 END) as inside_cash_count");
$data = $query->where(['s.pay_status' => 1, 'pay_game_status' => 1])
->where($map)
->find();
// dd($query->_sql());
return $data;
}

@ -0,0 +1,373 @@
<extend name="Public/base"/>
<block name="body">
<link rel="stylesheet" href="__CSS__/select2.min.css" type="text/css"/>
<script type="text/javascript" src="__JS__/bootstrap.min.js"></script>
<script type="text/javascript" src="__JS__/select2.min.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;}
</style>
<!-- 标题栏 -->
<div class="cf main-place top_nav_list navtab_list">
<h3 class="page_title">补单记录</h3>
<p class="description_text">说明:玩家充值失败管理员进行手动补单的记录</p>
</div>
<div class="cf top_nav_list">
<!-- 高级搜索 -->
<div class="jssearch fl cf search_list">
<div class="input-list search-title-box">
<label>搜索:</label>
</div>
<div class="input-list input-list-game search_label_rehab">
<select id="type" name="type" class="select_gallery" >
<option value="">请选择补单类型</option>
<option value="0" <?php I('game_type',-1) == 0 ? "selected" : ''?>>通知到账</option>
<option value="1" <?php echo I('game_type') == 1 ? "selected" : ''?>>补单</option>
</select>
</div>
<div class="input-list">
<input type="text" name="pay_order_number" class="" value="{:I('pay_order_number')}" placeholder="支付订单号">
</div>
<div class="input-list">
<input type="text" name="order_number" class="" value="{:I('order_number')}" placeholder="CP订单号">
</div>
<div class="input-list input-list-game search_label_rehab">
<select id="admin_name" name="admin_name" class="select_gallery" >
<option value="">补单管理员搜索</option>
<volist name=":get_admin_list()" id="vo">
<option value="{$vo.nickname}" <?php echo $vo.admin_name == I('nickname') ? 'selected':''; ?> >{$vo.nickname}</option>
</volist>
</select>
</div>
<div class="input-list">
<input type="text" readonly id="time-start" name="timestart" class="" value="{$startDate}"
placeholder="补单开始时间"/>
-
<div class="input-append date" id="datetimepicker" style="display:inline-block">
<input type="text" readonly id="time-end" name="timeend" class="" value="{$endDate}"
placeholder="补单结束时间"/>
<span class="add-on"><i class="icon-th"></i></span>
</div>
</div>
<input type="hidden" name="" value="" class="sortBy">
<div class="input-list search_item">
<a class="sch-btn" href="javascript:;" id="search"
url="{:U('BehaviorLog/singleSupplement','model='.$model['name'] . '&row='.I('row'),false)}">搜索</a>
</div>
</div>
</div>
<!-- 数据列表 -->
<div class="data_list zdata_list">
<div class="">
<table>
<!-- 表头 -->
<thead>
<tr>
<th>类型</th>
<th>支付订单号</th>
<th>CP订单号</th>
<th>充值时间</th>
<th>玩家账号</th>
<th>所属推广员</th>
<th>游戏名称</th>
<th>实付金额</th>
<th>充值方式</th>
<th>补单管理员</th>
<th>补单时间</th>
</tr>
</thead>
<!-- 列表 -->
<tbody>
<empty name="show_data">
<td colspan="11" class="text-center">aOh! 暂时还没有内容!</td>
<else/>
<volist name="show_data" id="vo">
<tr>
<td>{$vo.type}</td>
<td>{$vo.pay_order_number}</td>
<td>{$vo.order_number}</td>
<td>{:set_show_time($vo['pay_time'])}</td>
<td>{$vo.user_account}</td>
<td>{$vo.promote_account}</td>
<td>{$vo.game_name}</td>
<td>{$vo.pay_amount}</td>
<td>{$vo.pay_way}</td>
<td>{$vo.admin_name}</td>
<td>{:set_show_time($vo['create_time'])}</td>
</tr>
</volist>
</empty>
</tbody>
</table>
</div>
</div>
<div class="page">
<a class="sch-btn" href="{:U('Export/expUser',array_merge(array('id'=>25,'xlsname'=>'补单记录'),I('get.')))}">导出</a>
{$_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="Spend/lists">
</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>
<volist name = ":I('get.')" id = "vo">
Think.setValue('{$key}', "{$vo}");
</volist>
$(".select_gallery").select2();
</script>
<script type="text/javascript">
//导航高亮
highlight_subnav('{:U('BehaviorLog/singleSupplement')}');
$(function () {
//搜索功能
$("#search").click(function () {
var url = $(this).attr('url');
var query = $('.jssearch').find('input').serialize();
query += "&" + $('.jssearch').find('select').serialize();
query = query.replace(/(&|^)(\w*?\d*?\-*?_*?)*?=?((?=&)|(?=$))/g, '');
query = query.replace(/^&/g, '');
if (url.indexOf('?') > 0) {
url += '&' + query;
} else {
url += '?' + query;
}
window.location.href = url;
});
$(".paixu").click(function () {
var that = $(this);
$data_order = that.attr('data-order');
$order_type = '{$userarpu_order}';
if ($order_type == '' || $order_type == '4') {
$(".sortBy").attr('name', 'data_order');
val = '3,' + $data_order;
$(".sortBy").attr('value', val);
$("#search").click();
} else if ($order_type == '3') {
$(".sortBy").attr('name', 'data_order');
val = '4,' + $data_order;
$(".sortBy").attr('value', val);
$("#search").click();
}
});
//回车自动提交
$('.jssearch').find('input').keyup(function (event) {
if (event.keyCode === 13) {
$("#search").click();
}
});
$('#time-start').datetimepicker({
format: 'yyyy-mm-dd',
language: "zh-CN",
showMeridian:true,
pickDate:true,
minView: 2,
autoclose: true,
pickTime:true,
todayBtn:true,
}).on('change',function(ev){
var val = new Date($.trim($(this).val())).getTime();
var end = new Date($.trim($('#time-end').val())).getTime();
if (val>end) {
layer.msg('开始时间大于结束时间!');$(this).val('');
}
return false;
});
$("#time-end").datetimepicker({
format:"yyyy-mm-dd",
language: "zh-CN",
showMeridian:true,
minView:2,
autoclose:true,
todayBtn:true,
}).on('change',function(ev){
var val = new Date($.trim($(this).val())).getTime();
var start = new Date($.trim($('#time-start').val())).getTime();
if (val<start) {
layer.msg('开始时间大于结束时间!');$(this).val('');
}
return false;
});
$(".budan").click(function () {
url = $(this).attr('href-hhh');
data = $(this).attr('href-data');
$.ajax({
type: 'post',
url: url,
data: {orderNo: data},
success: function (e) {
if (e.status == 1) {
layer.msg(e.msg, {icon: 1});
setTimeout(function () {
location.reload();
}, 1500);
} else {
layer.msg(e.msg, {icon: 2});
}
},
});
});
$(".budan2").click(function () {
url = $(this).attr('href-hhh');
data = $(this).attr('href-data');
$.ajax({
type: 'post',
url: url,
data: {orderNo: data},
success: function (e) {
if (e.status == 1) {
if (e.msg.length > 30) {
window.open(e.msg);
} else {
layer.msg(e.msg, {icon: 1});
setTimeout(function () {
location.reload();
}, 1500);
}
} else {
layer.msg(e.msg, {icon: 2});
}
},
});
});
$(".d_list").find(".drop-down11").hover(function () {
$(this).find(".nav-list").removeClass("hidden");
}, function () {
$(this).find(".nav-list").addClass("hidden");
});
$(".drop-down11 .nav-list li").find("a").each(function () {
var that = $(".drop-down11");
$(this).click(function () {
var text = $(this).text(), val = $(this).attr("value");
that.find(".sort-txt").text(text).attr("data", val);
that.find(".nav-list").addClass("hidden");
that.siblings('.hiddenvalue').val(val);
})
});
$(".d_list").find(".drop-down12").hover(function () {
$(this).find(".nav-list").removeClass("hidden");
}, function () {
$(this).find(".nav-list").addClass("hidden");
});
$(".drop-down12 .nav-list li").find("a").each(function () {
var that = $(".drop-down12");
$(this).click(function () {
var text = $(this).text(), val = $(this).attr("value");
that.find(".sort-txt").text(text).attr("data", val);
that.find(".nav-list").addClass("hidden");
that.siblings('.hiddenvalue').val(val);
})
});
$(".d_list").find(".drop-down13").hover(function () {
$(this).find(".nav-list").removeClass("hidden");
}, function () {
$(this).find(".nav-list").addClass("hidden");
});
$(".drop-down13 .nav-list li").find("a").each(function () {
var that = $(".drop-down13");
$(this).click(function () {
var text = $(this).text(), val = $(this).attr("value");
that.find(".sort-txt").text(text).attr("data", val);
that.find(".nav-list").addClass("hidden");
that.siblings('.hiddenvalue').val(val);
})
});
//下拉内容框
$(".drop-down2").on('click', function (event) {
var navlist = $(this).find('.i_list_li');
if (navlist.hasClass('hidden')) {
navlist.removeClass('hidden');
$('#i_list_id').focus().val('');
} else {
navlist.addClass('hidden');
}
$(document).one("click", function () {
navlist.addClass('hidden');
});
event.stopPropagation();
});
$('#i_list_id').on('keyup', function (event) {
var val = $.trim($(this).val()).toLowerCase();
$('#i_list_idh').val(val);
});
$("#i_list_li").find("a").each(function () {
$(this).click(function () {
var text = $.trim($(this).text()).toLowerCase();
$("#i_list_id").val(text);
$('#i_list_idh').val(text);
})
});
})
/**
* 初始化select2单选默认带搜索功能。
*/
//初始化页面加载
$(document).ready(function () {
});
</script>
</block>

@ -72,7 +72,7 @@
<div class="cf main-place top_nav_list navtab_list">
<h3 class="page_title">{$_REQUEST['count_date']}游戏统计</h3>
<p class="description_text"></p>
<p class="description_text">说明:仅统计通知成功</p>
</div>
<div class="cf top_nav_list">

@ -224,7 +224,7 @@
</volist>
</script>
<script type="text/javascript">
$(".select_gallery").select2();
function reloadIframe(url) {
$("iframe").attr('src', url);
// document.getElementsByTagName('iframe').src=url;
@ -312,7 +312,7 @@
// console.log(str);
$("#game_name").empty();
$("#game_name").append(str);
// $("#server_id").select2();
$("#game_name").select2();
}
})

@ -240,10 +240,11 @@
</volist>
</script>
<script type="text/javascript">
$(".select_gallery").select2();
//导航高亮
highlight_subnav('{:U("FinancePromote/index")}');
$(function(){
$('.page a:eq(1)').click(function () {
var href = $(this).attr('href');
$(this).removeAttr('href');
@ -323,13 +324,28 @@
// console.log(str);
$("#game_name").empty();
$("#game_name").append(str);
// $("#server_id").select2();
$("#game_name").select2();
// $("#game_type").empty();
}
})
}
//设置设备类型
function gameTypeInit() {
// var game_type = "{:I('game_type')}";
var str = "<option value=''>请选择设备类型</option><option value='1'>安卓</option><option value='2'>苹果</option>";
$("#game_type").empty();
$("#game_type").append(str);
$("#game_type").select2();
}
var seleinit = 0;
$("#partner_id").change(function(){
get_game_list();
if(seleinit > 0){
gameTypeInit();
}
seleinit++;
});
$("#partner_id").change();

@ -357,7 +357,7 @@ class PromoteService {
'remark' => $remark == '' ? ($task['creator_type'] == 0 ? '后台补链' : '玩家迁移') : $remark,
'order_time' => $orderTime,
'create_time' => time(),
'pay_amount' => isset($payAmountRows[$item['id']]) ? $payAmountRows[$item['id']]['payAmount'] : 0,
'pay_amount' => isset($payAmountRows[$item['id']]) ? intval($payAmountRows[$item['id']]['payAmount']) : 0,
'op_id' => $creator ? $creator['id'] : 0,
'op_account' => $opAccount,
'op_type' => $task['creator_type'],

@ -890,3 +890,7 @@ ADD COLUMN `create_time` int(11) NOT NULL DEFAULT 0 COMMENT '玩家注册时间'
update tab_user_play a left join tab_user b on a.user_id= b.id set a.create_time = b.register_time where a.user_id=b.id;
ALTER TABLE `tab_spend`
ADD COLUMN `event_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '事件是否通知';
-- 菜单添加补单记录
INSERT INTO `sys_menu`(`title`, `pid`, `sort`, `url`, `hide`, `tip`, `group`, `is_dev`, `status`) VALUES ('补单记录管理', 137, 0, 'BehaviorLog/singleSupplement', 0, '', '游戏订单', 0, 1);

Loading…
Cancel
Save