From 6368462a18245b36af2ec0c5de3703d74b029df6 Mon Sep 17 00:00:00 2001
From: zhaoxiang <zhaoxiang051405@gmail.com>
Date: Mon, 24 Feb 2020 17:59:48 +0800
Subject: [PATCH] =?UTF-8?q?modified=20=E4=BC=98=E5=8C=96=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Auth.php |  4 ++--
 application/admin/controller/Menu.php | 11 ++++++-----
 application/util/Tools.php            |  8 ++++----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/application/admin/controller/Auth.php b/application/admin/controller/Auth.php
index cfe9623..fff1351 100644
--- a/application/admin/controller/Auth.php
+++ b/application/admin/controller/Auth.php
@@ -241,9 +241,9 @@ class Auth extends Base {
         foreach ($list as $key => $value) {
             $newList[$key]['title'] = $value['name'];
             $newList[$key]['key'] = $value['url'];
-            if (isset($value['_child'])) {
+            if (isset($value['children'])) {
                 $newList[$key]['expand'] = true;
-                $newList[$key]['children'] = $this->buildList($value['_child'], $rules);
+                $newList[$key]['children'] = $this->buildList($value['children'], $rules);
             } else {
                 if (in_array($value['url'], $rules)) {
                     $newList[$key]['checked'] = true;
diff --git a/application/admin/controller/Menu.php b/application/admin/controller/Menu.php
index 1418706..a8e3f90 100644
--- a/application/admin/controller/Menu.php
+++ b/application/admin/controller/Menu.php
@@ -20,12 +20,13 @@ class Menu extends Base {
      * @author zhaoxiang <zhaoxiang051405@gmail.com>
      */
     public function index() {
-        $list = (new AdminMenu)->order('sort', 'ASC')->select();
-        $list = Tools::buildArrFromObj($list);
-        $list = Tools::formatTree(Tools::listToTree($list));
-
+        $origin = (new AdminMenu)->order('sort', 'ASC')->select();
+        $origin = Tools::buildArrFromObj($origin);
+        $list = Tools::listToTree($origin);
+        $choose = Tools::formatTree($list);
         return $this->buildSuccess([
-            'list' => $list
+            'list'   => $list,
+            'choose' => $choose
         ]);
     }
 
diff --git a/application/util/Tools.php b/application/util/Tools.php
index 82f923b..9125405 100644
--- a/application/util/Tools.php
+++ b/application/util/Tools.php
@@ -121,7 +121,7 @@ class Tools {
      * @param string $root
      * @return array
      */
-    public static function listToTree($list, $pk='id', $pid = 'fid', $child = '_child', $root = '0') {
+    public static function listToTree($list, $pk='id', $pid = 'fid', $child = 'children', $root = '0') {
         $tree = array();
         if(is_array($list)) {
             $refer = array();
@@ -153,11 +153,11 @@ class Tools {
             $val['lv'] = $lv;
             $val['namePrefix'] = $lv == 0 ? '' : $title_prefix;
             $val['showName'] = $lv == 0 ? $val[$title] : $title_prefix.$val[$title];
-            if(!array_key_exists('_child', $val)){
+            if(!array_key_exists('children', $val)){
                 array_push($formatTree, $val);
             }else{
-                $child = $val['_child'];
-                unset($val['_child']);
+                $child = $val['children'];
+                unset($val['children']);
                 array_push($formatTree, $val);
                 $middle = self::formatTree($child, $lv+1, $title); //进行下一层递归
                 $formatTree = array_merge($formatTree, $middle);