From 5faa35e9804c5273b5a957d6a522d569ba5cd534 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Fri, 4 May 2018 12:11:57 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E8=A1=A8=E5=8D=95=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=88=86?=
 =?UTF-8?q?=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Node.php  |  10 +-
 application/admin/view/node/index.html | 139 ++++++++++++++-----------
 vendor/autoload.php                    |   2 +-
 vendor/composer/autoload_classmap.php  |  12 +--
 vendor/composer/autoload_real.php      |  14 +--
 vendor/composer/autoload_static.php    |  20 ++--
 6 files changed, 111 insertions(+), 86 deletions(-)

diff --git a/application/admin/controller/Node.php b/application/admin/controller/Node.php
index 8995274ce..8e3d6e6bb 100644
--- a/application/admin/controller/Node.php
+++ b/application/admin/controller/Node.php
@@ -43,7 +43,15 @@ class Node extends BasicAdmin
     public function index()
     {
         $nodes = ToolsService::arr2table(NodeService::get(), 'node', 'pnode');
-        return $this->fetch('', ['title' => '系统节点管理', 'nodes' => $nodes]);
+        $groups = [];
+        foreach ($nodes as $node) {
+            $pnode = explode('/', $node['node'])[0];
+            if ($node['node'] === $pnode) {
+                $groups[$pnode]['node'] = $node;
+            }
+            $groups[$pnode]['list'][] = $node;
+        }
+        return $this->fetch('', ['title' => '系统节点管理', 'nodes' => $nodes, 'groups' => $groups]);
     }
 
     /**
diff --git a/application/admin/view/node/index.html b/application/admin/view/node/index.html
index 8bae2bfba..98ee187d3 100644
--- a/application/admin/view/node/index.html
+++ b/application/admin/view/node/index.html
@@ -7,9 +7,7 @@
 {/block}
 
 {block name="content"}
-<!--data-tips-text="勾选后需配置用户权限后才能访问"-->
-<!--data-tips-text="勾选后需要登录后才能访问"-->
-<!--data-tips-text="勾选后配置菜单时节点可自动选择"-->
+
 <style>
     .layui-table .title-input {
         width: auto;
@@ -21,65 +19,84 @@
         cursor: pointer
     }
 </style>
-<table class="layui-table border-none" lay-skin="line">
-    <!--{empty name='nodes'}-->
-    <p class="help-block text-center well">没 有 记 录 哦！</p>
-    <!--{else}-->
-    <!--{foreach $nodes as $key=>$vo}-->
-    <tr>
-        <td class='text-left nowrap'>
-            <span class="color-desc">{$vo.spl|raw}</span> {$vo.node}
-            {if auth("$classuri/save")}&nbsp;<input class='layui-input layui-input-inline title-input' name='title' data-node="{$vo.node}" value="{$vo.title}">{/if}
-        </td>
-        <td class='text-left nowrap'>
-            {if auth("$classuri/save") and $vo.spt eq 1}
-            <label class="color-desc">
-                <input data-login-group="{$vo.node}" type="checkbox"> 全部加入登录控制
-            </label>
-            &nbsp;&nbsp;&nbsp;&nbsp;
-            <label class="notselect margin-left-15 color-desc">
-                <input data-auth-group="{$vo.node}" type="checkbox"> 全部加入权限控制
-            </label>
-            &nbsp;&nbsp;&nbsp;&nbsp;
-            <label class="notselect margin-left-15 color-desc">
-                <input data-menu-group="{$vo.node}" type="checkbox"> 全部加入菜单节点选择器
-            </label>
-            {/if}
-            {if auth("$classuri/save") and $vo.spt eq 2}
-            <span class="color-desc">&nbsp;&nbsp;├─&nbsp;</span>
-            <label class="notselect margin-right-15">
-                <!--{notempty name='vo.is_login'}-->
-                <input data-login-filter="{$vo.pnode}" checked='checked' class="check-box login_{$key}" type='checkbox' value='1' name='is_login' data-node="{$vo.node}" onclick="!this.checked && ($('.auth_{$key}')[0].checked = !!this.checked)">
+<script>
+    $(function () {
+        $('.layui-tab ul.layui-tab-title li:first').trigger('click');
+    });
+</script>
+<div class="layui-tab layui-box">
+    <ul class="layui-tab-title">
+        <!--{foreach $groups as $key=>$group}-->
+        <li>{$group.node.title|default='<span class="color-desc">未配置名称</span>'|raw}（{$key}）</li>
+        <!--{/foreach}-->
+    </ul>
+    <div class="layui-tab-content">
+        {foreach $groups as $key=>$group}
+        <div class="layui-tab-item">
+            <table class="layui-table border-none" lay-skin="line">
+                <!--{empty name='nodes'}-->
+                <p class="help-block text-center well">没 有 记 录 哦！</p>
                 <!--{else}-->
-                <input data-login-filter="{$vo.pnode}" class="check-box login_{$key}" type='checkbox' value='1' name='is_login' data-node="{$vo.node}" onclick="!this.checked && ($('.auth_{$key}')[0].checked = !!this.checked)">
-                <!--{/notempty}-->
-                加入登录控制
-            </label>
-            <span class="color-desc">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;├─&nbsp;</span>
-            <label class="notselect margin-right-15">
-                <!--{notempty name='vo.is_auth'}-->
-                <input data-auth-filter="{$vo.pnode}" name='is_auth' data-node="{$vo.node}" checked='checked' class="check-box auth_{$key}" type='checkbox' onclick="this.checked && ($('.login_{$key}')[0].checked = !!this.checked)" value='1'>
-                <!--{else}-->
-                <input data-auth-filter="{$vo.pnode}" name='is_auth' data-node="{$vo.node}" class="check-box auth_{$key}" type='checkbox' value='1' onclick="this.checked && ($('.login_{$key}')[0].checked = !!this.checked)">
-                <!--{/notempty}-->
-                加入权限控制
-            </label>
-            <span class="color-desc">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;├─&nbsp;</span>
-            <label class="notselect">
-                <!--{notempty name='vo.is_menu'}-->
-                <input data-menu-filter="{$vo.pnode}" name='is_menu' data-node="{$vo.node}" checked='checked' class='check-box menu_{$key}' type='checkbox' value='1'>
-                <!--{else}-->
-                <input data-menu-filter="{$vo.pnode}" name='is_menu' data-node="{$vo.node}" class='check-box menu_{$key}' type='checkbox' value='1'>
-                <!--{/notempty}-->
-                加入菜单节点选择器
-            </label>
-            {/if}
-        </td>
-        <td data-tips-filter="{$vo.pnode}" class="loading-tips nowrap full-width"></td>
-    </tr>
-    <!--{/foreach}-->
-    <!--{/empty}-->
-</table>
+                <!--{foreach $group.list as $key=>$vo}-->
+                <tr>
+                    <td class='text-left nowrap'>
+                        <span class="color-desc">{$vo.spl|raw}</span> {$vo.node}
+                        {if auth("$classuri/save")}&nbsp;<input class='layui-input layui-input-inline title-input' name='title' data-node="{$vo.node}" value="{$vo.title}">{/if}
+                    </td>
+                    <td class='text-left nowrap'>
+                        {if auth("$classuri/save") and $vo.spt eq 1}
+                        <label class="color-desc">
+                            <input data-login-group="{$vo.node}" type="checkbox"> 全部加入登录控制
+                        </label>
+                        &nbsp;&nbsp;&nbsp;&nbsp;
+                        <label class="notselect margin-left-15 color-desc">
+                            <input data-auth-group="{$vo.node}" type="checkbox"> 全部加入权限控制
+                        </label>
+                        &nbsp;&nbsp;&nbsp;&nbsp;
+                        <label class="notselect margin-left-15 color-desc">
+                            <input data-menu-group="{$vo.node}" type="checkbox"> 全部加入菜单节点选择器
+                        </label>
+                        {/if}
+                        {if auth("$classuri/save") and $vo.spt eq 2}
+                        <span class="color-desc">&nbsp;&nbsp;├─&nbsp;</span>
+                        <label class="notselect margin-right-15">
+                            <!--{notempty name='vo.is_login'}-->
+                            <input data-login-filter="{$vo.pnode}" checked='checked' class="check-box login_{$key}" type='checkbox' value='1' name='is_login' data-node="{$vo.node}" onclick="!this.checked && ($('.auth_{$key}')[0].checked = !!this.checked)">
+                            <!--{else}-->
+                            <input data-login-filter="{$vo.pnode}" class="check-box login_{$key}" type='checkbox' value='1' name='is_login' data-node="{$vo.node}" onclick="!this.checked && ($('.auth_{$key}')[0].checked = !!this.checked)">
+                            <!--{/notempty}-->
+                            加入登录控制
+                        </label>
+                        <span class="color-desc">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;├─&nbsp;</span>
+                        <label class="notselect margin-right-15">
+                            <!--{notempty name='vo.is_auth'}-->
+                            <input data-auth-filter="{$vo.pnode}" name='is_auth' data-node="{$vo.node}" checked='checked' class="check-box auth_{$key}" type='checkbox' onclick="this.checked && ($('.login_{$key}')[0].checked = !!this.checked)" value='1'>
+                            <!--{else}-->
+                            <input data-auth-filter="{$vo.pnode}" name='is_auth' data-node="{$vo.node}" class="check-box auth_{$key}" type='checkbox' value='1' onclick="this.checked && ($('.login_{$key}')[0].checked = !!this.checked)">
+                            <!--{/notempty}-->
+                            加入权限控制
+                        </label>
+                        <span class="color-desc">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;├─&nbsp;</span>
+                        <label class="notselect">
+                            <!--{notempty name='vo.is_menu'}-->
+                            <input data-menu-filter="{$vo.pnode}" name='is_menu' data-node="{$vo.node}" checked='checked' class='check-box menu_{$key}' type='checkbox' value='1'>
+                            <!--{else}-->
+                            <input data-menu-filter="{$vo.pnode}" name='is_menu' data-node="{$vo.node}" class='check-box menu_{$key}' type='checkbox' value='1'>
+                            <!--{/notempty}-->
+                            加入菜单节点选择器
+                        </label>
+                        {/if}
+                    </td>
+                    <td data-tips-filter="{$vo.pnode}" class="loading-tips nowrap full-width"></td>
+                </tr>
+                <!--{/foreach}-->
+                <!--{/empty}-->
+            </table>
+        </div>
+        {/foreach}
+    </div>
+</div>
+
 <!--{if auth("$classuri/save")}-->
 <script>
     $(function () {
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 861d29020..990cfa033 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit9e628bddedd690e20fe8b6cad9d0489b::getLoader();
+return ComposerAutoloaderInit33a8bc3c373005edc4cb872b55fab022::getLoader();
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index a737e5850..11ac845d7 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -155,19 +155,19 @@ return array(
     'app\\admin\\controller\\Node' => $baseDir . '/application/admin/controller/Node.php',
     'app\\admin\\controller\\Plugs' => $baseDir . '/application/admin/controller/Plugs.php',
     'app\\admin\\controller\\User' => $baseDir . '/application/admin/controller/User.php',
-    'app\\goods\\controller\\Brand' => $baseDir . '/application/goods/controller/Brand.php',
-    'app\\goods\\controller\\Cate' => $baseDir . '/application/goods/controller/Cate.php',
-    'app\\goods\\controller\\Product' => $baseDir . '/application/goods/controller/Product.php',
-    'app\\goods\\controller\\Spec' => $baseDir . '/application/goods/controller/Spec.php',
-    'app\\goods\\service\\ProductService' => $baseDir . '/application/goods/service/ProductService.php',
     'app\\index\\controller\\Index' => $baseDir . '/application/index/controller/Index.php',
     'app\\store\\controller\\Express' => $baseDir . '/application/store/controller/Express.php',
+    'app\\store\\controller\\Goods' => $baseDir . '/application/store/controller/Goods.php',
+    'app\\store\\controller\\GoodsBrand' => $baseDir . '/application/store/controller/GoodsBrand.php',
+    'app\\store\\controller\\GoodsCate' => $baseDir . '/application/store/controller/GoodsCate.php',
+    'app\\store\\controller\\GoodsSpec' => $baseDir . '/application/store/controller/GoodsSpec.php',
     'app\\store\\controller\\Order' => $baseDir . '/application/store/controller/Order.php',
     'app\\store\\controller\\wechat\\Index' => $baseDir . '/application/store/controller/wechat/Index.php',
+    'app\\store\\service\\GoodsService' => $baseDir . '/application/store/service/GoodsService.php',
     'app\\store\\service\\OrderService' => $baseDir . '/application/store/service/OrderService.php',
-    'app\\wechat\\controller\\Block' => $baseDir . '/application/wechat/controller/Block.php',
     'app\\wechat\\controller\\Config' => $baseDir . '/application/wechat/controller/Config.php',
     'app\\wechat\\controller\\Fans' => $baseDir . '/application/wechat/controller/Fans.php',
+    'app\\wechat\\controller\\FansBlock' => $baseDir . '/application/wechat/controller/FansBlock.php',
     'app\\wechat\\controller\\Keys' => $baseDir . '/application/wechat/controller/Keys.php',
     'app\\wechat\\controller\\Menu' => $baseDir . '/application/wechat/controller/Menu.php',
     'app\\wechat\\controller\\News' => $baseDir . '/application/wechat/controller/News.php',
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index 046ec251b..cd4eb03c9 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit9e628bddedd690e20fe8b6cad9d0489b
+class ComposerAutoloaderInit33a8bc3c373005edc4cb872b55fab022
 {
     private static $loader;
 
@@ -19,15 +19,15 @@ class ComposerAutoloaderInit9e628bddedd690e20fe8b6cad9d0489b
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit9e628bddedd690e20fe8b6cad9d0489b', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit33a8bc3c373005edc4cb872b55fab022', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit9e628bddedd690e20fe8b6cad9d0489b', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit33a8bc3c373005edc4cb872b55fab022', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
             require_once __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInit9e628bddedd690e20fe8b6cad9d0489b::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit33a8bc3c373005edc4cb872b55fab022::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {
@@ -48,19 +48,19 @@ class ComposerAutoloaderInit9e628bddedd690e20fe8b6cad9d0489b
         $loader->register(true);
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit9e628bddedd690e20fe8b6cad9d0489b::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInit33a8bc3c373005edc4cb872b55fab022::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire9e628bddedd690e20fe8b6cad9d0489b($fileIdentifier, $file);
+            composerRequire33a8bc3c373005edc4cb872b55fab022($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequire9e628bddedd690e20fe8b6cad9d0489b($fileIdentifier, $file)
+function composerRequire33a8bc3c373005edc4cb872b55fab022($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         require $file;
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index e69801ce7..321ba51b4 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit9e628bddedd690e20fe8b6cad9d0489b
+class ComposerStaticInit33a8bc3c373005edc4cb872b55fab022
 {
     public static $files = array (
         '1cfd2761b63b0a29ed23657ea394cb2d' => __DIR__ . '/..' . '/topthink/think-captcha/src/helper.php',
@@ -238,19 +238,19 @@ class ComposerStaticInit9e628bddedd690e20fe8b6cad9d0489b
         'app\\admin\\controller\\Node' => __DIR__ . '/../..' . '/application/admin/controller/Node.php',
         'app\\admin\\controller\\Plugs' => __DIR__ . '/../..' . '/application/admin/controller/Plugs.php',
         'app\\admin\\controller\\User' => __DIR__ . '/../..' . '/application/admin/controller/User.php',
-        'app\\goods\\controller\\Brand' => __DIR__ . '/../..' . '/application/goods/controller/Brand.php',
-        'app\\goods\\controller\\Cate' => __DIR__ . '/../..' . '/application/goods/controller/Cate.php',
-        'app\\goods\\controller\\Product' => __DIR__ . '/../..' . '/application/goods/controller/Product.php',
-        'app\\goods\\controller\\Spec' => __DIR__ . '/../..' . '/application/goods/controller/Spec.php',
-        'app\\goods\\service\\ProductService' => __DIR__ . '/../..' . '/application/goods/service/ProductService.php',
         'app\\index\\controller\\Index' => __DIR__ . '/../..' . '/application/index/controller/Index.php',
         'app\\store\\controller\\Express' => __DIR__ . '/../..' . '/application/store/controller/Express.php',
+        'app\\store\\controller\\Goods' => __DIR__ . '/../..' . '/application/store/controller/Goods.php',
+        'app\\store\\controller\\GoodsBrand' => __DIR__ . '/../..' . '/application/store/controller/GoodsBrand.php',
+        'app\\store\\controller\\GoodsCate' => __DIR__ . '/../..' . '/application/store/controller/GoodsCate.php',
+        'app\\store\\controller\\GoodsSpec' => __DIR__ . '/../..' . '/application/store/controller/GoodsSpec.php',
         'app\\store\\controller\\Order' => __DIR__ . '/../..' . '/application/store/controller/Order.php',
         'app\\store\\controller\\wechat\\Index' => __DIR__ . '/../..' . '/application/store/controller/wechat/Index.php',
+        'app\\store\\service\\GoodsService' => __DIR__ . '/../..' . '/application/store/service/GoodsService.php',
         'app\\store\\service\\OrderService' => __DIR__ . '/../..' . '/application/store/service/OrderService.php',
-        'app\\wechat\\controller\\Block' => __DIR__ . '/../..' . '/application/wechat/controller/Block.php',
         'app\\wechat\\controller\\Config' => __DIR__ . '/../..' . '/application/wechat/controller/Config.php',
         'app\\wechat\\controller\\Fans' => __DIR__ . '/../..' . '/application/wechat/controller/Fans.php',
+        'app\\wechat\\controller\\FansBlock' => __DIR__ . '/../..' . '/application/wechat/controller/FansBlock.php',
         'app\\wechat\\controller\\Keys' => __DIR__ . '/../..' . '/application/wechat/controller/Keys.php',
         'app\\wechat\\controller\\Menu' => __DIR__ . '/../..' . '/application/wechat/controller/Menu.php',
         'app\\wechat\\controller\\News' => __DIR__ . '/../..' . '/application/wechat/controller/News.php',
@@ -273,9 +273,9 @@ class ComposerStaticInit9e628bddedd690e20fe8b6cad9d0489b
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit9e628bddedd690e20fe8b6cad9d0489b::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit9e628bddedd690e20fe8b6cad9d0489b::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInit9e628bddedd690e20fe8b6cad9d0489b::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit33a8bc3c373005edc4cb872b55fab022::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit33a8bc3c373005edc4cb872b55fab022::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit33a8bc3c373005edc4cb872b55fab022::$classMap;
 
         }, null, ClassLoader::class);
     }