From 9762cd370e1518c277cb03a1f70c8b8fd3280d15 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Mon, 1 Aug 2016 12:21:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B=E8=B7=AF=E7=94=B1=E5=88=86?=
 =?UTF-8?q?=E7=BB=84=E5=92=8C=E8=99=9A=E6=8B=9F=E5=88=86=E7=BB=84=20?=
 =?UTF-8?q?=E6=B7=B7=E5=90=88=E4=BD=BF=E7=94=A8=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Route.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/library/think/Route.php b/library/think/Route.php
index 57e2c4d0..24f6fb08 100644
--- a/library/think/Route.php
+++ b/library/think/Route.php
@@ -340,7 +340,6 @@ class Route
                 $name = $currentGroup . '/' . ltrim($name, '/');
             }
             if ($routes instanceof \Closure) {
-
                 $currentOption  = self::getGroup('option');
                 $currentPattern = self::getGroup('pattern');
                 self::setGroup($name, $option, $pattern);
@@ -350,7 +349,6 @@ class Route
                 self::$rules['*'][$name]['var']     = self::parseVar($name);
                 self::$rules['*'][$name]['option']  = $option;
                 self::$rules['*'][$name]['pattern'] = $pattern;
-
             } else {
                 foreach ($routes as $key => $val) {
                     if (is_numeric($key)) {
@@ -383,6 +381,9 @@ class Route
                 $currentGroup   = self::getGroup('name');
                 $currentOption  = self::getGroup('option');
                 $currentPattern = self::getGroup('pattern');
+                if ($currentGroup) {
+                    $name = $currentGroup . '/' . ltrim($name, '/');
+                }
                 self::setGroup($name, $option, $pattern);
                 call_user_func_array($routes, []);
                 self::setGroup($currentGroup, $currentOption, $currentPattern);