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

master
tpingzhang 5 years ago
commit cda0330c5d

@ -166,10 +166,12 @@ class GameController extends BaseController{
}
$menus[$k]['icon'] = C('ADMIN_DOMAIN') . $menus[$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'].'/api_ver/2';
} else {
$menus[$k]['url'] = C('H5_DOMAIN') . $v['url'] . '/user_token/' . $userToken."/game_id/".$data['game_id'].'/sdk_version/'.$data['sdk_version'].'/api_ver/2';
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/' . $userToken."/game_id/".$data['game_id'].'/sdk_version/'.$data['sdk_version'].'/api_ver/2';
} else {
$menus[$k]['url'] = C('H5_DOMAIN') . $v['url'] . '/user_token/' . $userToken."/game_id/".$data['game_id'].'/sdk_version/'.$data['sdk_version'].'/api_ver/2';
}
}
//$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) {// 原生
@ -193,10 +195,12 @@ class GameController extends BaseController{
}
$personalMenu[$k]['icon'] = C('ADMIN_DOMAIN') . $personalMenu[$k]['icon'];
// die;
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'].'/api_ver/2';
} else {
$personalMenu[$k]['url'] = C('H5_DOMAIN') . $v['url'] . '/user_token/' . $userToken."/game_id/".$data['game_id'].'/sdk_version/'.$data['sdk_version'].'/api_ver/2';
if($v['type'] != 3){
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'].'/api_ver/2';
} else {
$personalMenu[$k]['url'] = C('H5_DOMAIN') . $v['url'] . '/user_token/' . $userToken."/game_id/".$data['game_id'].'/sdk_version/'.$data['sdk_version'].'/api_ver/2';
}
}
//$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) {// 原生

Loading…
Cancel
Save