master
Your Name 5 years ago
parent d9cd5a60a8
commit 177c5cd704

@ -93,7 +93,7 @@ class GameController extends BaseController{
$data = json_decode(base64_decode(file_get_contents("php://input")), true); $data = json_decode(base64_decode(file_get_contents("php://input")), true);
if (I('debug') == 1) { if (I('debug') == 1) {
$data['user_id'] = 1; $data['user_id'] = 1;
$data['sdk_version'] = 2; $data['sdk_version'] = 1;
} }
if(empty($data['user_id'])) { if(empty($data['user_id'])) {
@ -106,8 +106,8 @@ class GameController extends BaseController{
$sdkMenus = M('tool','tab_')->where(['name' => 'sdk_menu'])->find(); $sdkMenus = M('tool','tab_')->where(['name' => 'sdk_menu'])->find();
$menus = json_decode($sdkMenus['config'],true); $menus = json_decode($sdkMenus['config'],true);
foreach($menus as $k => $v) { foreach($menus as $k => $v) {
// if(!empty($v['menu_version']) && $data['sdk_version'] != 0 && $v['menu_version'] != $data['sdk_version']) if(!empty($v['menu_version']) && $data['sdk_version'] != 0 && $v['menu_version'] != $data['sdk_version'])
// unset($menus[$k]); unset($menus[$k]);
$menus[$k]['icon'] = C('ADMIN_DOMAIN') . $menus[$k]['icon']; $menus[$k]['icon'] = C('ADMIN_DOMAIN') . $menus[$k]['icon'];
// die; // die;
if (substr($menus[$k]['url'], 0, 7) == "http://" || substr($menus[$k]['url'], 0, 8) == "https://") { if (substr($menus[$k]['url'], 0, 7) == "http://" || substr($menus[$k]['url'], 0, 8) == "https://") {
@ -131,9 +131,9 @@ 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 $k => $v) { foreach($personalMenu as $k => $v) {
// if(!empty($v['menu_version']) && $data['sdk_version'] != 0 && $v['menu_version'] != $data['sdk_version']){ if(!empty($v['menu_version']) && $data['sdk_version'] != 0 && $v['menu_version'] != $data['sdk_version']){
// unset($personalMenu[$k]); unset($personalMenu[$k]);
// } }
$personalMenu[$k]['icon'] = C('ADMIN_DOMAIN') . $personalMenu[$k]['icon']; $personalMenu[$k]['icon'] = C('ADMIN_DOMAIN') . $personalMenu[$k]['icon'];
// die; // die;
if (substr($personalMenu[$k]['url'], 0, 7) == "http://" || substr($personalMenu[$k]['url'], 0, 8) == "https://") { if (substr($personalMenu[$k]['url'], 0, 7) == "http://" || substr($personalMenu[$k]['url'], 0, 8) == "https://") {
@ -158,6 +158,16 @@ class GameController extends BaseController{
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); array_multisort(array_column($personalMenu,'sort'),SORT_ASC,$personalMenu);
$menusArr = [];
foreach($menus as $k => $v){
$menusArr[] = $menus[$k];
}
$personalMenuArr = [];
foreach($personalMenu as $k => $v){
$personalMenuArr[] = $personalMenu[$k];
}
$ball_status = M('config','sys_')->where(['name' => 'WAP_SUSPEND_SHWO_STATUS'])->getField('value'); $ball_status = M('config','sys_')->where(['name' => 'WAP_SUSPEND_SHWO_STATUS'])->getField('value');
$sites_ball_logo = M('config','sys_')->where(['name' => 'WAP_SUSPEND_ICON'])->getField('value'); $sites_ball_logo = M('config','sys_')->where(['name' => 'WAP_SUSPEND_ICON'])->getField('value');
$sites_ball_logo = get_cover( $sites_ball_logo ,'path'); $sites_ball_logo = get_cover( $sites_ball_logo ,'path');
@ -170,8 +180,8 @@ class GameController extends BaseController{
$ret = [ $ret = [
'sites_ball_logo' => $sites_ball_logo, 'sites_ball_logo' => $sites_ball_logo,
'ball_status' => $ball_status, 'ball_status' => $ball_status,
'menus' => $menus, 'menus' => $menusArr,
'mine_features' => $personalMenu, 'mine_features' => $personalMenuArr,
]; ];
if (I('debug') == 1) if (I('debug') == 1)
pp(($ret)); pp(($ret));

Loading…
Cancel
Save