解决冲突
commit
ca84e029be
@ -0,0 +1,223 @@
|
||||
<extend name="Public/promote_base"/>
|
||||
<block name="css">
|
||||
<link href="__CSS__/20180207/data.css" rel="stylesheet">
|
||||
<link href="__CSS__/20180207/manager.css" rel="stylesheet">
|
||||
<link href="__CSS__/20180207/finance.css" rel="stylesheet">
|
||||
<link href="__CSS__/game_detailed.css" rel="stylesheet">
|
||||
<link href="__STATIC__/icons_alibaba/iconfont.css?v=1.2" rel="stylesheet">
|
||||
</block>
|
||||
|
||||
<block name="body">
|
||||
<style>
|
||||
@media screen and (max-width: 1500px) {
|
||||
.normal_form {
|
||||
padding-top: 45px;
|
||||
}
|
||||
|
||||
.trunk-search .normal_txt {
|
||||
width: 100px
|
||||
}
|
||||
|
||||
.select2-container--default .select2-selection--single {
|
||||
width: 125px;
|
||||
}
|
||||
|
||||
.trunk-search .select-time .txt {
|
||||
width: 100px;
|
||||
}
|
||||
|
||||
.form-group .submit {
|
||||
width: 55px;
|
||||
}
|
||||
}
|
||||
|
||||
.selected-color {
|
||||
color: #2bd8ed;
|
||||
}
|
||||
|
||||
.pointer-hand {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.icon-spend {
|
||||
position: relative;
|
||||
font-size: 1.2rem;
|
||||
top: 3px;
|
||||
float: right;
|
||||
right: 10px;
|
||||
}
|
||||
|
||||
.th-hide {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.form-group {
|
||||
float: left;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.form-group label {
|
||||
line-height: 34px;
|
||||
height: 34px;
|
||||
}
|
||||
.form-group .txt {
|
||||
width: 180px;
|
||||
height: 34px;
|
||||
}
|
||||
.trunk-search {
|
||||
padding-bottom: 10px;
|
||||
}
|
||||
.btn-role-border {
|
||||
border-left: 0;
|
||||
}
|
||||
.normal_table tr td a {
|
||||
cursor: pointer;
|
||||
}
|
||||
</style>
|
||||
<div class="page-search normal_list query-recharge-search">
|
||||
<div style="position: absolute;margin-top: -25px;color: #6a7082;">
|
||||
<span class="back-btn" style="cursor: pointer;"><i class="iconfont iconreply"></i> 返回</span>
|
||||
</div>
|
||||
<div class="trunk-title">
|
||||
<div class="location">
|
||||
<div class="location-container">当前位置：
|
||||
<volist name="modelList" id="vo" key="k">
|
||||
<?php if ($k == count($modelList)) {
|
||||
echo "<span>$vo</span>";
|
||||
} else {
|
||||
echo "<span>$vo></span>";
|
||||
}?>
|
||||
</volist>
|
||||
</div>
|
||||
</div>
|
||||
<img src="__IMG__/20180207/icon_chongzhi.png">
|
||||
<span class="title_main">{$meta_title}</span>
|
||||
</div>
|
||||
<div class="trunk-content article">
|
||||
<div class="trunk-search clearfix jssearch">
|
||||
<!-- <form action="{:U('Finance/settlementDtl')}" method="get" enctype="multipart/form-data" class="normal_form"> -->
|
||||
<div class="form-group normal_space" style="margin-left: 0;">
|
||||
<label>游戏名称：</label>
|
||||
<select id="game_id" name="game_id" class="reselect select_gallery" style="min-width:200px;width: 175px;">
|
||||
<option value="">全部</option>
|
||||
<volist name=":getPromoteSearchGame()" id="vo">
|
||||
<option value="{$vo.id}" title="{$vo.game_name}"
|
||||
<if condition="I('game_id') eq $vo['id']">selected</if>
|
||||
>{$vo.game_name} </option>
|
||||
</volist>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="form-group normal_space">
|
||||
<input type="text" name="user_account" class="txt normal_txt" placeholder="玩家账号"
|
||||
value="{:I('user_account','')}">
|
||||
</div>
|
||||
|
||||
<div class="form-group normal_space">
|
||||
<input type="text" name="pay_order_number" class="txt normal_txt" placeholder="充值订单号"
|
||||
value="{:I('pay_order_number','')}">
|
||||
</div>
|
||||
|
||||
<div class="form-group normal_space">
|
||||
<input type="hidden" name="id" value="{:I('get.id')}">
|
||||
<input type="submit" class="submit" id='submit' url="{:U('Finance/withdrawDtl','model='.$model['name'],false)}"
|
||||
value="查询">
|
||||
</div>
|
||||
<!-- </form> -->
|
||||
</div>
|
||||
<div class="page-list apply-app_apply-list query-recharge-list">
|
||||
<div class="trunk-content article" style="margin-left: 0;margin-right: 0;">
|
||||
<div class="tabcon trunk-list">
|
||||
<table class="table normal_table">
|
||||
<tr class="odd">
|
||||
<th>充值订单号</th>
|
||||
<th>游戏</th>
|
||||
<th>平台</th>
|
||||
<th>玩家账号</th>
|
||||
<th>订单总额</th>
|
||||
<th>现金分成基数</th>
|
||||
<th>平台币分成基数</th>
|
||||
<th>平台币分成比例(直充|内充)</th>
|
||||
<th>现金支付通道</th>
|
||||
<th>收益</th>
|
||||
<th>订单状态</th>
|
||||
<th>充值时间</th>
|
||||
</tr>
|
||||
<empty name="listData">
|
||||
<tr class="num2">
|
||||
<td colspan="99" style="text-align: center;height: 45vh;">
|
||||
<img src="__IMG__/20180207/icon_wushujv2.png"/>
|
||||
<p style="line-height: 40px;color: #A5A5A5;">暂无数据</p>
|
||||
</td>
|
||||
</tr>
|
||||
<else/>
|
||||
<volist name="listData" id="vo">
|
||||
<tr class="num2">
|
||||
<td>{$vo.pay_order_number}</td>
|
||||
<td>{$vo.game_name}</td>
|
||||
<td>{:getSDKTypeName($vo['sdk_version'])}</td>
|
||||
<td>{$vo.user_account}</td>
|
||||
<td>{$vo.pay_amount}</td>
|
||||
<if condition="$vo.pay_way eq -1">
|
||||
<td>0</td>
|
||||
<td>{$vo.pay_amount}</td>
|
||||
<else/>
|
||||
<td>{$vo.pay_amount}</td>
|
||||
<td>0</td>
|
||||
</if>
|
||||
<td>{$vo.selle_ratio}%|{$vo.selle_ratio}%</td>
|
||||
<td>{$vo.pay_way_name}</td>
|
||||
<td>{$vo.income}</td>
|
||||
<td>{$status}</td>
|
||||
<td>{$vo.pay_time}</td>
|
||||
</tr>
|
||||
</volist>
|
||||
</empty>
|
||||
</table>
|
||||
</div>
|
||||
<div class="pagenation clearfix">
|
||||
{$_page}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</block>
|
||||
<block name="script">
|
||||
<link href="__STATIC__/datetimepicker/css/datetimepicker.css" rel="stylesheet" type="text/css">
|
||||
<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 type="text/javascript" src="__JS__/20170831/select2.min.js"></script>
|
||||
<script src="__STATIC__/layer/layer.js"></script>
|
||||
<script type="text/javascript" src="__JS__/common.js"></script>
|
||||
|
||||
<script type="text/javascript">
|
||||
$().ready(function () {
|
||||
$('.back-btn').on('click', function () {
|
||||
location.href = "{:U('withdrawRecord')}";
|
||||
});
|
||||
|
||||
$('#submit').click(function () {
|
||||
var url = $(this).attr('url');
|
||||
console.log(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;
|
||||
|
||||
});
|
||||
|
||||
$(".select_gallery").select2();
|
||||
});
|
||||
</script>
|
||||
|
||||
</block>
|
||||
@ -0,0 +1,267 @@
|
||||
<extend name="Public/promote_base"/>
|
||||
<block name="css">
|
||||
<link href="__CSS__/20180207/data.css" rel="stylesheet">
|
||||
<link href="__CSS__/20180207/manager.css" rel="stylesheet">
|
||||
<link href="__CSS__/20180207/finance.css" rel="stylesheet">
|
||||
<link href="__CSS__/game_detailed.css" rel="stylesheet">
|
||||
<link href="__STATIC__/icons_alibaba/iconfont.css?v=1.2" rel="stylesheet">
|
||||
</block>
|
||||
|
||||
<block name="body">
|
||||
<style>
|
||||
@media screen and (max-width: 1500px) {
|
||||
.normal_form {
|
||||
padding-top: 45px;
|
||||
}
|
||||
|
||||
.trunk-search .normal_txt {
|
||||
width: 100px
|
||||
}
|
||||
|
||||
.select2-container--default .select2-selection--single {
|
||||
width: 125px;
|
||||
}
|
||||
|
||||
.trunk-search .select-time .txt {
|
||||
width: 100px;
|
||||
}
|
||||
|
||||
.form-group .submit {
|
||||
width: 55px;
|
||||
}
|
||||
}
|
||||
|
||||
.selected-color {
|
||||
color: #2bd8ed;
|
||||
}
|
||||
|
||||
.pointer-hand {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.icon-spend {
|
||||
position: relative;
|
||||
font-size: 1.2rem;
|
||||
top: 3px;
|
||||
float: right;
|
||||
right: 10px;
|
||||
}
|
||||
|
||||
.th-hide {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.form-group {
|
||||
float: left;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.form-group label {
|
||||
line-height: 34px;
|
||||
height: 34px;
|
||||
}
|
||||
.form-group .txt {
|
||||
width: 180px;
|
||||
height: 34px;
|
||||
}
|
||||
.trunk-search {
|
||||
padding-bottom: 10px;
|
||||
}
|
||||
.btn-role-border {
|
||||
border-left: 0;
|
||||
}
|
||||
.normal_table tr td a {
|
||||
cursor: pointer;
|
||||
}
|
||||
</style>
|
||||
<div class="page-search normal_list query-recharge-search">
|
||||
<div class="trunk-title">
|
||||
<div class="location">
|
||||
<div class="location-container">当前位置：
|
||||
<volist name="modelList" id="vo" key="k">
|
||||
<?php if ($k == count($modelList)) {
|
||||
echo "<span>$vo</span>";
|
||||
} else {
|
||||
echo "<span>$vo></span>";
|
||||
}?>
|
||||
</volist>
|
||||
</div>
|
||||
</div>
|
||||
<img src="__IMG__/20180207/icon_chongzhi.png">
|
||||
<span class="title_main">{$meta_title}</span>
|
||||
</div>
|
||||
<div class="trunk-content article">
|
||||
<div class="trunk-search clearfix jssearch">
|
||||
<!-- <form action="{:U('Finance/settlementDtl')}" method="get" enctype="multipart/form-data" class="normal_form"> -->
|
||||
<div class="form-group normal_space" style="margin-left: 0;">
|
||||
<input type="text" name="widthdraw_number" class="txt normal_txt" placeholder="提现订单号"
|
||||
value="{:I('widthdraw_number','')}">
|
||||
</div>
|
||||
|
||||
<div class="form-group normal_space">
|
||||
<label class="form-title select-title" style="position: relative;">充值时间：</label>
|
||||
<div class="select-time">
|
||||
<input type="text" readonly id="sdate" class="txt" name="begtime" placeholder="开始时间" value="{$initBegTime}">
|
||||
</div>
|
||||
<label class="form-title select-title zhi_color"> — </label>
|
||||
<div class="select-time">
|
||||
<input type="text" readonly id="edate" class="txt" name="endtime" placeholder="结束时间" value="{$initEndTime}">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group normal_space">
|
||||
<input type="hidden" name="status" id="status" value="{$status}">
|
||||
<input type="submit" class="submit" id='submit' url="{:U('Finance/withdrawRecord','model='.$model['name'],false)}"
|
||||
value="查询">
|
||||
</div>
|
||||
<!-- </form> -->
|
||||
</div>
|
||||
<div class="tab marg_top20" style="margin-bottom: 20px;">
|
||||
<div style="display: flex;">
|
||||
<div class="btn btn-role <if condition='$status heq ""'>highlight</if>" status="">
|
||||
<p>全部</p>
|
||||
</div>
|
||||
|
||||
<div class="btn btn-role btn-role-border <if condition='$status heq 0'>highlight</if>" status="0">
|
||||
<p>待审核</p>
|
||||
</div>
|
||||
|
||||
<div class="btn btn-role btn-role-border <if condition='$status eq -1'>highlight</if>" status="-1">
|
||||
<p>审核未通过</p>
|
||||
</div>
|
||||
|
||||
<div class="btn btn-role btn-role-border <if condition='$status eq 1'>highlight</if>" status="1">
|
||||
<p>汇款中</p>
|
||||
</div>
|
||||
|
||||
<div class="btn btn-role btn-role-border <if condition='$status eq 2'>highlight</if>" status="2">
|
||||
<p>已汇款</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="page-list apply-app_apply-list query-recharge-list">
|
||||
<div class="trunk-content article" style="margin-left: 0;margin-right: 0;">
|
||||
<div class="tabcon trunk-list">
|
||||
<table class="table normal_table">
|
||||
<tr class="odd">
|
||||
<th>提现订单</th>
|
||||
<th>提现日期</th>
|
||||
<th>结算截止日期</th>
|
||||
<th>收益金额</th>
|
||||
<th>实际提现金额</th>
|
||||
<th>提现状态</th>
|
||||
<th>说明</th>
|
||||
<th>操作</th>
|
||||
</tr>
|
||||
<empty name="listData">
|
||||
<tr class="num2">
|
||||
<td colspan="99" style="text-align: center;height: 45vh;">
|
||||
<img src="__IMG__/20180207/icon_wushujv2.png"/>
|
||||
<p style="line-height: 40px;color: #A5A5A5;">暂无数据</p>
|
||||
</td>
|
||||
</tr>
|
||||
<else/>
|
||||
<volist name="listData" id="vo">
|
||||
<tr class="num2">
|
||||
<td>{$vo.widthdraw_number}</td>
|
||||
<td>{$vo.create_time}</td>
|
||||
<td>{$vo.settlement_end_time}</td>
|
||||
<td>{$vo.sum_money}</td>
|
||||
<td>{$vo.sum_money}</td>
|
||||
<td>{$vo.status}</td>
|
||||
<td>{$vo.respond}</td>
|
||||
<td>
|
||||
<a href="{:U('withdrawDtl', array('id'=>$vo['id']))}">提现明细</a>
|
||||
<a>汇款证明</a>
|
||||
<a>结算单</a>
|
||||
</td>
|
||||
</tr>
|
||||
</volist>
|
||||
</empty>
|
||||
</table>
|
||||
</div>
|
||||
<div class="pagenation clearfix">
|
||||
{$_page}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</block>
|
||||
<block name="script">
|
||||
<link href="__STATIC__/datetimepicker/css/datetimepicker.css" rel="stylesheet" type="text/css">
|
||||
<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 type="text/javascript" src="__JS__/20170831/select2.min.js"></script>
|
||||
<script src="__STATIC__/layer/layer.js"></script>
|
||||
<script type="text/javascript" src="__JS__/common.js"></script>
|
||||
|
||||
<script type="text/javascript">
|
||||
$().ready(function () {
|
||||
var date = "{$setdate}";
|
||||
$('#sdate').datetimepicker({
|
||||
format: 'yyyy-mm-dd',
|
||||
language: "zh-CN",
|
||||
minView: 2,
|
||||
autoclose: true,
|
||||
scrollMonth: false,
|
||||
scrollTime: false,
|
||||
scrollInput: false,
|
||||
endDate: date
|
||||
});
|
||||
|
||||
$('#edate').datetimepicker({
|
||||
format: 'yyyy-mm-dd',
|
||||
language: "zh-CN",
|
||||
minView: 2,
|
||||
autoclose: true,
|
||||
pickerPosition: 'bottom-left',
|
||||
scrollMonth: false,
|
||||
scrollTime: false,
|
||||
scrollInput: false,
|
||||
endDate: date
|
||||
});
|
||||
|
||||
$('.btn-role').on('click', function () {
|
||||
var thisElement = $(this);
|
||||
|
||||
if (!thisElement.hasClass('highlight')) {
|
||||
var status = thisElement.attr('status');
|
||||
|
||||
$('#status').val(status);
|
||||
$('.btn-role').removeClass('highlight');
|
||||
thisElement.addClass('highlight');
|
||||
$('#submit').trigger('click');
|
||||
}
|
||||
});
|
||||
|
||||
$('#submit').click(function () {
|
||||
var sdate = $('#sdate').val();
|
||||
var edate = $('#edate').val();
|
||||
if (Date.parse(sdate) > Date.parse(edate)) {
|
||||
layer.msg('开始时间必须小于等于结束时间');
|
||||
return false;
|
||||
}
|
||||
var url = $(this).attr('url');
|
||||
console.log(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;
|
||||
|
||||
});
|
||||
|
||||
$(".select_gallery").select2();
|
||||
});
|
||||
</script>
|
||||
|
||||
</block>
|
||||
@ -1,5 +1,11 @@
|
||||
{
|
||||
"require": {
|
||||
"rodneyrehm/plist": "^2.0"
|
||||
},
|
||||
"repositories": {
|
||||
"packagist": {
|
||||
"type": "composer",
|
||||
"url": "https://packagist.phpcomposer.com"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue