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

@@ -10,7 +10,6 @@ $pxConvertRem: 40;
 html, body {
 html, body {
     font-family: helvetica,Arial,"黑体";
     font-family: helvetica,Arial,"黑体";
     width: 100%;
     width: 100%;
-    height: 100%;
     font-size: 12px;
     font-size: 12px;
     line-height: 1.4;
     line-height: 1.4;
 }
 }

-.err-page {
-    position: relative;
-    height: 100%;
-
-    .err-bg {
-        position: absolute;
+.err-page .err-bg {
+    position: fixed;
     height: 200rem / $pxConvertRem;
     height: 200rem / $pxConvertRem;
     width: 200rem / $pxConvertRem;
     width: 200rem / $pxConvertRem;
     top: 50%;
     top: 50%;
@@ -12,5 +8,4 @@
     margin-top: -100rem / $pxConvertRem;
     margin-top: -100rem / $pxConvertRem;
     background: image-url('404.png') no-repeat;
     background: image-url('404.png') no-repeat;
     background-size: 100% 100%;
     background-size: 100% 100%;
-    }
 }
 }

@@ -15,6 +15,7 @@ class ErrorController extends AbstractAction
     {
     {
         header('HTTP/1.1 404 Not Found');
         header('HTTP/1.1 404 Not Found');
         header('Status: 404 Not Found');
         header('Status: 404 Not Found');
+        $this->_view->display('index');
     }
     }
     
     
     public function errorAction($exception)
     public function errorAction($exception)