修正路由绑定的参数丢失问题

Author: liu21st

library/think/route/Domain.php

@@ -20,7 +20,6 @@
 
 class Domain extends RuleGroup
 {
-    protected $bind;
 
     /**
      * 架构函数
@@ -86,9 +85,7 @@ public function check($request, $url, $completeMatch = false)
      */
     public function bind($bind)
     {
-        $this->bind = $bind;
         $this->router->bind($bind, $this->domain);
-
         return $this;
     }
 
@@ -117,8 +114,9 @@ private function checkRouteAlias($request, $url)
      */
     private function checkUrlBind($request, $url)
     {
-        if (!empty($this->bind)) {
-            $bind = $this->bind;
+        $bind = $this->router->getBind($this->domain);
+
+        if (!empty($bind)) {
             $this->parseBindAppendParam($bind);
 
             // 记录绑定信息
@@ -165,10 +163,10 @@ protected function bindToClass($request, $url, $class)
         $action = !empty($array[0]) ? $array[0] : $this->router->config('default_action');
 
         if (!empty($array[1])) {
-            $this->parseUrlParams($request, $array[1]);
+            $this->parseUrlParams($request, $array[1], $param);
         }
 
-        return new CallbackDispatch($request, $this, [$class, $action]);
+        return new CallbackDispatch($request, $this, [$class, $action], $param);
     }
 
     /**
@@ -186,10 +184,10 @@ protected function bindToNamespace($request, $url, $namespace)
         $method = !empty($array[1]) ? $array[1] : $this->router->config('default_action');
 
         if (!empty($array[2])) {
-            $this->parseUrlParams($request, $array[2]);
+            $this->parseUrlParams($request, $array[2], $param);
         }
 
-        return new CallbackDispatch($request, $this, [$namespace . '\\' . Loader::parseName($class, 1), $method]);
+        return new CallbackDispatch($request, $this, [$namespace . '\\' . Loader::parseName($class, 1), $method], $param);
     }
 
     /**
@@ -206,10 +204,10 @@ protected function bindToController($request, $url, $controller)
         $action = !empty($array[0]) ? $array[0] : $this->router->config('default_action');
 
         if (!empty($array[1])) {
-            $this->parseUrlParams($request, $array[1]);
+            $this->parseUrlParams($request, $array[1], $param);
         }
 
-        return new ControllerDispatch($request, $this, $controller . '/' . $action);
+        return new ControllerDispatch($request, $this, $controller . '/' . $action, $param);
     }
 
     /**
@@ -226,10 +224,10 @@ protected function bindToModule($request, $url, $controller)
         $action = !empty($array[0]) ? $array[0] : $this->router->config('default_action');
 
         if (!empty($array[1])) {
-            $this->parseUrlParams($request, $array[1]);
+            $this->parseUrlParams($request, $array[1], $param);
         }
 
-        return new ModuleDispatch($request, $this, $controller . '/' . $action);
+        return new ModuleDispatch($request, $this, $controller . '/' . $action, $param);
     }
 
 }