diff --git a/pages/admin/tag/post/_tag_id.vue b/pages/admin/tag/post/_tag_id.vue
new file mode 100644
index 0000000..3439fe0
--- /dev/null
+++ b/pages/admin/tag/post/_tag_id.vue
@@ -0,0 +1,284 @@
+<template>
+  <el-row>
+    <el-col style="margin-bottom: 1rem;">
+      <el-breadcrumb separator-class="el-icon-arrow-right">
+        <el-breadcrumb-item :to="{ path: '/admin' }">首页</el-breadcrumb-item>
+        <el-breadcrumb-item :to="{ path: '/admin/tags' }">标签管理</el-breadcrumb-item>
+        <el-breadcrumb-item v-if="tag.idTag">编辑</el-breadcrumb-item>
+        <el-breadcrumb-item v-else>创建</el-breadcrumb-item>
+      </el-breadcrumb>
+    </el-col>
+    <el-col>
+      <el-form ref="form" :model="tag" label-width="80px">
+        <el-form-item label="标签名">
+          <el-input v-model="tag.tagTitle"></el-input>
+        </el-form-item>
+        <el-form-item label="URI">
+          <el-input v-model="tag.tagUri"></el-input>
+        </el-form-item>
+        <el-form-item label="图标">
+          <el-upload
+            class="avatar-uploader"
+            :action="tokenURL.URL"
+            :multiple="true"
+            :with-credentials="true"
+            :headers="uploadHeaders"
+            :show-file-list="false"
+            :on-success="handleAvatarSuccess"
+            :before-upload="beforeAvatarUpload">
+            <img v-if="tagIconPath" class="tag-brand-img" :src="tagIconPath">
+            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+          </el-upload>
+        </el-form-item>
+        <el-form-item label="状态">
+          <el-switch
+            v-model="tag.tagStatus"
+            active-text="正常"
+            inactive-text="禁用"
+            active-value="0"
+            inactive-value="1">
+          </el-switch>
+        </el-form-item>
+        <el-form-item label="系统保留">
+          <el-switch
+            v-model="tag.tagReservation"
+            active-text="是"
+            inactive-text="否"
+            active-value="1"
+            inactive-value="0">
+          </el-switch>
+        </el-form-item>
+        <el-form-item label="描述">
+          <div id="contentEditor"></div>
+        </el-form-item>
+        <el-form-item class="text-right">
+          <el-button @click="updateTag" :loading="loading">提交</el-button>
+        </el-form-item>
+      </el-form>
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import Vue from "vue";
+
+export default {
+  name: "PostTag",
+  validate({params, store}) {
+    if (typeof params.tag_id === 'undefined') {
+      return true;
+    }
+    return params.tag_id && !isNaN(Number(params.tag_id))
+  },
+  fetch({store, params, error}) {
+    return Promise.all([
+      store.dispatch('tag/fetchPostDetail', params)
+        .catch(err => error({statusCode: 404}))
+    ])
+  },
+  computed: {
+    uploadHeaders() {
+      let token = this.$store.state.uploadHeaders;
+      return {'X-Upload-Token': token}
+    }
+  },
+  data() {
+    return {
+      tokenURL: {
+        URL: '',
+        token: ''
+      },
+      tagIconPath: '',
+      loading: false,
+      isEdit: false,
+      tag: {}
+    }
+  },
+  methods: {
+    _initEditor(data) {
+      let _ts = this;
+      let toolbar;
+      if (window.innerWidth < 768) {
+        toolbar = [
+          'emoji',
+          'headings',
+          'bold',
+          'italic',
+          'strike',
+          'link',
+          '|',
+          'list',
+          'ordered-list',
+          'check',
+          'outdent',
+          'indent',
+          '|',
+          'quote',
+          'line',
+          'code',
+          'inline-code',
+          'insert-before',
+          'insert-after',
+          '|',
+          'upload',
+          'record',
+          'table',
+          '|',
+          'undo',
+          'redo',
+          '|',
+          'edit-mode',
+          'content-theme',
+          'code-theme',
+          {
+            name: 'more',
+            toolbar: [
+              'fullscreen',
+              'both',
+              'format',
+              'preview',
+              'info',
+              'help',
+            ],
+          }]
+      }
+      return new Vue.Vditor(data.id, {
+        toolbar,
+        mode: 'sv',
+        tab: '\t',
+        cache: {
+          enable: this.$route.params.tag_id ? false : true,
+          id: this.$route.params.tag_id ? this.$route.params.tag_id : '',
+        },
+        after() {
+          _ts.contentEditor.setValue(data.value ? data.value : '');
+        },
+        preview: {
+          hljs: {
+            enable: true,
+            lineNumber: true,
+            style: 'github'
+          },
+          markdown: {
+            toc: true,
+          },
+          math: {
+            inlineDigit: true
+          },
+          delay: 500,
+          mode: data.mode,
+          /*url: `${process.env.Server}/api/console/markdown`,*/
+          parse: (element) => {
+            if (element.style.display === 'none') {
+              return
+            }
+            // LazyLoadImage();
+            // Vue.Vditor.highlightRender({style: 'github'}, element, this.contentEditor);
+          }
+        },
+        upload: {
+          max: 10 * 1024 * 1024,
+          url: this.tokenURL.URL,
+          linkToImgUrl: this.tokenURL.URL,
+          token: this.tokenURL.token,
+          filename: name => name.replace(/\?|\\|\/|:|\||<|>|\*|\[|\]|\s+/g, '-')
+        },
+        height: data.height,
+        counter: 102400,
+        resize: {
+          enable: data.resize,
+        },
+        lang: this.$store.state.locale,
+        placeholder: data.placeholder,
+      })
+    },
+    handleAvatarSuccess(res) {
+      let _ts = this;
+      if (res && res.data && res.data.url) {
+        let tag = _ts.tag;
+        tag.tagIconPath = res.data.url;
+        _ts.$set(_ts, 'tag', tag);
+        _ts.$set(_ts, 'tagIconPath', res.data.url);
+      } else {
+        _ts.$message.error('上传失败!');
+      }
+    },
+    beforeAvatarUpload(file) {
+      const isJPG = file.type === 'image/jpeg';
+      const isPNG = file.type === 'image/png';
+      const isLt2M = file.size / 1024 / 1024 < 2;
+
+      if (!(isJPG || isPNG)) {
+        this.$message.error('上传图标只能是 JPG 或者 PNG 格式!');
+      }
+      if (!isLt2M) {
+        this.$message.error('上传图标大小不能超过 2MB!');
+      }
+      return (isJPG || isPNG) && isLt2M;
+    },
+    async updateTag() {
+      let _ts = this;
+      _ts.$set(_ts, 'loading', true);
+      let tag = _ts.tag;
+      let id = tag.idTag;
+      let tagContent = _ts.contentEditor.getValue();
+      let tagContentHtml = await _ts.contentEditor.getHTML();
+      tag.tagDescription = tagContent;
+      tag.tagDescriptionHtml = tagContentHtml;
+      let title = id ? '更新' : '添加';
+      _ts.$axios[id ? '$put' : '$post']('/api/admin/tag/post', tag).then(function (res) {
+        if (res && res.message) {
+          _ts.$message.error(res.message);
+          _ts.$set(_ts, 'loading', false);
+        } else {
+          _ts.$message({
+            type: 'success',
+            message: title + '成功!'
+          });
+          _ts.$set(_ts, 'loading', false);
+          // _ts.getData();
+        }
+      })
+    }
+  },
+  mounted() {
+    let _ts = this;
+    this.$store.commit('setActiveMenu', 'postAdminTag');
+    this.$axios.$get('/api/upload/simple/token').then(function (res) {
+      if (res) {
+        _ts.$store.commit('setUploadHeaders', res.uploadToken);
+        _ts.$set(_ts, 'tokenURL', {
+          token: res.uploadToken || '',
+          URL: res.uploadURL || '',
+        })
+      }
+    });
+
+    let tag = _ts.$store.state.tag.detail.data;
+    _ts.$set(_ts, 'tag', JSON.parse(JSON.stringify(tag)));
+
+    Vue.nextTick(() => {
+      let tagDescription = '';
+      if (_ts.$route.params.tag_id) {
+        _ts.$set(_ts, 'isEdit', true);
+        tagDescription = _ts.tag.tagDescription
+      } else {
+        _ts.$set(_ts, 'isEdit', false);
+      }
+
+      _ts.contentEditor = _ts._initEditor({
+        id: 'contentEditor',
+        mode: 'both',
+        height: 480,
+        placeholder: '', //this.$t('inputContent', this.$store.state.locale)
+        resize: false,
+        value: tagDescription
+      });
+    })
+  }
+}
+</script>
+
+<style lang="scss">
+  @import "~vditor/src/assets/scss/index.scss";
+</style>
diff --git a/pages/admin/tag.vue b/pages/admin/tags.vue
similarity index 89%
rename from pages/admin/tag.vue
rename to pages/admin/tags.vue
index 6a31ecc..84b7212 100644
--- a/pages/admin/tag.vue
+++ b/pages/admin/tags.vue
@@ -47,7 +47,7 @@
   import {mapState} from 'vuex';
 
   export default {
-    name: "tag",
+    name: "tags",
     fetch({store, params, error}) {
       return Promise.all([
         store
@@ -58,7 +58,7 @@
     computed: {
       ...mapState({
         tags: state => state.tag.list.data.tags,
-        pagination: state => state.topic.list.data.pagination
+        pagination: state => state.tag.list.data.pagination
       })
     },
     methods: {
@@ -93,28 +93,19 @@
           page: page
         })
       },
-      onRouter(item,data) {
-        this.$router.push({
-          name: item,
-          params: data
-        })
-      },
       createTag() {
         this.$router.push({
-          name: 'admin-tag-post'
+          path: '/admin/tag/post/'
         })
       },
       updateTag(id) {
         this.$router.push({
-          name: 'admin-tag-post',
-          params: {
-            id: id
-          }
+          path: '/admin/tag/post/' + id
         })
       }
     },
     mounted() {
-      this.$store.commit("setActiveMenu", "admin-tag");
+      this.$store.commit("setActiveMenu", "admin-tags");
     }
   }
 </script>
