Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize

master
zhengchanglong 5 years ago
commit ec2c929450

@ -64,7 +64,7 @@
<!-- 数据列表 -->
<div class="data_list data_game_list">
<div class="">
<table>
<table border="1">
<!-- 表头 -->
<thead>
<tr>
@ -112,47 +112,64 @@
<td rowspan="{$data.row}">{$data.has_game_evidence}</td>
<td rowspan="{$data.row}">{$data.is_sign_contract}</td>
<notempty name="data.game">
<foreach name="data['game']" item="game" key="gamekey">
<notempty name="data.game">
<foreach name="data['game']" item="game" key="gamekey">
<if condition="$gamekey gt 0">
<tr>
<td rowspan="{$game.row}">{$game['game_type_name']}</td>
<td rowspan="{$game.row}">{$game['original_package_name']}</td>
<td rowspan="{$game.row}">{$game['relation_game_name']}</td>
</tr>
<else />
<td rowspan="{$game.row}">{$game['game_type_name']}</td>
<td rowspan="{$game.row}">{$game['original_package_name']}</td>
<td rowspan="{$game.row}">{$game['relation_game_name']}</td>
<notempty name="game.game_ratio">
<foreach name="game['game_ratio']" item="ratio" key="ratiokey">
<if condition="$ratiokey gt 0">
<tr>
<td>{$ratio['name']}</td>
<td>{$ratio['ratio']}</td>
</tr>
<else />
<td>{$ratio['name']}</td>
<td>{$ratio['ratio']}</td>
</if>
</foreach>
<else />
<td >-</td>
<td>-</td>
</notempty>
<tr>
<td rowspan="{$game.row}">{$game['game_type_name']}</td>
<td rowspan="{$game.row}">{$game['original_package_name']}</td>
<td rowspan="{$game.row}">{$game['relation_game_name']}</td>
<notempty name="game.game_ratio">
<foreach name="game['game_ratio']" item="ratio" key="ratiokey">
<if condition="$ratiokey gt 0">
<tr>
<td>{$ratio['name']}</td>
<td>{$ratio['ratio']}</td>
</tr>
<else />
<td>{$ratio['name']}</td>
<td>{$ratio['ratio']}</td>
</if>
</foreach>
<else />
<td >-</td>
<td>-</td>
</notempty>
</tr>
<else />
<td rowspan="{$game.row}">{$game['game_type_name']}</td>
<td rowspan="{$game.row}">{$game['original_package_name']}</td>
<td rowspan="{$game.row}">{$game['relation_game_name']}</td>
<notempty name="game.game_ratio">
<foreach name="game['game_ratio']" item="ratio" key="ratiokey">
<if condition="$ratiokey gt 0">
<tr>
<td>{$ratio['name']}</td>
<td>{$ratio['ratio']}</td>
</tr>
<else />
<td>{$ratio['name']}</td>
<td>{$ratio['ratio']}</td>
</if>
</foreach>
<else />
<td >-</td>
<td>-</td>
</notempty>
</if>
</foreach>
<else />
<td rowspan="{$data.row}">-</td>
<td rowspan="{$data.row}">-</td>
<td rowspan="{$data.row}">-</td>
<td rowspan="{$data.row}">-</td>
<td rowspan="{$data.row}">-</td>
</notempty>
</foreach>
<else />
<td rowspan="{$data.row}">-</td>
<td rowspan="{$data.row}">-</td>
<td rowspan="{$data.row}">-</td>
<td rowspan="{$data.row}">-</td>
<td rowspan="{$data.row}">-</td>
</notempty>
</tr>
</volist>

@ -252,15 +252,6 @@
</if>
<div class="page">
<if condition="$is_admin eq true ">
<a class="sch-btn" href="{:U('Export/promote_list',array_merge(['xlsname'=>'推广员管理_推广员列表'.((I('type',1)==2)?'_混服申请':'_推广员列表')],I('get.')))}">导出</a>
</if>
{$_page|default=''}
</div>
</body>
<block name="script">

@ -252,15 +252,6 @@
</if>
<div class="page">
<if condition="$is_admin eq true ">
<a class="sch-btn" href="{:U('Export/promote_list',array_merge(['xlsname'=>'推广员管理_推广员列表'.((I('type',1)==2)?'_混服申请':'_推广员列表')],I('get.')))}">导出</a>
</if>
{$_page|default=''}
</div>
</body>
<block name="script">

@ -184,13 +184,6 @@
<div class="page">
<if condition="$is_admin eq true ">
<a class="sch-btn" href="{:U('Export/promote_list',array_merge(['xlsname'=>'推广员管理_推广员列表'.((I('type',1)==2)?'_混服申请':'_推广员列表')],I('get.')))}">导出</a>
</if>
{$_page|default=''}
</div>
</body>
<block name="script">

Loading…
Cancel
Save