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

ip限制白名单苹果内购限制总开关去除

Application/Admin/Controller/AmericaIpForbitController.class.php

@@ -41,7 +41,7 @@ class AmericaIpForbitController extends ThinkController
 
         $appleInteriorBuyStatus = M('tool','tab_')->where(['name'=>'apple_interior_buy'])->getField('status');
 
-        $setAppleInteriorBuyStatus = $appleInteriorBuyStatus?0:1;
+        $setAppleInteriorBuyStatus = $appleInteriorBuyStatus?1:0;
 
 
         $page = set_pagination($count, $row);

Application/Admin/View/AmericaIpForbit/index.html

@@ -195,13 +195,13 @@
 
     <h3 class="page_title">ip限制白名单</h3>
     <p class="description_text">说明：苹果内购白名单，名单中的用户支付成功可通知游戏</p>
-    <div class="demo">
-      <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>
-        <span style="float: right;margin-top: 7px;margin-right: 5px">关</span>
-        <span style="float: right;margin-top: 7px;margin-right: 30px">全游戏苹果内购支付成功通知默认限制</span>
-      </div>
-    </div>
+<!--    <div class="demo">-->
+<!--      <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>-->
+<!--        <span style="float: right;margin-top: 7px;margin-right: 5px">关</span>-->
+<!--        <span style="float: right;margin-top: 7px;margin-right: 30px">全游戏苹果内购支付成功通知默认限制</span>-->
+<!--      </div>-->
+<!--    </div>-->
 <!--    <div class="fr">-->
 <!--      <a class="tabchose" href="">游戏充值统计</a>-->
 <!--      <a class="" href="{:U('Finance/payTypeStatistics')}">充值方式统计</a>-->