From 177c5cd70426f60e98f45dd4a05ee28b11543ed9 Mon Sep 17 00:00:00 2001
From: Your Name <zls@example.com>
Date: Wed, 6 Nov 2019 18:02:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Sdk/Controller/GameController.class.php   | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

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