diff --git a/src/api/post.js b/src/api/post.js
index b580ef103..202d322e4 100644
--- a/src/api/post.js
+++ b/src/api/post.js
@@ -19,6 +19,13 @@ postApi.query = params => {
   })
 }
 
+postApi.get = postId => {
+  return service({
+    url: `${baseUrl}/${postId}`,
+    method: 'get'
+  })
+}
+
 postApi.create = postToCreate => {
   return service({
     url: baseUrl,
diff --git a/src/views/post/PostEdit.vue b/src/views/post/PostEdit.vue
index f88221322..b20eb3f4a 100644
--- a/src/views/post/PostEdit.vue
+++ b/src/views/post/PostEdit.vue
@@ -214,6 +214,18 @@ export default {
     this.loadTags()
     this.loadCategories()
   },
+  beforeRouteEnter(to, from, next) {
+    // Get post id from query
+    const postId = to.query.postId
+
+    next(vm => {
+      if (postId) {
+        postApi.get(postId).then(response => {
+          vm.postToStage = response.data.data
+        })
+      }
+    })
+  },
   methods: {
     loadTags() {
       tagApi.listAll(true).then(response => {
@@ -242,7 +254,7 @@ export default {
         postApi.create(this.postToStage).then(response => {
           this.$log.debug('Created post', response.data.data)
           this.$message.success('文章创建成功')
-          this.postToStage.id = response.data.data.id
+          this.postToStage = response.data.data
         })
       }
     },
diff --git a/src/views/post/PostList.vue b/src/views/post/PostList.vue
index 468f52e4e..54274966e 100644
--- a/src/views/post/PostList.vue
+++ b/src/views/post/PostList.vue
@@ -149,16 +149,16 @@
 
           <span
             slot="action"
-            slot-scope="text, record"
+            slot-scope="text, post"
           >
             <a
               href="javascript:;"
-              @click="editPost(record.id)"
+              @click="onEditClick(post)"
             >编辑</a>
             <a-divider type="vertical" />
             <a
               href="javascript:;"
-              @click="deletePost(record.id)"
+              @click="deletePost(post.id)"
             >删除</a>
           </span>
         </a-table>
@@ -294,8 +294,8 @@ export default {
         this.categories = response.data.data
       })
     },
-    editPost(id) {
-      this.$message.success('编辑')
+    onEditClick(post) {
+      this.$router.push({ name: 'PostEdit', query: { postId: post.id } })
     },
     deletePost(id) {
       this.$message.success('删除')