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

ip封禁隐藏区域,文字修改
master
张谷诚 5 years ago committed by Gogs
commit 4e6ce5f981

@ -63,7 +63,7 @@ class AmericaIpForbitController extends ThinkController
$xlsName = 'ip限制白名单'; $xlsName = 'ip限制白名单';
$xlsCell = array( $xlsCell = array(
"玩家账号", "区域", '状态', '添加人', '添加时间' "玩家账号", '状态', '添加人', '添加时间'
); );
$map = []; $map = [];
@ -95,7 +95,7 @@ class AmericaIpForbitController extends ThinkController
for($i = 1; $i <= $pages; $i++) { for($i = 1; $i <= $pages; $i++) {
$xlsData = M('forbit_ip','tab_') $xlsData = M('forbit_ip','tab_')
->field('user_account,area,status,admin_account,create_time') ->field('user_account,status,admin_account,create_time')
->where($map) ->where($map)
->limit(($i-1)*$perSize ,$perSize) ->limit(($i-1)*$perSize ,$perSize)
->order('create_time DESC') ->order('create_time DESC')
@ -192,7 +192,7 @@ class AmericaIpForbitController extends ThinkController
$hav_firbit = M('forbit_ip','tab_')->where(['id'=>I('id')])->find(); $hav_firbit = M('forbit_ip','tab_')->where(['id'=>I('id')])->find();
addOperationLog(array( addOperationLog(array(
"op_type"=>2, "op_type"=>2,
"key"=> $hav_firbit['user_account'], "key"=> I('id'),
"menu"=>"游戏-游戏管理-ip限制白名单-删除", "menu"=>"游戏-游戏管理-ip限制白名单-删除",
"url"=>U("AmericaIpForbit/index") "url"=>U("AmericaIpForbit/index")
)); ));
@ -230,7 +230,6 @@ class AmericaIpForbitController extends ThinkController
$insert['user_id'] = $hav_user['id']; $insert['user_id'] = $hav_user['id'];
$insert['user_account'] = I('account'); $insert['user_account'] = I('account');
$insert['area'] = I('area');
$insert['status'] = I('status'); $insert['status'] = I('status');
$insert['admin_id'] = $auth['uid']; $insert['admin_id'] = $auth['uid'];
$insert['admin_account'] = $auth['username']; $insert['admin_account'] = $auth['username'];

@ -35,24 +35,24 @@
<td class="r table_radio"> <td class="r table_radio">
<span class="form_radio table_btn"> <span class="form_radio table_btn">
<label > <label >
<input type="radio" value="0" name="status" checked="checked"> 限制 <input type="radio" value="0" name="status" checked="checked"> 通知不到账
</label > </label >
<label > <label >
<input type="radio" value="1" name="status" > 不限制 <input type="radio" value="1" name="status" > 通知到账
</label> </label>
</span> </span>
</td> </td>
</tr> </tr>
<tr> <!-- <tr>-->
<td class="l">区域</td> <!-- <td class="l">区域</td>-->
<td class="r"> <!-- <td class="r">-->
<select name="area" id="area"> <!-- <select name="area" id="area">-->
<option value="">请选择区域</option> <!-- <option value="">请选择区域</option>-->
<option value="美国">美国</option> <!-- <option value="美国">美国</option>-->
</select> <!-- </select>-->
</td> <!-- </td>-->
<!-- -->
</tr> <!-- </tr>-->
</tbody> </tbody>
</table> </table>

@ -193,8 +193,8 @@
<div class="cf main-place top_nav_list navtab_list"> <div class="cf main-place top_nav_list navtab_list">
<h3 class="page_title">ip限制白名单</h3> <h3 class="page_title">苹果内购通知配置</h3>
<p class="description_text">说明:苹果内购白名单,名单中的用户支付成功可通知游戏</p> <p class="description_text">说明:苹果内购白名单,名单中的用户支付成功可通知游戏 重点:默认全部账户使用苹果内购通知不到账</p>
<!-- <div class="demo">--> <!-- <div class="demo">-->
<!-- <div class="wrap" ><span style="float: right;margin-top: 7px;margin-right: 120px">开</span>--> <!-- <div class="wrap" ><span style="float: right;margin-top: 7px;margin-right: 120px">开</span>-->
<!-- <input type="checkbox" id="checkbox_c2" class="chk_3" <if condition="$apple_interior_buy eq 1">checked</if> /><label for="checkbox_c2" style="float: right;margin-right: 5px" onclick="setAppleInteriorBuyStatus({$set_apple_interior_buy})"></label>--> <!-- <input type="checkbox" id="checkbox_c2" class="chk_3" <if condition="$apple_interior_buy eq 1">checked</if> /><label for="checkbox_c2" style="float: right;margin-right: 5px" onclick="setAppleInteriorBuyStatus({$set_apple_interior_buy})"></label>-->
@ -226,11 +226,11 @@
<div class="input-list"> <div class="input-list">
<a class="sch-btn" href="javascript:;" id="forbit" <a class="sch-btn" href="javascript:;" id="forbit"
style="width: 150px;background: #fff;color: #000;border:1px solid #000;">批量限制</a> style="width: 150px;background: #fff;color: #000;border:1px solid #000;">批量通知不到账</a>
</div> </div>
<div class="input-list"> <div class="input-list">
<a class="sch-btn" href="javascript:;" id="noforbit" <a class="sch-btn" href="javascript:;" id="noforbit"
style="width: 150px;background: #fff;color: #000;border:1px solid #000;">批量不限制</a> style="width: 150px;background: #fff;color: #000;border:1px solid #000;">批量通知到账</a>
</div> </div>
<div class="input-list"> <div class="input-list">
<a class="sch-btn" href="javascript:;" id="delete" <a class="sch-btn" href="javascript:;" id="delete"
@ -261,7 +261,7 @@
<th >玩家账号</th> <th >玩家账号</th>
<th >区域</th> <!-- <th >区域</th>-->
<th >状态</th> <th >状态</th>
@ -289,16 +289,16 @@
<tr> <tr>
<td ><input class="ids" type="checkbox" value="{$data.id}" name="ids[]"></td> <td ><input class="ids" type="checkbox" value="{$data.id}" name="ids[]"></td>
<td >{$data.user_account}</td> <td >{$data.user_account}</td>
<td>{$data.area}</td> <!-- <td>{$data.area}</td>-->
<td ><if condition="$data.status eq 1">不限制<else/>限制</if></td> <td ><if condition="$data.status eq 1">通知到账<else/>通知不到账</if></td>
<td >{$data.admin_account}</td> <td >{$data.admin_account}</td>
<td >{$data.create_time}</td> <td >{$data.create_time}</td>
<td > <td >
<a href="javascript:;" onclick="del({$data.id})">删除 </a> <a href="javascript:;" onclick="del({$data.id})">删除 </a>
<if condition="$data.status eq 1"> <if condition="$data.status eq 1">
<a class="ajax-get" href="javascript:;" onclick="limit({$data.id},0)">限制 </a> <a class="ajax-get" href="javascript:;" onclick="limit({$data.id},0)">通知不到账 </a>
<else /> <else />
<a href="javascript:;" id="lock" onclick="limit({$data.id},1)">不限制</a> <a href="javascript:;" id="lock" onclick="limit({$data.id},1)">通知到账</a>
</if> </if>
</td> </td>
</tr> </tr>
@ -361,9 +361,9 @@
dataType: 'json', dataType: 'json',
success: function (data) { success: function (data) {
if (data.code == 0) { if (data.code == 0) {
layer.msg("<em style='color:white'>" + '批量限制失败' + "</em>"); layer.msg("<em style='color:white'>" + '批量操作失败' + "</em>");
} else { } else {
layer.msg("<em style='color:white'>" + '批量限制成功' + "</em>") layer.msg("<em style='color:white'>" + '批量操作成功' + "</em>")
setTimeout(function(){ setTimeout(function(){
window.location.reload(); window.location.reload();
},1500); },1500);
@ -416,9 +416,9 @@
dataType: 'json', dataType: 'json',
success: function (data) { success: function (data) {
if (data.code == 0) { if (data.code == 0) {
layer.msg("<em style='color:white'>" + '批量不限制失败' + "</em>"); layer.msg("<em style='color:white'>" + '批量操作失败' + "</em>");
} else { } else {
layer.msg("<em style='color:white'>" + '批量不限制成功' + "</em>") layer.msg("<em style='color:white'>" + '批量操作成功' + "</em>")
setTimeout(function(){ setTimeout(function(){
window.location.reload(); window.location.reload();
},1500); },1500);

Loading…
Cancel
Save