Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev

# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php

src/frontend/views/site/error.php

@@ -45,11 +45,17 @@ $this->title = $name;
             vertical-align: middle;
         }
         .main-box {
+            min-width: 690px;
+            min-height: 440px;
             position: relative;
             display: inline-block;
-            background-color: #f4f7f7;
+            background-color: #fff;
             box-shadow: 0 0 80px rgba(0,0,0,.05);
         }
+        .main-box img {
+            width: 150px;
+            margin-top: 80px;
+        }
         .main-box p {
             position: absolute;
             display: block;
@@ -80,16 +86,13 @@ $this->title = $name;
             background-color: #f6c269;
             color: #fff;
         }
-        .main-box img {
-            max-width: 690px;
-        }
     </style>
 </head>
 <body>
 <div class="vertical-obj">
     <div class="vertical-obj-cont">
         <div class="main-box">
-            <img src="<?=\frontend\assets\AppAsset::getStaticUrl('img/404.jpg')?>">
+            <img src="<?=\frontend\assets\AppAsset::getStaticUrl('img/error.jpg')?>">
             <p>
                 <span><?= nl2br(Html::encode($message)) ?></span>
                 <a href="<?=\yii\helpers\Url::base()?>">回首页</a>