Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

@@ -303,6 +303,7 @@ $basicBtnC:#eb0313;
         font-size: pxToRem(24px);
         font-size: pxToRem(24px);
         float: right;
         float: right;
         color: #d0021b;
         color: #d0021b;
+        margin-right: 1.4rem;
         h1 {
         h1 {
             display: inline-block;
             display: inline-block;
             line-height: pxToRem(88px);
             line-height: pxToRem(88px);

@@ -79,8 +79,8 @@ class Bootstrap extends Bootstrap_Abstract
                 case 'dev':  // 开发环境
                 case 'dev':  // 开发环境
                     break;
                     break;
                 case 'search': // 搜索
                 case 'search': // 搜索
-                    $controller = 'Search';
-                    $action = 'List';
+               		$searchRequest = new Yaf\Request\Http('/product/search/index');
+                    $dispatcher->setRequest($searchRequest);
                     break;
                     break;
                 case 'guang': // 逛
                 case 'guang': // 逛
                     $module = 'Guang';
                     $module = 'Guang';

@@ -4,7 +4,7 @@ use LibModels\Web\Passport\RegData;
 use Plugin\Helpers;
 use Plugin\Helpers;
 use Plugin\Cache;
 use Plugin\Cache;
 use Passport\PassportModel;
 use Passport\PassportModel;
-use LibModels\Web\Passport\BindData;
+use LibModels\Wap\Passport\BindData;
 class RegisterController extends WebAction
 class RegisterController extends WebAction
 {    
 {    
     /**
     /**