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