From 3c5ebcfb506a71309c775153b19744d2d4a454a3 Mon Sep 17 00:00:00 2001
From: tpingzhang <635929049@qq.com>
Date: Tue, 22 Oct 2019 15:48:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=82=AC=E6=B5=AE=E7=90=83=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Sdk/Controller/BaseController.class.php   |  3 ++-
 .../Sdk/Controller/GameController.class.php   | 27 +++++++++++++------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/Application/Sdk/Controller/BaseController.class.php b/Application/Sdk/Controller/BaseController.class.php
index 46b5398f..5e2236e8 100644
--- a/Application/Sdk/Controller/BaseController.class.php
+++ b/Application/Sdk/Controller/BaseController.class.php
@@ -9,7 +9,8 @@ class BaseController extends RestController{
 		'Apple.apple_alipay_pay','Apple.apple_weixin_pay','User.get_alipay_zmxy_return',
 		'Apple.apple_platform_pay','Spend.notice','Apple.apple_union_pay','WapPay.wap_shortcut_pay',
 		'WapPay.shortcut_pay','WapPay.android_shortcut_pay','WapPay.wap_shortcut_pay','WapPay.wap_shortcut_pay',
-		'Apple.apple_weixin_pay','Ipa365','User.user_login','platform_coin_deduction','test','get_suspend'
+		'Apple.apple_weixin_pay','Ipa365','User.user_login','platform_coin_deduction','test','get_user_money',
+        'file_pay','pay','get_suspend',
 	];
 	// 不需要验证TOKEN的接口
 	protected $noNeedToken = [
diff --git a/Application/Sdk/Controller/GameController.class.php b/Application/Sdk/Controller/GameController.class.php
index 6b5629ff..f09ec577 100644
--- a/Application/Sdk/Controller/GameController.class.php
+++ b/Application/Sdk/Controller/GameController.class.php
@@ -41,29 +41,28 @@ class GameController extends BaseController{
 	 */
 	public function get_suspend(){
         $data = json_decode(base64_decode(file_get_contents("php://input")), true);
-        //$data['user_id'] = 1;
-        //$data['sdk_version'] = 1;  // 1android 2 ios
+		if (I('debug') == 1) {
+			$data['user_id'] = 1;
+		}
         
         if(empty($data['user_id'])) {
         	re_msg(1004, 'fail', '用户不存在');
         }
         $userToken = M('user','tab_')->where(['id' => $data['user_id']])->getField('user_token');
-        
         if (!$userToken) {
         	re_msg(1004, 'fail', '数据有误');
         }
         $sdkMenus = M('tool','tab_')->where(['name' => 'sdk_menu'])->find();
         $menus = json_decode($sdkMenus['config'],true);
-        $menus_item = $menus;
         foreach($menus as $k => $v) {
             $menus[$k]['icon'] = C('ADMIN_DOMAIN') . $v['icon'];
-            $menus[$k]['url'] = $v['url'] . '/user_token/' . $userToken;
-            if ($menus[$k]['type'] == 1)   // 原生
+            $menus[$k]['url'] = $v['url'] . '/user_token/' . $user_token;
+            if ($menus[$k]['type'] == 1) 
             	$menus[$k]['ios_url'] = "?action=".$menus[$k]['name'];
             else {     						// H5
             	if ($data['sdk_version'] == 2 && $v['name'] == 'suppersign')
             		$menus[$k]['ios_url'] = $menus[$k]['url']."?action=push";
-            	else 
+            	if ($data['sdk_version'] == 1 && $v['name'] == 'suppersign')
             		unset($menus[$k]);
             }
         }
@@ -77,8 +76,19 @@ class GameController extends BaseController{
         	else {
         		if ($data['sdk_version'] == 2 && $v['name'] == 'suppersign')
         			$v['ios_url'] = $v['url']."?action=push";
+        		else
+        			unset($v);
         	}
         }
+
+        foreach($menus_item as $k => $v) {
+            $menus_item[$k]['icon'] = C('ADMIN_DOMAIN') . $v['icon'];
+            $menus_item[$k]['url'] = $v['url'] . '/user_token/' . $user_token;
+            if ($menus_item[$k]['type'] == 1) 
+                $menus_item[$k]['ios_url'] = "?action=".$menus_item[$k]['name'];
+            else 
+                $menus_item[$k]['ios_url'] = $menus_item[$k]['url']."?action=push";
+        }
         
         array_multisort(array_column($menus,'sort'),SORT_ASC,$menus);
         array_multisort(array_column($personalMenu,'sort'),SORT_ASC,$personalMenu);
@@ -100,8 +110,9 @@ class GameController extends BaseController{
         ];
         if (I('debug') == 1)
         	pp(($ret));
-        re_msg(200, '获取成功', $ret);
+        re_msg(200,'获取成功',$ret);
     }
+    
     //获取游戏域名
     //yyh 2018 10 23
     public function get_game_domain(){