From 1e4b8b9250256c6742aac8e75fcfdf22122a0824 Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 5 Nov 2019 11:44:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sdk/Controller/BaseController.class.php | 2 +- .../Sdk/Controller/GameController.class.php | 28 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Application/Sdk/Controller/BaseController.class.php b/Application/Sdk/Controller/BaseController.class.php index 8af0c5c2..9c3967da 100644 --- a/Application/Sdk/Controller/BaseController.class.php +++ b/Application/Sdk/Controller/BaseController.class.php @@ -11,7 +11,7 @@ class BaseController extends RestController{ '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','get_user_money', - 'file_pay','pay','GameGiftPage','UserH', 'PayH5','init_sdk', + 'file_pay','pay','GameGiftPage','UserH', 'PayH5','init_sdk', 'get_suspend' // 'test','Game.get_suspend', ]; diff --git a/Application/Sdk/Controller/GameController.class.php b/Application/Sdk/Controller/GameController.class.php index 5fa00ed5..9643432e 100644 --- a/Application/Sdk/Controller/GameController.class.php +++ b/Application/Sdk/Controller/GameController.class.php @@ -128,24 +128,24 @@ class GameController extends BaseController{ } $personalMenu = M('tool','tab_')->where(['name' => 'personal_menu'])->getField('config'); $personalMenu = json_decode($personalMenu, true); - foreach($personalMenu as &$v) { - $menus[$k]['icon'] = C('ADMIN_DOMAIN') . $menus[$k]['icon']; + foreach($personalMenu as $k => &$v) { + $personalMenu[$k]['icon'] = C('ADMIN_DOMAIN') . $personalMenu[$k]['icon']; // die; - if (substr($menus[$k]['url'], 0, 7) == "http://" || substr($menus[$k]['url'], 0, 8) == "https://") { - $menus[$k]['url'] = $menus[$k]['url'] . '/user_token/' . $userToken."/game_id/".$data['game_id'].'/sdk_version/'.$data['sdk_version']; + if (substr($personalMenu[$k]['url'], 0, 7) == "http://" || substr($personalMenu[$k]['url'], 0, 8) == "https://") { + $personalMenu[$k]['url'] = $personalMenu[$k]['url'] . '/user_token/' . $userToken."/game_id/".$data['game_id'].'/sdk_version/'.$data['sdk_version']; } else { - $menus[$k]['url'] = C('H5_DOMAIN') . $v['url'] . '/user_token/' . $userToken."/game_id/".$data['game_id'].'/sdk_version/'.$data['sdk_version']; + $personalMenu[$k]['url'] = C('H5_DOMAIN') . $v['url'] . '/user_token/' . $userToken."/game_id/".$data['game_id'].'/sdk_version/'.$data['sdk_version']; } - //$menus[$k]['url'] = C('H5_DOMAIN') . $v['url'] . '/user_token/' . $userToken."/game_id/".$data['game_id'].'/sdk_version/'.$data['sdk_version']; - if ($menus[$k]['type'] == 1) {// 原生 - $menus[$k]['ios_url'] = "?action=".$menus[$k]['name']; - } else if ($menus[$k]['type'] == 0) { // H5 - $menus[$k]['ios_url'] = $menus[$k]['url']."?action=push"; + //$personalMenu[$k]['url'] = C('H5_DOMAIN') . $v['url'] . '/user_token/' . $userToken."/game_id/".$data['game_id'].'/sdk_version/'.$data['sdk_version']; + if ($personalMenu[$k]['type'] == 1) {// 原生 + $personalMenu[$k]['ios_url'] = "?action=".$personalMenu[$k]['name']; + } else if ($personalMenu[$k]['type'] == 0) { // H5 + $personalMenu[$k]['ios_url'] = $personalMenu[$k]['url']."?action=push"; - if ($data['sdk_version'] == 1 && $menus[$k]['name'] == 'suppersign') - unset($menus[$k]); - } else if ($menus[$k]['type'] == 2) { // 外部链接 - $menus[$k]['ios_url'] = $menus[$k]['ios_url']."?action=openurl"; + if ($data['sdk_version'] == 1 && $personalMenu[$k]['name'] == 'suppersign') + unset($personalMenu[$k]); + } else if ($personalMenu[$k]['type'] == 2) { // 外部链接 + $personalMenu[$k]['ios_url'] = $personalMenu[$k]['ios_url']."?action=openurl"; } }