From ae7c3b715ec04fb307662e61161cff3e958d3934 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 19 Jun 2018 16:33:01 +0800
Subject: [PATCH] no message

Former-commit-id: 3809b566a7005544711ff11f6e39159cd06b796a [formerly 3809b566a7005544711ff11f6e39159cd06b796a [formerly 3809b566a7005544711ff11f6e39159cd06b796a [formerly 3809b566a7005544711ff11f6e39159cd06b796a [formerly 0dd1512f08621038c15ea0acc550c3a9cba0187e [formerly 307ea13875809a6e76d348ee37546374ac3b21eb]]]]]
Former-commit-id: f48ac9e19b06d139675694f5ce6463533ee0c2db
Former-commit-id: 81727e7d01546f0a0c99ebcffa8c748e4bb7ccc3
Former-commit-id: 5f049d0637655836ffbdf679622d87a7789ff563 [formerly 87f7c05f7d8ed6fb3c6f2317ff6a2bddb9c03f59]
Former-commit-id: eb0590ce91b1369c2a4457d783233e73cb29b764
Former-commit-id: 0c145df5aa2b9cef2f320f053bb6727b36a1963e
Former-commit-id: 1634bb2eb72c32dcf51dfe57ddd2b8a38b2ed2df
Former-commit-id: 4c0d469985f8a39773be311cd04b36c921a9f4a1
Former-commit-id: b7848744df40b995b00316a57633e3bfc6f7f782
---
 design.sketch.REMOVED.git-id                  |  2 +-
 docs/zh/guide/change-log.md                   |  2 ++
 src/pages/core/404/index.vue                  | 24 +++++++++++++++++++
 src/router/index.js.REMOVED.git-id            |  2 +-
 .../page/404/cover@2x.png.REMOVED.git-id      |  1 +
 5 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/core/404/index.vue
 create mode 100644 static/image/page/404/cover@2x.png.REMOVED.git-id

diff --git a/design.sketch.REMOVED.git-id b/design.sketch.REMOVED.git-id
index d1b872e8..5902db6b 100644
--- a/design.sketch.REMOVED.git-id
+++ b/design.sketch.REMOVED.git-id
@@ -1 +1 @@
-4b819d117b3b7e87effa763dbb04ba3280622cf1
\ No newline at end of file
+161855f41fee4ef5f7f2cf7f5285cd68edea3007
\ No newline at end of file
diff --git a/docs/zh/guide/change-log.md b/docs/zh/guide/change-log.md
index eb241631..22370e5c 100644
--- a/docs/zh/guide/change-log.md
+++ b/docs/zh/guide/change-log.md
@@ -27,6 +27,8 @@
 * [ 修复 ] 主题设置失效bug
 * [ 修复 ] router守卫验证登陆部分代码修改
 * [ 修复 ] d2-container 组件改为同步注册（之前的异步注册会有 mounted 生命周期问题，即 slot 内的页面在 mounted 生命周期内拿不到 dom）
+* [ 修复 ] d2-container 组件重构 flex 布局
+* [ 新增 ] 404 page
 
 ## v1.0.0
 
diff --git a/src/pages/core/404/index.vue b/src/pages/core/404/index.vue
new file mode 100644
index 00000000..7bc892c7
--- /dev/null
+++ b/src/pages/core/404/index.vue
@@ -0,0 +1,24 @@
+<template>
+  <div class="page-404">
+    <img src="/static/image/page/404/cover@2x.png">
+    <el-button class="d2-mt" @click="$router.replace({ path: '/' })">
+      返回首页
+    </el-button>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.page-404 {
+  background-color: #555555;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+  img {
+    width: 196px;
+    user-select: none;
+  }
+}
+</style>
+
diff --git a/src/router/index.js.REMOVED.git-id b/src/router/index.js.REMOVED.git-id
index 093d2dea..379cbd2d 100644
--- a/src/router/index.js.REMOVED.git-id
+++ b/src/router/index.js.REMOVED.git-id
@@ -1 +1 @@
-d7679ad7cc0f1a79073949aee6e15694c6858000
\ No newline at end of file
+ddf919108dc68f1f7811c033e619dd82d94ef14c
\ No newline at end of file
diff --git a/static/image/page/404/cover@2x.png.REMOVED.git-id b/static/image/page/404/cover@2x.png.REMOVED.git-id
new file mode 100644
index 00000000..79cb9eea
--- /dev/null
+++ b/static/image/page/404/cover@2x.png.REMOVED.git-id
@@ -0,0 +1 @@
+139f15ecdee8d06f66d7fb57a30f6ec9e76b6103
\ No newline at end of file