Merge branch 'feature/reward' of wmtx/platform into release

列表样式
master
廖金灵 5 years ago committed by Gogs
commit 3c4cf05a72

@ -171,16 +171,16 @@
<!-- 表头 --> <!-- 表头 -->
<thead> <thead>
<tr> <tr>
<th>游戏名</th> <th style="width: 100px;">游戏名</th>
<th>游戏合作方</th> <th style="width: 100px;">游戏合作方</th>
<th>结算时间</th> <th >结算时间</th>
<th>奖惩确认时间</th> <th>奖惩确认时间</th>
<th>事件说明</th> <th style="width: 150px;" >事件说明</th>
<th>奖惩性质</th> <th>奖惩性质</th>
<!-- 惩罚方 --> <!-- 惩罚方 -->
<th>奖惩类别</th> <th>奖惩类别</th>
<th>结算公司类型</th> <th>结算公司类型</th>
<th>结算方</th> <th style="width: 100px;">结算方</th>
<th>会长账号</th> <th>会长账号</th>
<th>奖惩金额</th> <th>奖惩金额</th>
<th>结算方式</th> <th>结算方式</th>
@ -188,7 +188,7 @@
<!-- 奖励方 --> <!-- 奖励方 -->
<th>奖惩类别</th> <th>奖惩类别</th>
<th>结算公司类型</th> <th>结算公司类型</th>
<th>结算方</th> <th style="width: 100px;">结算方</th>
<th>会长账号</th> <th>会长账号</th>
<th>奖惩金额</th> <th>奖惩金额</th>
<th>结算方式</th> <th>结算方式</th>
@ -264,9 +264,9 @@
<td rowspan="{$data['maxCount']}">{:get_admin_name($data['creater_id'])}</td> <td rowspan="{$data['maxCount']}">{:get_admin_name($data['creater_id'])}</td>
<td rowspan="{$data['maxCount']}"> <td rowspan="{$data['maxCount']}">
<a href="{:U('StatementMangement/rewardManageDetail',array('id'=>$data['id']))}">查看 </a> <a style="padding: 0px;" href="{:U('StatementMangement/rewardManageDetail',array('id'=>$data['id']))}">查看 </a>
<a href="{:U('StatementMangement/rewardManageSave',array('id'=>$data['id']))}">编辑 </a> <a style="padding: 0px;" 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> <a style="padding: 0px;" class="confirm ajax-get" href="{:U('StatementMangement/rewardManageSave',array('id'=>$data['id'], 'delete'=>1))}">删除 </a>
</td> </td>
</tr> </tr>
<?php else:?> <?php else:?>

@ -211,7 +211,7 @@
<td class="reward-td promote-account"><?=$details[1][$i]['promote_account'] ?? '-'?></td> <td class="reward-td promote-account"><?=$details[1][$i]['promote_account'] ?? '-'?></td>
<td class="reward-td settlement-type"><?=$settlementTypes[$details[1][$i]['settlement_type']] ?? '-'?></td> <td class="reward-td settlement-type"><?=$settlementTypes[$details[1][$i]['settlement_type']] ?? '-'?></td>
<td class='reward-amount reward-td amount'><?=$details[1][$i]['amount'] ?? '-'?></td> <td class='reward-amount reward-td amount'><?=$details[1][$i]['amount'] ?? '-'?></td>
<td class='reward-opt reward-td opt'><?php if (isset($details[1][$i])): php?><a onclick="removeItem(this, 'reward')">删除</a><?php else: php?><a onclick="openForm()">添加</a><?php endif; php?></td> <td class='reward-opt reward-td opt'><?php if (isset($details[1][$i])): php?><a onclick="removeItem(this, 'reward')">删除</a><?php else: php?> <?php endif; php?></td>
<!-- 惩罚信息 --> <!-- 惩罚信息 -->
<td class="punish-data-info" hidden> <td class="punish-data-info" hidden>
@ -222,7 +222,7 @@
<td class="punish-td promote-account"><?=$details[2][$i]['promote_account'] ?? ''?></td> <td class="punish-td promote-account"><?=$details[2][$i]['promote_account'] ?? ''?></td>
<td class="punish-td settlement-type"><?=$settlementTypes[$details[2][$i]['settlement_type']] ?? ''?></td> <td class="punish-td settlement-type"><?=$settlementTypes[$details[2][$i]['settlement_type']] ?? ''?></td>
<td class='punish-amount punish-td amount'><?=$details[2][$i]['amount'] ?? ''?></td> <td class='punish-amount punish-td amount'><?=$details[2][$i]['amount'] ?? ''?></td>
<td class='punish-opt punish-td opt'><?php if (isset($details[2][$i])): php?><a onclick="removeItem(this, 'punish')">删除</a><?php else: php?><a onclick="openForm()">添加</a><?php endif; php?></td> <td class='punish-opt punish-td opt'><?php if (isset($details[2][$i])): php?><a onclick="removeItem(this, 'punish')">删除</a><?php else: php?> <?php endif; php?></td>
</tr> </tr>
<?php endfor;?> <?php endfor;?>
<tr id='total-amount'> <tr id='total-amount'>
@ -231,13 +231,13 @@
<td></td> <td></td>
<td>合计</td> <td>合计</td>
<td id='total-reward-amount'>{$data['rewardAmount']}</td> <td id='total-reward-amount'>{$data['rewardAmount']}</td>
<td><a onclick="openForm()">添加</a></td> <td></td>
<td></td> <td></td>
<td></td> <td></td>
<td></td> <td></td>
<td>合计</td> <td>合计</td>
<td id='total-punish-amount'>{$data['punishAmount']}</td> <td id='total-punish-amount'>{$data['punishAmount']}</td>
<td><a onclick="openForm()">添加</a></td> <td></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
@ -406,7 +406,7 @@
if (index < 6) { if (index < 6) {
$(item).html(''); $(item).html('');
} else { } else {
$(item).html('<a onclick="openForm()">添加</a>') //$(item).html('<a onclick="openForm()">添加</a>')
} }
}); });
} }
@ -448,7 +448,7 @@
<td class="reward-td promote-account"></td> <td class="reward-td promote-account"></td>
<td class="reward-td settlement-type"></td> <td class="reward-td settlement-type"></td>
<td class='reward-amount reward-td amount'></td> <td class='reward-amount reward-td amount'></td>
<td class='reward-opt reward-td opt'><a onclick="openForm()">添加</a></td> <td class='reward-opt reward-td opt'></td>
<!-- 惩罚信息 --> <!-- 惩罚信息 -->
<td class="punish-data-info" hidden> <td class="punish-data-info" hidden>
@ -459,7 +459,7 @@
<td class="punish-td promote-account"></td> <td class="punish-td promote-account"></td>
<td class="punish-td settlement-type"></td> <td class="punish-td settlement-type"></td>
<td class='punish-amount punish-td amount'></td> <td class='punish-amount punish-td amount'></td>
<td class='punish-opt punish-td opt'><a onclick="openForm()">添加</a></td> <td class='punish-opt punish-td opt'></td>
</tr>`; </tr>`;
$('#total-amount').before(newNodeHtml); $('#total-amount').before(newNodeHtml);
emptyNode = $('.table-body tr,.empty-'+type_dec+':first'); emptyNode = $('.table-body tr,.empty-'+type_dec+':first');

Loading…
Cancel
Save