Merge remote-tracking branch 'origin/developer' into developerB

src/main/resources/static/css/article/error.css

@@ -2,11 +2,11 @@ body{background:#f6f6f6;position:relative}
 
 @media screen and (min-width:768px){
 body{min-width:1184px}
-    #errorContent{width:1200px !important;min-height:500px !important;height:auto !important;overflow:hidden;border:none;margin:auto;padding:160px 0 40px;}
-    #errorContent p{color:#666666;font-size:20px;padding:60px 0}
+    #errorContent{width:1200px !important;min-height:380px !important;height:auto !important;overflow:hidden;border:none;margin:auto;padding:100px 0 0;}
+    #errorContent p{color:#666666;font-size:20px;padding:30px 0}
     #errorContent p span{color: #E15616;}
     #errorContent a{width:190px;height:44px;text-align:center;background:#e15616;color:#fff;display:inline-block;line-height:44px;border-radius:2px}
-    .recommend{ position: relative; width:1200px; margin: 0 auto; padding: 100px 0 66px;}
+    .recommend{ position: relative; width:1200px; margin: 0 auto; padding: 20px 0 66px;}
     .recommend .title{font-size: 16px; color: #4A4F58; text-align: left; margin-bottom: 24px; font-weight: bold;}
     .recommend .list{display: flex; justify-content: space-between; align-items: center; flex-wrap: wrap;}
     .recommend .list .item{ width: 486px; display: flex; align-items: center;  margin-bottom: 32px; cursor: pointer;}

src/main/resources/static/js/article/error.js

@@ -1,7 +1,7 @@
 $(function () {
     var coreServer = $('#coreServer').val()
     if (!coreServer && coreServer.length > 0) {
-        window.location.href = '/404.html';
+        window.location.href = '/info/404.html';
     }
 })
 
@@ -48,7 +48,7 @@ var errorPage = new Vue({
             this.timer = setInterval(function () {
                 if(--self.countdown <= 0){
                     clearInterval(self.timer);
-                    window.location.href = '/'
+                    window.location.href = '/info/center-3-1.html'
                 }
             }, 1000);
         },

src/main/resources/templates/article/error.html

@@ -21,7 +21,7 @@
   <div id="errorContent">
     <img src="/img/base/404.png">
     <p>您访问的页面不存在，<span v-text="countdown"></span>秒后将自动返回首页</p>
-    <a href="/index.html">返回首页</a>
+    <a href="/info/center-3-1.html">返回首页</a>
   </div>
 
   <div class="recommend">