diff --git a/src/layout/index.vue b/src/layout/index.vue
index 99363a1..e55c9cd 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -275,7 +275,13 @@
 				this.nextMenu = this.filterUrl(route.children);
 				if((!route.children || route.children.length == 0) && ( route.meta.type=='iframe' || route.component)){
 					this.$router.push({path: route.path})
+					return ;
 				}
+				
+				if (route.children.length > 0) {
+					this.$router.push({path: route.children[0].path})
+				}
+
 			},
 			//转换外部链接的路由
 			filterUrl(map){
diff --git a/src/views/system/log/index.vue b/src/views/system/log/index.vue
index b72aa3f..5b2075a 100644
--- a/src/views/system/log/index.vue
+++ b/src/views/system/log/index.vue
@@ -1,8 +1,7 @@
 <template>
 	<el-container>
 		<el-aside width="220px">
-			<el-tree ref="category" class="menu" node-key="label" :data="category" :default-expanded-keys="['系统日志']" current-node-key="系统日志" :highlight-current="true" :expand-on-click-node="false">
-			</el-tree>
+			<el-tree ref="category" class="menu" node-key="label" :data="category" :default-expanded-keys="['系统日志']" current-node-key="系统日志" :highlight-current="true" :expand-on-click-node="false"> </el-tree>
 		</el-aside>
 		<el-container>
 			<el-main class="nopadding">
@@ -98,25 +97,7 @@
 						barWidth: '15px'
 					}]
 				},
-				category: [
-					{
-						label: '系统日志',
-						children: [
-							{label: 'debug'},
-							{label: 'info'},
-							{label: 'warn'},
-							{label: 'error'},
-							{label: 'fatal'}
-						]
-					},
-					{
-						label: '应用日志',
-						children: [
-							{label: 'selfHelp'},
-							{label: 'WechatApp'}
-						]
-					}
-				],
+				category: [],
 				date: [],
 				data: [
 					[{id:1}]
@@ -127,7 +108,17 @@
 				}
 			}
 		},