diff --git a/store/tag.js b/store/tag.js
index bbf68f5..253186b 100644
--- a/store/tag.js
+++ b/store/tag.js
@@ -1,3 +1,5 @@
+import {ARTICLE_API_PATH} from "@/store/article";
+
 /**
  * @file 分类数据状态 / ES module
  * @module store/category
@@ -5,6 +7,7 @@
  */
 
 export const ADMIN_API_PATH = '/api/admin'
+export const TAG_API_PATH = '/api/tag'
 
 const getDefaultListData = () => {
   return {
@@ -12,6 +15,13 @@ const getDefaultListData = () => {
     pagination: {}
   }
 }
+const getDefaultData = () => {
+  return {
+    tagIconPath: '',
+    tagStatus: '0',
+    tagReservation: '0'
+  }
+}
 
 export const state = () => {
   return {
@@ -20,6 +30,10 @@ export const state = () => {
     list: {
       fetching: false,
       data: getDefaultListData()
+    },
+    detail: {
+      fetching: false,
+      data: getDefaultData()
     }
   }
 }
@@ -34,8 +48,11 @@ export const mutations = {
   updateFetching(state, action) {
     state.fetching = action
   },
+  updateDetailFetching(state, action) {
+    state.detail.fetching = action
+  },
   updateDetailData(state, action) {
-    state.data = action
+    state.detail.data = action
   }
 }
 
@@ -72,5 +89,40 @@ export const actions = {
       .catch(error => {
         commit('updateFetching', false)
       })
+  },
+
+  // 获取文章详情
+  fetchPostDetail({ commit }, params = {}) {
+    // const delay = fetchDelay(
+    //   isBrowser
+    // )
+    // if (isBrowser) {
+    //   Vue.nextTick(() => {
+    //     window.scrollTo(0, 300);
+    //   })
+    // }
+
+    if (typeof params.tag_id === 'undefined') {
+      commit('updateDetailData', getDefaultData())
+      return;
+    }
+    commit('updateDetailFetching', true)
+    // commit('updateDetailData', {})
+    return this.$axios
+      .$get(`${ADMIN_API_PATH}/tag/detail/${params.tag_id}`)
+      .then(response => {
+        return new Promise(resolve => {
+          commit('updateDetailData', response)
+          commit('updateDetailFetching', false)
+          resolve(response)
+          // delay(() => {
+          //   resolve(response)
+          // })
+        })
+      })
+      .catch(error => {
+        commit('updateDetailFetching', false)
+        return Promise.reject(error)
+      })
   }
 }