Merge pull request 'merge develop to standalone_develop' (#267) from develop into standalone_develop

public/500.html

@@ -12,12 +12,27 @@
     body {
       font-family: "微软雅黑","宋体";
       background: #fff;
+      margin: 0px;
+      padding: 0px;
     }
     h1 {
       font-size: 1.5em;
     }
-    p {
-      font-size: 0.8em;
+    img{
+      vertical-align: middle;
+      border-style: none;
+    }
+    a{
+      text-decoration: none;
+    }
+    .font-16{
+      font-size: 16px !important;
+    }
+    .mt56{
+      margin-top: 56px;
+    }
+    .color-blue{
+      color:#466AFF !important;
     }
     .h_content{
       text-align: center;
@@ -33,6 +48,32 @@
       align-items: center;
       display: -webkit-flex;
     }
+    .edu-txt-center {
+      text-align: center !important;
+    }
+    .newTable{
+      background-color: #F0F5FF;
+      position: relative;
+      height: 100vh;
+      text-align: center;
+    }
+    .newMargin{
+      position: absolute;
+      left: 0;
+      bottom: 0;
+      width: 100%;
+    }
+
+    .mainImg {
+        position: absolute;
+        width: 100%;
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        z-index: 10;
+    }
   </style>
   <script type="text/javascript">
     $(function(){
@@ -49,14 +90,21 @@
 <p>An error occurred on the page you were trying to access.<br />
 If you continue to experience problems please contact your Trustie administrator for assistance.</p>
 <p>If you are the Trustie administrator, check your log files for details about the error.</p> -->
-<div class="verticalCenter">
-  <div class="edu-txt-center">
-    <img src="/images/warn/pic_500.jpg" >
-    <p class="font-18 mt40">您可以稍后尝试&nbsp;
-      您可以稍后尝试&nbsp;<a href="javascript:history.back()" class="color-blue">返回上页</a>，或者&nbsp;
-      <a target="_blank" href="//shang.qq.com/wpa/qunwpa?idkey=2f2043d88c1bd61d182b98bf1e061c6185e23055bec832c07d8148fe11c5a6cd" class="color-blue">QQ反馈>></a>
-    </p>
-  </div>
+<div class="newTable clearfix">
+    <div class="mainImg">
+        <img src="images/warn/pic_500.jpg" width="639px"/>
+        <div class="font-16 mt56" style="text-align: center;">
+            <p>服务器异常，请稍后重试</p>
+            您可尝试<a href="javascript:location.reload();" class="color-blue">刷新页面</a>或<a href="/explore"
+                                                                                       class="color-blue">返回首页</a>，也可以通过
+            <a target="_blank"
+               href="https://qm.qq.com/cgi-bin/qm/qr?k=YVGUhY7uK8ovpyd7tG_lHe2qGZ63LOij&jump_from=webapi"
+               class="color-blue">QQ</a>向我们反馈
+        </div>
+    </div>
+    <div class="newMargin">
+      <img src="images/warn/pic_bg.png" width="100%" height="292px"/>
+    </div>
 </div>
 </body>
 </html>