diff --git a/library/think/Route.php b/library/think/Route.php
index 18f055a6..ad3b603b 100644
--- a/library/think/Route.php
+++ b/library/think/Route.php
@@ -745,7 +745,7 @@ class Route
                     continue;
                 }
                 if ($group) {
-                    $rule = $group . '/' . ltrim($rule, '/');
+                    $rule = $group . ($rule ? '/' . ltrim($rule, '/') : '');
                 }
                 $result = self::checkRule($rule, $route, $url, $pattern, $option);
                 if (false !== $result) {
diff --git a/library/think/view/driver/Php.php b/library/think/view/driver/Php.php
index 13820baa..a7e72e9e 100644
--- a/library/think/view/driver/Php.php
+++ b/library/think/view/driver/Php.php
@@ -67,8 +67,14 @@ class Php
         }
         // 记录视图信息
         App::$debug && Log::record('[ VIEW ] ' . $template . ' [ ' . var_export(array_keys($data), true) . ' ]', 'info');
-        extract($data, EXTR_OVERWRITE);
-        include $template;
+        if (isset($data['template'])) {
+            $__template__ = $template;
+            extract($data, EXTR_OVERWRITE);
+            include $__template__;
+        } else {
+            extract($data, EXTR_OVERWRITE);
+            include $template;
+        }
     }
 
     /**
@@ -80,8 +86,14 @@ class Php
      */
     public function display($content, $data = [])
     {
-        extract($data, EXTR_OVERWRITE);
-        eval('?>' . $content);
+        if (isset($data['content'])) {
+            $__content__ = $content;
+            extract($data, EXTR_OVERWRITE);
+            eval('?>' . $__content__);
+        } else {
+            extract($data, EXTR_OVERWRITE);
+            eval('?>' . $content);
+        }
     }
 
     /**