解决冲突

master
ELF 5 years ago
commit 90d5d53994

@ -134,37 +134,37 @@
<div class="trunk-search clearfix">
<!-- <form action="{:U('PromoteCoin/coinRecord',array('game_id'=>I('get.game_id')))}" method="post" enctype="multipart/form-data"-->
<!-- class="marg_top20">-->
<div class="form-group normal_space">
<label>操作类型:</label>
<select id="type" name="type" class="reselect select_gallery" style="min-width:200px;width: 175px;">
<option value="">全部</option>
<volist name="types" id="vo" key="k">
<option value="{$k}" title="{$vo}">{$vo}</option>
</volist>
</select>
</div>
<div class="form-group normal_space">
<label>操作方式:</label>
<select id="sub_type" name="sub_type" class="reselect select_gallery" style="min-width:200px;width: 175px;">
<option value="">全部</option>
<volist name="subTypes" id="vo" key="k">
<option value="{$k}" title="{$vo}">{$vo}</option>
</volist>
</select>
</div>
<div class="form-group normal_space">
<label>对手账号类型:</label>
<select id="handle_type" name="handle_type" class="reselect select_gallery" style="min-width:200px;width: 175px;">
<option value="">全部</option>
<volist name="targetTypeLevels" id="vo" key="k">
<option value="{$k}" title="{$vo}">{$vo}</option>
</volist>
</select>
</div>
<div class="form-group normal_space">
<label>充值时间:</label>
<div class="select-time">
<input type="text" readonly id="start_time" class="txt" name="start_time" placeholder="" value="{:I('start_time')}" >
<div class="form-group normal_space fr">
<input type="submit" class="submit" id='submit' url="{:U('PromoteCoin/coinDetails',array('model'=>$model['name'],'game_id'=>I('get.game_id')),false)}"
value="查询">
</div>
<div class="form-group normal_space fr">
<label>充值时间:</label>
<div class="select-time">
<input type="text" id="start_time" class="txt" name="start_time" placeholder="" value="{:I('start_time')}" >
</div>
<label class="form-title select-title zhi_color">&nbsp;&nbsp;</label>
<div class="select-time">
<input type="text" id="end_time" class="txt" name="end_time" placeholder="" value="{:I('end_time')}">
</div>
</div>
<div class="form-group normal_space fr">
<label>对手账号类型:</label>
<select id="target_type" name="target_type" class="reselect select_gallery" style="min-width:200px;width: 175px;">
<option value="">全部</option>
<?php foreach($targetTypeLevels as $key => $name):?>
<option value="<?=$key?>" title="<?=$name?>"><?=$name?></option>
<?php endforeach;?>
</select>
</div>
<div class="form-group normal_space fr">
<label>操作方式:</label>
<select id="sub_type" name="sub_type" class="reselect select_gallery" style="min-width:200px;width: 175px;">
<option value="">全部</option>
<volist name="subTypes" id="vo" key="k">
<option value="{$k}" title="{$vo}">{$vo}</option>
</volist>
</select>
</div>
<label class="form-title select-title zhi_color">&nbsp;&nbsp;</label>
<div class="select-time">

Loading…
Cancel
Save