diff --git a/package.json b/package.json
index 22f87ae..bb5a2e9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "saber-admin",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
diff --git a/src/api/system/topmenu.js b/src/api/system/topmenu.js
new file mode 100644
index 0000000..4b280a3
--- /dev/null
+++ b/src/api/system/topmenu.js
@@ -0,0 +1,77 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/blade-system/topmenu/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const getDetail = (id) => {
+  return request({
+    url: '/api/blade-system/topmenu/detail',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+export const remove = (ids) => {
+  return request({
+    url: '/api/blade-system/topmenu/remove',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const add = (row) => {
+  return request({
+    url: '/api/blade-system/topmenu/submit',
+    method: 'post',
+    data: row
+  })
+}
+
+export const update = (row) => {
+  return request({
+    url: '/api/blade-system/topmenu/submit',
+    method: 'post',
+    data: row
+  })
+}
+
+export const grantTree = () => {
+  return request({
+    url: '/api/blade-system/menu/grant-top-tree',
+    method: 'get',
+  })
+}
+
+export const getTopTree = (topMenuIds) => {
+  return request({
+    url: '/api/blade-system/menu/top-tree-keys',
+    method: 'get',
+    params: {
+      topMenuIds,
+    }
+  })
+}
+
+export const grant = (topMenuIds, menuIds) => {
+  return request({
+    url: '/api/blade-system/topmenu/grant',
+    method: 'post',
+    params: {
+      topMenuIds,
+      menuIds,
+    }
+  })
+}
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index e38857b..ee36c2b 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -43,7 +43,7 @@ const user = {
   actions: {
     //根据用户名登录
     LoginByUsername({ commit }, userInfo) {
-      return new Promise((resolve) => {
+      return new Promise((resolve, reject) => {
         loginByUsername(userInfo.tenantId, userInfo.username, userInfo.password, userInfo.type).then(res => {
           const data = res.data;
           if (data.error_description) {
@@ -59,6 +59,8 @@ const user = {
             commit('CLEAR_LOCK');
           }
           resolve();
+        }).catch(error => {
+          reject(error);
         })
       })
     },
diff --git a/src/views/system/topmenu.vue b/src/views/system/topmenu.vue
new file mode 100644
index 0000000..87d6171
--- /dev/null
+++ b/src/views/system/topmenu.vue
@@ -0,0 +1,294 @@
+<template>
+  <basic-container>
+    <avue-crud :option="option"
+               :data="data"
+               :page="page"
+               :permission="permissionList"
+               :before-open="beforeOpen"
+               v-model="form"
+               @row-update="rowUpdate"
+               @row-save="rowSave"
+               @row-del="rowDel"
+               @search-change="searchChange"
+               @search-reset="searchReset"
+               @selection-change="selectionChange"
+               @current-change="currentChange"
+               @size-change="sizeChange"
+               @on-load="onLoad">
+      <template slot="menuLeft">
+        <el-button type="danger"
+                   size="small"
+                   icon="el-icon-delete"
+                   plain
+                   v-if="permission.topmenu_delete"
+                   @click="handleDelete">删 除
+        </el-button>
+        <el-button size="small"
+                   icon="el-icon-delete"
+                   @click="handleMenuSetting"
+                   v-if="permission.topmenu_setting"
+                   plain>菜单配置
+        </el-button>
+      </template>
+      <template slot-scope="{row}"
+                slot="source">
+        <div style="text-align:center">
+          <i :class="row.source"></i>
+        </div>
+      </template>
+    </avue-crud>
+    <el-dialog title="下级菜单配置"
+               :visible.sync="box"
+               width="345px">
+
+      <el-tree :data="menuGrantList"
+               show-checkbox
+               node-key="id"
+               ref="treeMenu"
+               :default-checked-keys="menuTreeObj"
+               :props="props">
+      </el-tree>
+
+      <span slot="footer"
+            class="dialog-footer">
+        <el-button @click="box = false">取 消</el-button>
+        <el-button type="primary"
+                   @click="submit">确 定</el-button>
+      </span>
+    </el-dialog>
+  </basic-container>
+</template>
+
+<script>
+  import {getList, getDetail, add, update, remove, grant, grantTree, getTopTree} from "@/api/system/topmenu";
+  import {mapGetters} from "vuex";
+  import iconList from "@/config/iconList";
+
+  export default {
+    data() {
+      return {
+        form: {},
+        box: false,
+        query: {},
+        props: {
+          label: "title",
+          value: "key"
+        },
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        selectionList: [],
+        menuGrantList: [],
+        menuTreeObj: [],
+        option: {
+          tip: false,
+          border: true,
+          index: true,
+          viewBtn: true,
+          selection: true,
+          dialogWidth: 200,
+          dialogHeight: 200,
+          column: [
+            {
+              label: "菜单名",
+              prop: "name",
+              search: true,
+              rules: [{
+                required: true,
+                message: "请输入菜单名",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "菜单图标",
+              prop: "source",
+              type: "icon-select",
+              slot: true,
+              iconList: iconList,
+              rules: [
+                {
+                  required: true,
+                  message: "请输入菜单图标",
+                  trigger: "click"
+                }
+              ]
+            },
+            {
+              label: "菜单编号",
+              prop: "code",
+              search: true,
+              rules: [{
+                required: true,
+                message: "请输入菜单编号",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "菜单排序",
+              prop: "sort",
+              type: "number",
+              rules: [{
+                required: true,
+                message: "请输入菜单排序",
+                trigger: "blur"
+              }]
+            },
+          ]
+        },
+        data: []
+      };
+    },
+    computed: {
+      ...mapGetters(["permission"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.topmenu_add, false),
+          viewBtn: this.vaildData(this.permission.topmenu_view, false),
+          delBtn: this.vaildData(this.permission.topmenu_delete, false),
+          editBtn: this.vaildData(this.permission.topmenu_edit, false)
+        };
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+    methods: {
+      submit() {
+        const menuList = this.$refs.treeMenu.getCheckedKeys().join(",");
+        grant(this.ids, menuList).then(() => {
+          this.box = false;
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          this.onLoad(this.page);
+        });
+      },
+      rowSave(row, loading, done) {
+        add(row).then(() => {
+          loading();
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        }, error => {
+          done();
+          console.log(error);
+        });
+      },
+      rowUpdate(row, index, loading, done) {
+        update(row).then(() => {
+          loading();
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        }, error => {
+          done();
+          console.log(error);
+        });
+      },
+      rowDel(row) {
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(row.id);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          });
+      },
+      handleDelete() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(this.ids);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$refs.crud.toggleSelection();
+          });
+      },
+      handleMenuSetting() {
+        if (this.selectionList.length !== 1) {
+          this.$message.warning("只能选择一条数据");
+          return;
+        }
+        this.menuTreeObj = [];
+        grantTree()
+          .then(res => {
+            this.menuGrantList = res.data.data.menu;
+            getTopTree(this.ids).then(res => {
+              this.menuTreeObj = res.data.data.menu;
+              this.box = true;
+            });
+          });
+      },
+      beforeOpen(done, type) {
+        if (["edit", "view"].includes(type)) {
+          getDetail(this.form.id).then(res => {
+            this.form = res.data.data;
+          });
+        }
+        done();
+      },
+      searchReset() {
+        this.query = {};
+        this.onLoad(this.page);
+      },
+      searchChange(params) {
+        this.query = params;
+        this.onLoad(this.page, params);
+      },
+      selectionChange(list) {
+        this.selectionList = list;
+      },
+      currentChange(currentPage) {
+        this.page.currentPage = currentPage;
+      },
+      sizeChange(pageSize) {
+        this.page.pageSize = pageSize;
+      },
+      onLoad(page, params = {}) {
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+        });
+      }
+    }
+  };
+</script>
+
+<style>
+  .none-border {
+    border: 0;
+    background-color: transparent !important;
+  }
+</style>