Merge remote-tracking branch 'origin/develop' into develop

frontend/src/views/404.vue

@@ -10,7 +10,7 @@
       <div class="bullshit">
         <div class="bullshit__oops">OOPS!</div>
         <div class="bullshit__info">版权所有
-          <a class="link-type" href="https://wallstreetcn.com" target="_blank">华尔街见闻</a>
+          <a class="link-type" href="https://crawlab.cn/" target="_blank">Crawlab Team</a>
         </div>
         <div class="bullshit__headline">{{ message }}</div>
         <div class="bullshit__info">请检查您输入的网址是否正确，请点击以下按钮返回主页或者发送错误报告</div>
@@ -26,8 +26,13 @@ export default {
   name: 'Page404',
   computed: {
     message () {
-      return '网管说这个页面你不能进......'
+      return '这个页面似乎不存在......'
     }
+  },
+  mounted () {
+    // remove loading-placeholder
+    const elLoading = document.querySelector('#loading-placeholder')
+    elLoading.remove()
   }
 }
 </script>