Merge branch 'developer/yanjiaxu' into develop

src/components/TopNav/index.vue

 <template>
   <el-menu
+    style="margin-bottom: 30px"
     :default-active="activeMenu"
     mode="horizontal"
     @select="handleSelect"

src/views/system/role/index.vue

@@ -528,10 +528,11 @@ export default {
     handleStatusChange(row) {
       const text = row.status === '0' ? '启用' : '停用'
       this.$modal
-        .confirm('确认要"' + text + '""' + row.roleName + '"角色吗？', {
+        .confirm('确认要"' + text + '""' + row.roleName + '"角色吗？' ,{
+          type: 'warning',
+          title: text,
           closeOnClickModal: false
         })
-
         .then(function () {
           return changeRoleStatus(row.roleId, row.status)
         })

src/views/system/user/index.vue

@@ -678,6 +678,8 @@ export default {
       const text = row.status === '0' ? '启用' : '停用'
       this.$modal
         .confirm('确认要"' + text + '""' + row.userName + '"用户吗？', {
+          type: 'warning',
+          title: text,
           closeOnClickModal: false
         })
         .then(function () {