Merge branch 'dev' of 47.111.118.107:/srv/git/sdk into dev

master
tpingzhang 5 years ago
commit 881b693eba

@ -129,22 +129,23 @@ class GameController extends BaseController{
$personalMenu = M('tool','tab_')->where(['name' => 'personal_menu'])->getField('config'); $personalMenu = M('tool','tab_')->where(['name' => 'personal_menu'])->getField('config');
$personalMenu = json_decode($personalMenu, true); $personalMenu = json_decode($personalMenu, true);
foreach($personalMenu as &$v) { foreach($personalMenu as &$v) {
$v['icon'] = C('ADMIN_DOMAIN') . $v['icon']; $menus[$k]['icon'] = C('ADMIN_DOMAIN') . $menus[$k]['icon'];
if (substr($v['url'], 7) == "http://" || substr($v['url'], 8) == "https://") { // die;
$v['url'] = $v['url'] . '/user_token/' . $userToken."/game_id/".$data['game_id'].'/sdk_version/'.$data['sdk_version']; 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'];
} else { } else {
$v['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'];
} }
//$menus[$k]['url'] = C('H5_DOMAIN') . $v['url'] . '/user_token/' . $userToken."/game_id/".$data['game_id'].'/sdk_version/'.$data['sdk_version'];
if ($v['type'] == 1) {// 原生 if ($menus[$k]['type'] == 1) {// 原生
$v['ios_url'] = "?action=".$v['name']; $menus[$k]['ios_url'] = "?action=".$menus[$k]['name'];
} else if ($menus[$k]['type'] == 0) { // H5 } else if ($menus[$k]['type'] == 0) { // H5
$v['ios_url'] = $v['url']."?action=push"; $menus[$k]['ios_url'] = $menus[$k]['url']."?action=push";
if ($data['sdk_version'] == 1 && $v['name'] == 'suppersign') if ($data['sdk_version'] == 1 && $menus[$k]['name'] == 'suppersign')
unset($v); unset($menus[$k]);
} else if ($menus[$k]['type'] == 2) { // 外部链接 } else if ($menus[$k]['type'] == 2) { // 外部链接
$v['ios_url'] = $v['ios_url']."?action=openurl"; $menus[$k]['ios_url'] = $menus[$k]['ios_url']."?action=openurl";
} }
} }

Loading…
Cancel
Save