diff --git a/Application/Common/Common/function.php b/Application/Common/Common/function.php
index 6234fa43..34dbacc4 100644
--- a/Application/Common/Common/function.php
+++ b/Application/Common/Common/function.php
@@ -1189,7 +1189,7 @@ function age_verify($cardno, $name, $user_id = '')
     $arr['create_time'] = time();
     $arr['info'] = $info;
 
-    if ($date['status'] == '01') {
+    if ($date['status'] == '01') {  // 验证成功
         $arr['status'] = 1;
         M('idcard_log', 'tab_')->data($arr)->add();
         $age = floor((time() - strtotime($date['birthday'])) / (60 * 60 * 24 * 365));
@@ -1198,11 +1198,11 @@ function age_verify($cardno, $name, $user_id = '')
         } else {
             return 2;
         }
-    } elseif (isset($date['status']) && $date['status'] != '01') {
+    } elseif (isset($date['status']) && $date['status'] != '01') {  // 验证错误 身份证和姓名不匹配
         $arr['status'] = 0;
         M('idcard_log', 'tab_')->data($arr)->add();
         return 0;
-    } elseif(!isset($date['status']) && $date == 0) {
+    } elseif(!isset($date['status']) && $date == 0) {  
         $arr['status'] = 0;
         M('idcard_log', 'tab_')->data($arr)->add();
         return 0;
diff --git a/Application/Sdk/Common/function.php b/Application/Sdk/Common/function.php
index 3b1ed178..08c52f5f 100644
--- a/Application/Sdk/Common/function.php
+++ b/Application/Sdk/Common/function.php
@@ -308,7 +308,6 @@ function jsonOutput($status=0, $msg='', $data=[]) {
 }
 
 /**
-<<<<<<< HEAD
  * 使用淘宝接口 判断ip,,,确定是否属于该地区
  * @param $ip
  * @return bool
diff --git a/Application/Sdk/Controller/ExchangeController.class.php b/Application/Sdk/Controller/ExchangeController.class.php
index ee9ac681..55454901 100644
--- a/Application/Sdk/Controller/ExchangeController.class.php
+++ b/Application/Sdk/Controller/ExchangeController.class.php
@@ -93,6 +93,7 @@ class ExchangeController extends BaseController{
         
         $prefix = $request['code'] == 1 ? "SP_" : "PF_";
         $out_trade_no = $prefix.date('Ymd').date('His').sp_random_string(4);
+        if (C('PAY_TEST')) $out_trade_no = $out_trade_no."_test";
         $request['pay_order_number'] = $out_trade_no;
         
         $user_entity = get_user_entity($request['user_id']);
@@ -195,10 +196,16 @@ class ExchangeController extends BaseController{
 
             // 是否是beta版苹果内购
             $isBeta = false;
+            $isUSBeta = false;
             if (isset($request['app_type']) && $request['app_type'] == 2) {
                 $isBeta = true;
+                // 美国IP 贝塔版
+                $ip = get_client_ip();
+                $isUSBeta = ip_is_country($ip, ['xx']);
             }
-            if (get_game_appstatus2($request['game_id']) || $istest || !$isBeta/* &&$request['is_create_ordernumer']!=1 */){ /* 第三方支付 */
+            $isUSBeta = ip_is_country($ip);
+            // 美国IP的贝塔包 不管游戏设置怎么设置 都走苹果支付
+            if (!$isUSBeta && (get_game_appstatus2($request['game_id']) || $istest || !$isBeta/* &&$request['is_create_ordernumer']!=1 */)){ /* 第三方支付 */
 				$prefix = $request['code'] == 1 ? "SP_" : "PF_";  // SP
                 $out_trade_no = $prefix.date('Ymd').date('His').sp_random_string(4);
                 $request['pay_order_number'] = $out_trade_no;
@@ -209,7 +216,7 @@ class ExchangeController extends BaseController{
 				$url = C('PAY_DOMAIN') . '/sdk.php?s=/Spend/'.$payPage.'&user_id='.$request['user_id'].'&game_id='.$request['game_id'].'&type=1'.'&user_token='.$userToken.'&action=pay'.'&extend='.urlencode($request['extend']);
 				echo base64_encode(json_encode(array('status'=>200,'out_trade_no'=>$out_trade_no,'img'=>$url)));exit;
 				// 只走第三方支付  不走苹果支付
-            } elseif(!get_game_appstatus2($request['game_id'] && $isBeta)/* &&$request['is_create_ordernumer']==1 */){ /* 废弃 苹果支付 */
+            } elseif ($isUSBeta || (!get_game_appstatus2($request['game_id'] && $isBeta))/* &&$request['is_create_ordernumer']==1 */){ /* 废弃 苹果支付 */
 				
 				#获取订单信息
 				$prefix = $request['code'] == 1 ? "SP_" : "PF_";
diff --git a/Application/Sdk/Controller/GameController.class.php b/Application/Sdk/Controller/GameController.class.php
index 8b0bfd0c..3acf4c70 100644
--- a/Application/Sdk/Controller/GameController.class.php
+++ b/Application/Sdk/Controller/GameController.class.php
@@ -154,6 +154,10 @@ class GameController extends BaseController{
 		// 	$data['sdk_version'] = 2;
 		// }
         
+		// 美国IP 贝塔版
+        $ip = get_client_ip();
+        $isUSIP = ip_is_country($ip);
+//       var_dump($isUSIP);  
         if(empty($data['user_id'])) {
         	re_msg(1004, 'fail', '用户不存在');
         }
@@ -166,7 +170,9 @@ class GameController extends BaseController{
         
         $sdkMenus = M('tool','tab_')->where(['name' => 'sdk_menu'])->find();
         $menus = json_decode($sdkMenus['config'],true);
+        $rmenus = array();
         foreach($menus as $k => $v) {
+            
             if(!empty($v['menu_version']) && $data['sdk_version'] != 0 && $v['menu_version'] != $data['sdk_version']){
                 unset($menus[$k]);
                 continue;
@@ -192,12 +198,20 @@ class GameController extends BaseController{
                     continue;
                 }
             }
+//             var_dump($isUSIP);
+            if (/* isset($data['app_type']) && $data['app_type'] == 2 &&  */$isUSIP) {
+                
+                if($v['name'] == 'gift' || $v['name'] == 'suppersign') {
+                    unset($menus[$k]);
+                    continue;
+                }
+            }
             
             //测试账号苹果审核
             $menus[$k]['icon'] = (substr($v['icon'], 0, 7) == "http://" || substr($v['icon'], 0, 8) == "https://" ) ? $v['icon'] : 
                                 C('ADMIN_DOMAIN') . $v['icon'];
 //             die;
-            if($v['type'] != 3){
+            if($v['type'] != 3){   // 
                 if (substr($menus[$k]['url'], 0, 7) == "http://" || substr($menus[$k]['url'], 0, 8) == "https://") {
                 	$menus[$k]['url'] = $menus[$k]['url'] . '/user_token/' . $user['user_token']."/game_id/".$data['game_id'].'/sdk_version/'.$data['sdk_version'].'/api_ver/2';
                 } else {
@@ -215,6 +229,7 @@ class GameController extends BaseController{
 
             if ($data['sdk_version'] == 1 && $menus[$k]['name'] == 'suppersign'){
                 unset($menus[$k]);
+                continue;
             }elseif($data['sdk_version'] != 1 && $v['name'] == 'suppersign'){
                 // $menus[$k]['url'] = $v['url'] . '/user_token/' . $user['user_token'] . "/game_id/". $data['game_id'];
                 $menus[$k]['ios_url'] = $v['ios_url'] . '/user_token/' . $user['user_token'] . '/user_id/' . $data['user_id'] . '/game_id/' . $data['game_id'] . '.html?action=openurl';
@@ -224,6 +239,7 @@ class GameController extends BaseController{
             }
             
         }
+        
         $personalMenu = M('tool','tab_')->where(['name' => 'personal_menu'])->getField('config');
         $personalMenu = json_decode($personalMenu, true);
         foreach($personalMenu as $k => $v) {
@@ -250,6 +266,14 @@ class GameController extends BaseController{
                     continue;
                 }
             }
+            
+            if (/* isset($data['app_type']) && $data['app_type'] == 2 &&  */$isUSIP) {
+                if($v['name'] == 'gift' || $v['name'] == 'balance') {
+                    unset($personalMenu[$k]);
+                    continue;
+                }
+            }
+            
             //测试账号苹果审核
         	 $personalMenu[$k]['icon'] = (substr($v['icon'], 0, 7) == "http://" || substr($v['icon'], 0, 8) == "https://" ) ? $v['icon'] : 
                                 C('ADMIN_DOMAIN') . $v['icon'];
@@ -282,7 +306,7 @@ class GameController extends BaseController{
         	        	
         }
         //  2456623.96   
-        array_multisort(array_column($menus,'sort'),SORT_ASC,$menus);
+        array_multisort(array_column($menus,'sort'), SORT_ASC, $menus);
         array_multisort(array_column($personalMenu,'sort'),SORT_ASC,$personalMenu);
 
         $menusArr = [];
diff --git a/Application/Sdk/Controller/UserController.class.php b/Application/Sdk/Controller/UserController.class.php
index f9131fa7..593b85ea 100644
--- a/Application/Sdk/Controller/UserController.class.php
+++ b/Application/Sdk/Controller/UserController.class.php
@@ -201,7 +201,7 @@ class UserController extends BaseController
                                 }
                                 break;
                         }
-                        og_action($log);
+                        log_action($log);
                         echo base64_encode(json_encode($res_msg));
                         die;