diff --git a/Application/Sdk/Common/function.php b/Application/Sdk/Common/function.php index 4cddee9c..74c1c88b 100644 --- a/Application/Sdk/Common/function.php +++ b/Application/Sdk/Common/function.php @@ -243,5 +243,6 @@ function re_msg($code=200,$msg,$data) $ret['code'] = $code; $ret['msg'] = $msg; $ret['data'] = $data; - echo base64_encode(json_encode($ret));die(); + echo base64_encode(json_encode($ret)); + die(); } diff --git a/Application/Sdk/Controller/GameController.class.php b/Application/Sdk/Controller/GameController.class.php index 952ba5f8..76281427 100644 --- a/Application/Sdk/Controller/GameController.class.php +++ b/Application/Sdk/Controller/GameController.class.php @@ -42,28 +42,43 @@ class GameController extends BaseController{ public function get_suspend(){ $data = json_decode(base64_decode(file_get_contents("php://input"),true)); - - $user_token = M('User','tab_')->where(['id' => $data['user_id']])->getField('user_token'); + if(empty($data['user_id'])) { + re_msg(1004, 'fail', '用户不存在'); + } + $user_token = M('user','tab_')->where(['id' => $data['user_id']])->getField('user_token'); - if(empty($data['user_id']) || empty($user_token)) - { - re_msg(1004,'fail','用户不存在'); + if (!$user_token) { + re_msg(1004, 'fail', '数据有误'); } - $sdkMenus = M('tool','tab_')->where(['name' => 'sdk_menu'])->find(); - $menus = json_decode($sdkMenus['config'],true); - $menus_item = $menus; + $ball_menus = M('tool','tab_')->where(['name' => 'sdk_menu'])->find(); + $menus = json_decode($ball_menus['config'],true); + + $personal_menu = M('tool','tab_')->where(['name' => 'personal_menu'])->find(); + $menus_item = json_decode($personal_menu['config'],true); + foreach($menus as $k => $v) { $menus[$k]['icon'] = is_https()?'https://':'http://' . $_SERVER['SERVER_NAME'] . $v['icon']; - $menus[$k]['url'] = $v['icon'] . '/user_token' . $user_token; - unset($menus[$k]['ios_url']); + $menus[$k]['url'] = $v['url'] . '/user_token/' . $user_token; + if ($menus[$k]['type'] == 1) + $menus[$k]['ios_url'] = "?action=".$menus[$k]['name']; + else + $menus[$k]['ios_url'] = $menus[$k]['url']."?action=push"; } + + foreach($menus_item as $k => $v) { $menus_item[$k]['icon'] = is_https()?'https://':'http://' . $_SERVER['SERVER_NAME'] . $v['icon']; - $menus_item[$k]['url'] = $v['icon'] . '/user_token' . $user_token; + $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($menus_item,'sort'),SORT_ASC,$menus_item); $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'); diff --git a/Application/Sdk/Controller/UserController.class.php b/Application/Sdk/Controller/UserController.class.php index 7b4b9352..533f1eba 100644 --- a/Application/Sdk/Controller/UserController.class.php +++ b/Application/Sdk/Controller/UserController.class.php @@ -3142,7 +3142,7 @@ class UserController extends BaseController } - public function get_user_money() + public function get_user_money() { $data = json_decode(base64_decode(file_get_contents("php://input"),true)); @@ -3181,5 +3181,6 @@ class UserController extends BaseController ]; re_msg(200,'获取成功',$data); } + }