+		mounted() {
+			this.getType();
+		},
 		methods: {
+			getType(){
+				this.$http.get('log/admin/types', {}, { cacheparameters: true }).then((res) => {
+				    if (res.code == 200) {
+				    	this.category, res.data
+				    }
+				});
+			},
 			upsearch(){
 
 			},
diff --git a/src/views/user/group/index.vue b/src/views/user/group/index.vue
index 7fa171c..ddcab49 100644
--- a/src/views/user/group/index.vue
+++ b/src/views/user/group/index.vue
@@ -16,6 +16,7 @@
 
 						<el-table-column prop="title" label="名称" width="180" />
 						<el-table-column prop="alias" label="别名" width="180" />
+						<el-table-column prop="alias" label="用户数量" width="180" />
 
 						<el-table-column prop="status" label="状态" width="90">
 							<template #default="scope">
@@ -101,12 +102,12 @@
 						key: "type",
 						options: [
 							{
-								label: "系统组",
+								label: "系统管理组",
 								value: "system",
 								icon: "el-icon-flag"
 							},
 							{
-								label: "用户组",
+								label: "用户等级套餐组",
 								value: "member",
 								icon: "el-icon-bottom-left"
 							},
diff --git a/src/views/user/index/index.vue b/src/views/user/index/index.vue
index 27ecce4..b79d52a 100644
--- a/src/views/user/index/index.vue
+++ b/src/views/user/index/index.vue
@@ -19,48 +19,48 @@
 			</el-container>
 		</el-aside>
 		<el-container>
-				<el-header>
-					<div class="left-panel">
-						<el-button type="primary" icon="el-icon-plus" @click="add"></el-button>
-						<el-button type="danger" plain icon="el-icon-delete" :disabled="selection.length==0" @click="batch_del"></el-button>
-						<el-button type="primary" plain :disabled="selection.length==0">分配角色</el-button>
-						<el-button type="primary" plain :disabled="selection.length==0">密码重置</el-button>
+			<el-header>
+				<div class="left-panel">
+					<el-button type="primary" icon="el-icon-plus" @click="add"></el-button>
+					<el-button type="danger" plain icon="el-icon-delete" :disabled="selection.length==0" @click="batch_del"></el-button>
+					<el-button type="primary" plain :disabled="selection.length==0">分配角色</el-button>
+					<el-button type="primary" plain :disabled="selection.length==0">密码重置</el-button>
+				</div>
+				<div class="right-panel">
+					<div class="right-panel-search">
+						<el-input v-model="search.name" placeholder="登录账号 / 姓名" clearable></el-input>
+						<el-button type="primary" icon="el-icon-search" @click="upsearch"></el-button>
 					</div>
-					<div class="right-panel">
-						<div class="right-panel-search">
-							<el-input v-model="search.name" placeholder="登录账号 / 姓名" clearable></el-input>
-							<el-button type="primary" icon="el-icon-search" @click="upsearch"></el-button>
-						</div>
-					</div>
-				</el-header>
-				<el-main class="nopadding">
-					<xTable ref="table" @selection-change="selectionChange" stripe remoteSort remoteFilter>
-						<el-table-column type="selection" width="50"></el-table-column>
-						<el-table-column label="UID" prop="uid" width="80" sortable='custom'></el-table-column>
-						<el-table-column label="头像" width="80" column-key="filterAvatar" :filters="[{text: '已上传', value: '1'}, {text: '未上传', value: '0'}]">
-							<template #default="scope">
-								<el-avatar :src="scope.row.avatar" size="small"></el-avatar>
-							</template>
-						</el-table-column>
-						<el-table-column label="登录账号" prop="nickname" width="150" sortable='custom' column-key="filterUserName" :filters="[{text: '系统账号', value: '1'}, {text: '普通账号', value: '0'}]"></el-table-column>
-						<el-table-column label="姓名" prop="name" width="150" sortable='custom'></el-table-column>
-						<el-table-column label="所属角色" prop="groupName" width="200" sortable='custom'></el-table-column>
-						<el-table-column label="加入时间" prop="date" width="170" sortable='custom'></el-table-column>
-						<el-table-column label="操作" fixed="right" align="right" width="160">
-							<template #default="scope">
-								<el-button-group>
-									<el-button text type="primary" size="small" @click="table_show(scope.row, scope.$index)">查看</el-button>
-									<el-button text type="primary" size="small" @click="table_edit(scope.row, scope.$index)">编辑</el-button>
-									<el-popconfirm title="确定删除吗？" @confirm="table_del(scope.row, scope.$index)">
-										<template #reference>
-											<el-button text type="primary" size="small">删除</el-button>
-										</template>
-									</el-popconfirm>
-								</el-button-group>
-							</template>
-						</el-table-column>
-					</xTable>
-				</el-main>
+				</div>
+			</el-header>
+			<el-main class="nopadding">
+				<xTable ref="table" @selection-change="selectionChange" stripe remoteSort remoteFilter>
+					<el-table-column type="selection" width="50"></el-table-column>
+					<el-table-column label="UID" prop="uid" width="80" sortable='custom'></el-table-column>
+					<el-table-column label="头像" width="80" column-key="filterAvatar" :filters="[{text: '已上传', value: '1'}, {text: '未上传', value: '0'}]">
+						<template #default="scope">
+							<el-avatar :src="scope.row.avatar" size="small"></el-avatar>
+						</template>
+					</el-table-column>
+					<el-table-column label="登录账号" prop="nickname" width="150" sortable='custom' column-key="filterUserName" :filters="[{text: '系统账号', value: '1'}, {text: '普通账号', value: '0'}]"></el-table-column>
+					<el-table-column label="姓名" prop="name" width="150" sortable='custom'></el-table-column>
+					<el-table-column label="所属角色" prop="groupName" width="200" sortable='custom'></el-table-column>
+					<el-table-column label="加入时间" prop="date" width="170" sortable='custom'></el-table-column>
+					<el-table-column label="操作" fixed="right" align="right" width="160">
+						<template #default="scope">
+							<el-button-group>
+								<el-button text type="primary" size="small" @click="table_show(scope.row, scope.$index)">查看</el-button>
+								<el-button text type="primary" size="small" @click="table_edit(scope.row, scope.$index)">编辑</el-button>
+								<el-popconfirm title="确定删除吗？" @confirm="table_del(scope.row, scope.$index)">
+									<template #reference>
+										<el-button text type="primary" size="small">删除</el-button>
+									</template>
+								</el-popconfirm>
+							</el-button-group>
+						</template>
+					</el-table-column>
+				</xTable>
+			</el-main>
 		</el-container>
 	</el-container>
 	<save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSuccess" @closed="dialog.save=false"></save-dialog>