diff --git a/src/components/Catch/Table/index.vue b/src/components/Catch/Table/index.vue
index 8c77e327efc643b4e62406d2620c3b71da273cf6..0366af84590210b7856ddf5a508bdf70c7d727a0 100644
--- a/src/components/Catch/Table/index.vue
+++ b/src/components/Catch/Table/index.vue
@@ -51,7 +51,7 @@
       </div>
       <el-table
         :key="updateKey"
-        v-loading="loading"
+        v-loading="tableLoading"
         :data="source"
         style="width: 100%"
         v-bind="$attrs"
diff --git a/src/components/Catch/Table/mixin/operete.js b/src/components/Catch/Table/mixin/operete.js
index 22ebe886150a1d0047f49e8ef351cf7c32fd04dc..17db59b7b68335446112c504be9c37f44dd30260 100644
--- a/src/components/Catch/Table/mixin/operete.js
+++ b/src/components/Catch/Table/mixin/operete.js
@@ -5,14 +5,22 @@ export default {
   methods: {
     // 列表
     getList() {
+      !this.tableLoading && this.setTableLoading()
       // 这里的判断防止 table 的 api route 是异步获取，在页面渲染的时候没有获取到，导致列表数据无法获取
       if (this.apiRoute) {
         this.$http.get(this.apiRoute, { params: this.queryParams }).then(response => {
+          this.tableLoading && this.setTableLoading()
           this.source = response.data
           this.handlePaginateResponse(response)
+        }).catch(e => {
+          this.tableLoading && this.setTableLoading()
         })
       }
     },
+    // 设置tableLoading状态
+    setTableLoading() {
+      this.tableLoading = !this.tableLoading
+    },
     // 创建
     create(formData) {
       this.$http.post(this.apiRoute, formData.form).then(response => {
diff --git a/src/components/Catch/Table/mixin/tableData.js b/src/components/Catch/Table/mixin/tableData.js
index 15a3826681da6cbea402e78543a75d7715e2841c..579cb7be8b79d208b00ec13c567169f0bc66ba5d 100644
--- a/src/components/Catch/Table/mixin/tableData.js
+++ b/src/components/Catch/Table/mixin/tableData.js
@@ -12,6 +12,7 @@ export default {
       },
       updateKey: 0,
       showDialog: false,
+      tableLoading: this.loading,
       source: [],
       pagination: {
         currentPage: 1,
diff --git a/src/components/Catch/index.js b/src/components/Catch/index.js
index c13bf9fd4cfdbba875170a634d5a04c6bdb4f8fa..53b433a9155d0a70d44d748176d3c41de5351e11 100644
--- a/src/components/Catch/index.js
+++ b/src/components/Catch/index.js
@@ -16,7 +16,7 @@ import copy from '@/components/Catch/Table/columns/copy'
 import formCreate from '@form-create/element-ui'
 import VueHighlightJS from 'vue-highlightjs'
 import store from '@/store'
-import router from '@/router'
+import router, { resetRouter } from '@/router'
 
 import request from '@/utils/request'
 
@@ -142,6 +142,7 @@ class CatchAdmin {
       store.dispatch('permission/generateRoutes', [roles, permissions]).then(routes => {
         if (!routes) new Error('accessRoutes error!')
         // 动态加入路由
+        resetRouter()
         router.addRoutes(routes)
       })
     })
@@ -205,6 +206,7 @@ class CatchAdmin {
       method: 'delete'
     })
   }
+
   closeTagView(route, to) {
     store.dispatch('tagsView/delView', route).then(() => {
       router.push({
diff --git a/src/components/Tinymce/index.vue b/src/components/Tinymce/index.vue
index 6b890fac122981f2847be415dbb73c6223720c0a..ab5669adff3ebe34fd35b4cd10f19aac6bec8b93 100644
--- a/src/components/Tinymce/index.vue
+++ b/src/components/Tinymce/index.vue
@@ -1,5 +1,6 @@
 <template>
   <div
+    v-loading="loading"
     :class="{fullscreen:fullscreen}"
     class="tinymce-container"
     :style="{width:containerWidth}"
@@ -97,7 +98,8 @@ export default {
         'zh': 'zh_CN',
         'es': 'es_MX',
         'ja': 'ja'
-      }
+      },
+      loading: false
     }
   },
   computed: {
@@ -144,6 +146,7 @@ export default {
     },
     initTinymce() {
       const _this = this
+      _this.loading = true
       window.tinymce.init({
         selector: `#${this.tinymceId}`,
         language: this.languageTypeList[this.language],
@@ -165,6 +168,7 @@ export default {
         link_title: false,
         nonbreaking_force_tab: true, // inserting nonbreaking space &nbsp; need Nonbreaking Space Plugin
         init_instance_callback: editor => {
+          _this.loading = false
           if (_this.value) {
             editor.setContent(_this.value)
           }
@@ -180,7 +184,7 @@ export default {
           editor.on('FullscreenStateChanged', (e) => {
             _this.fullscreen = e.state
           })
-        },
+        }
       })
     },
     destroyTinymce() {
@@ -197,7 +201,7 @@ export default {
       window.tinymce.get(this.tinymceId).setContent(value)
     },
     getContent() {
-      window.tinymce.get(this.tinymceId).getContent()
+      return window.tinymce.get(this.tinymceId).getContent()
     },
     imageSuccessCBK(arr) {
       arr.forEach(v => window.tinymce.get(this.tinymceId).insertContent(`<img class="wscnph" src="${v.url}" >`))
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index e2414e46fdeaa4523568d0c7fd17fc12f26bf9e2..895b714646f6c3fb1e38a18ca785b0457c1d4552 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -43,9 +43,11 @@ const mutations = {
 const actions = {
   // user login
   login({ commit }, userInfo) {
-    const { email, password } = userInfo
+    // const { email, password } = userInfo
+    const { username, password } = userInfo
     return new Promise((resolve, reject) => {
-      login({ email: email.trim(), password: password }).then(response => {
+      // login({ email: email.trim(), password: password }).then(response => {
+      login({ username: username.trim(), password: password }).then(response => {
         const data = response.data
         commit('SET_TOKEN', data.token)
         setToken(data.token)
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 1acf75eb7a08964272dff5619ab462dfcdb6633e..b49b40521fe2d34ab4f412ee943825a174b26c6e 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -6,12 +6,14 @@
           <h3 class="title" style="text-align: center">CatchAdmin 后台管理系统</h3>
         </div>
         <h2>登 录</h2>
-        <el-divider/>
-        <el-form-item prop="email">
+        <el-divider />
+        <!--<el-form-item prop="email">-->
+        <el-form-item prop="username">
           <span class="svg-container" style="font-size: 16px;">
-            邮 箱
+            <!-- 邮 箱-->
+            用 户 名
           </span>
-          <el-input
+          <!-- <el-input
             ref="email"
             v-model="loginForm.email"
             prefix-icon="el-icon-user"
@@ -20,6 +22,16 @@
             type="text"
             tabindex="1"
             autocomplete="on"
+          />-->
+          <el-input
+            ref="username"
+            v-model="loginForm.username"
+            prefix-icon="el-icon-user"
+            placeholder="请输入用户名"
+            name="username"
+            type="text"
+            tabindex="1"
+            autocomplete="on"
           />
         </el-form-item>
 
@@ -46,8 +58,8 @@
           </el-form-item>
         </el-tooltip>
 
-        <el-button :loading="loading" type="primary" @click.native.prevent="handleLogin"><i class="el-icon-s-promotion"/> 登 录</el-button>
-        <el-divider></el-divider>
+        <el-button :loading="loading" type="primary" @click.native.prevent="handleLogin"><i class="el-icon-s-promotion" /> 登 录</el-button>
+        <el-divider />
         <div style="color: darkgrey; font-size: 14px;text-align: center;height: 50px;line-height: 50px;">
           <a href="https://catchadmin.com/">CatchAdmin 管理系统</a> @copyright 2018-2020
         </div>
@@ -64,11 +76,13 @@ export default {
   data() {
     return {
       loginForm: {
-        email: 'catch@admin.com',
+        // email: 'catch@admin.com',
+        username: 'admin',
         password: 'catchadmin'
       },
       loginRules: {
-        email: [{ required: true, type: 'email', trigger: 'blur' }],
+        // email: [{ required: true, type: 'email', trigger: 'blur' }],
+        username: [{ required: true, trigger: 'blur' }],
         password: [{ required: true, trigger: 'blur' }]
       },
       passwordType: 'password',
@@ -95,8 +109,10 @@ export default {
     // window.addEventListener('storage', this.afterQRScan)
   },
   mounted() {
-    if (this.loginForm.email === '') {
-      this.$refs.email.focus()
+    // if (this.loginForm.email === '') {
+    //   this.$refs.email.focus()
+    if (this.loginForm.username === '') {
+      this.$refs.username.focus()
     } else if (this.loginForm.password === '') {
       this.$refs.password.focus()
     }
diff --git a/src/views/permission/rules/index.vue b/src/views/permission/rules/index.vue
index b4354851bf5f367fd1194718ff12e8585ecd4be6..18868250a543cb34a584ae588ab39be7ffaa7521 100644
--- a/src/views/permission/rules/index.vue
+++ b/src/views/permission/rules/index.vue
@@ -64,6 +64,20 @@ export default {
         this.formCreate.rule[1]['control'][0]['rule'][3].on = { focus : this.selectIcon }
       })
     },
+    // 创建时打开radio
+    beforeCreate() {
+      const rule = this.formCreate.fApi.getRule('type')
+      rule.options.forEach(item => {
+        item.disabled = false
+      })
+    },
+    // 更新时关闭不匹配的radio
+    beforeUpdate(row) {
+      const rule = this.formCreate.fApi.getRule('type')
+      rule.options.forEach(item => {
+        item.disabled = row.type !== item.value
+      })
+    },
     beforeSubmit(row) {
       if (row.form.parent_id instanceof Array) {
         row.form.parent_id = row.form.parent_id.length > 0 ? row.form.parent_id.pop() : 0