diff --git a/src/views/user/role.vue b/src/views/user/role.vue
index 5a0c4c7..91eb18e 100644
--- a/src/views/user/role.vue
+++ b/src/views/user/role.vue
@@ -24,11 +24,6 @@
 
 					<el-table-column label="排序" prop="sort" width="80"></el-table-column>
 
-					<!-- <el-table-column label="状态" prop="status" width="80">
-						<template #default="scope">
-							<el-switch v-model="scope.row.status" @change="changeSwitch($event, scope.row)" :loading="scope.row.$switch_status" active-value="1" inactive-value="0"></el-switch>
-						</template>
-					</el-table-column> -->
 
 					<el-table-column prop="message" label="备注" width="180" />
 
@@ -109,7 +104,7 @@
 					save: false,
 					permission: false
 				},
-				api:'system/user/roleList'
+				api:'system/group/lists'
 			}
 		},
 		computed: {
@@ -121,6 +116,10 @@
 
 		},
 		methods: {
+			//本地更新数据
+			handleSaveSuccess(){
+				this.$refs.table.refresh()
+			},
 			//添加
 			add(){
 				this.dialog.save = true
diff --git a/src/views/user/role/save.vue b/src/views/user/role/save.vue
index d7413ad..a540f5c 100644
--- a/src/views/user/role/save.vue
+++ b/src/views/user/role/save.vue
@@ -1,18 +1,30 @@
 <template>
 	<x-dialog :title="titleMap[mode]" v-model="visible" :width="900" destroy-on-close @closed="$emit('closed')">
+
 		<el-form :model="form" :rules="rules" :disabled="mode=='show'" ref="dialogForm" label-width="100px" label-position="left">
+
 			<el-form-item label="角色名称" prop="title">
 				<el-input v-model="form.title" clearable></el-input>
 			</el-form-item>
-			<el-form-item label="角色别名" prop="alias">
-				<el-input v-model="form.alias" clearable></el-input>
+
+			<el-form-item label="升级点数" prop="anicount" v-if="form.type=='member'">
+				<el-input v-model="form.anicount" clearable></el-input>
 			</el-form-item>
-			<el-form-item label="排序" prop="sort">
-				<el-input-number v-model="form.sort" controls-position="right" :min="1" style="width: 100%;"></el-input-number>
+
+			<el-form-item label="等级图片" prop="anicount" v-if="form.type=='member'">
+				<x-upload v-model="form.image" title="等级图片"></x-upload>
 			</el-form-item>
+
+
 			<el-form-item label="是否有效" prop="status">
-				<el-switch v-model="form.status" active-value="1" inactive-value="0"></el-switch>
+
+				<el-radio-group v-model="form.status">
+				    <el-radio label="1" size="large">开启</el-radio>
+				    <el-radio label="0" size="large">关闭</el-radio>
+				</el-radio-group>
+
 			</el-form-item>
+
 			<el-form-item label="备注" prop="message">
 				<el-input v-model="form.message" clearable type="textarea"></el-input>
 			</el-form-item>
@@ -21,7 +33,7 @@
 				<el-tabs tab-position="top">
 					<el-tab-pane label="菜单权限">
 						<div class="treeMain">
-							<el-tree ref="menu" node-key="name" :data="menu" :props="form.menu" show-checkbox></el-tree>
+							<el-tree ref="menu" node-key="id" :data="menu.list" :props="menu.props" :default-checked-keys="menu.checked"  show-checkbox></el-tree>
 						</div>
 					</el-tab-pane>
 					<el-tab-pane label="数据权限">
@@ -48,7 +60,7 @@
 					</el-tab-pane>
 					<el-tab-pane label="控制台模块">
 						<div class="treeMain">
-							<el-tree ref="grid" node-key="key" :data="grid" :props="grid.props" :default-checked-keys="form.grid" show-checkbox></el-tree>
+							<el-tree ref="grid" node-key="key" :data="grid.list" :props="grid.props" :default-checked-keys="grid.checked" show-checkbox></el-tree>
 						</div>
 					</el-tab-pane>
 				</el-tabs>
@@ -72,6 +84,13 @@
 	.rolepermission{
 		padding-left: 100px;
 	}
+
+
+	 @media (max-width: 992px){
+		.rolepermission{
+			padding-left: 0px;
+		}
+	}
 </style>
 
 <script>
@@ -91,53 +110,40 @@
 				form: {
 					id:"",
 					title: "",
-					alias: "",
 					status: 1,
 					message: "",
-					grid:[],
-					menu:[],
+					authority:{
+						menu:[],
+						grid:[],
+					}
 				},
 				//验证规则
 				rules: {
 					title: [
 						{required: true, message: '请填写名称'}
 					],
-					sort: [
-						{required: true, message: '请输入排序', trigger: 'change'}
-					],
-					alias: [
-						{required: true, message: '请输入角色别名'}
-					]
 				},
-				menu:[],
-				grid:[
-					{
-						key: "welcome",
-						label: "欢迎",
-						isFixed: true
-					},
-					{
-						key: "ver",
-						label: "版本信息",
-						isFixed: true
-					},
-					{
-						key: "time",
-						label: "时钟"
-					},
-					{
-						key: "progress",
-						label: "进度环"
-					},
-					{
-						key: "echarts",
-						label: "实时收入"
-					},
-					{
-						key: "about",
-						label: "关于项目"
+				menu: {
+					list: [],
+					checked: [17,35],
+					props: {
+						label: (data)=>{
+							return data.meta.title
+						}
 					}
-				]
+				},
+				grid: {
+					list: [],
+					checked: [],
+					props: {
+						label: (data)=>{
+							return data.title
+						},
+						disabled: (data)=>{
+							return data.isFixed
+						}
+					}
+				},
 			}
 		},
 		mounted() {
@@ -150,37 +156,25 @@
 				this.visible = true;
 				return this
 			},
-			// submit(){
-			// 	this.isSaveing = true;
-
-			// 	//选中的和半选的合并后传值接口
-			// 	var checkedKeys = this.$refs.menu.getCheckedKeys().concat(this.$refs.menu.getHalfCheckedKeys())
-			// 	console.log(checkedKeys)
-
-			// 	var checkedKeys_dept = this.$refs.dept.getCheckedKeys().concat(this.$refs.dept.getHalfCheckedKeys())
-			// 	console.log(checkedKeys_dept)
-
-			// 	setTimeout(()=>{
-			// 		this.isSaveing = false;
-			// 		this.visible = false;
-			// 		this.$message.success("操作成功")
-			// 		this.$emit('success')
-			// 	},1000)
-			// },
 			//表单提交方法
 			submit(){
+
+				//选中的和半选的合并后传值接口
+				this.form.authority.menu = this.$refs.menu.getCheckedKeys().concat(this.$refs.menu.getHalfCheckedKeys())
+				this.form.authority.grid = this.$refs.grid.getCheckedKeys().concat(this.$refs.grid.getHalfCheckedKeys())
+
 				this.$refs.dialogForm.validate(async (valid) => {
 					if (valid) {
 						this.isSaveing = true;
-						var res = await this.$api.demo.post.post(this.form);
+						var res = await this.$http.post('system/group/submit', this.form);
 						this.isSaveing = false;
 						if(res.code == 200){
 							this.$emit('success', this.form, this.mode)
 							this.visible = false;
 							this.$message.success("操作成功")
-						}else{
-							this.$alert(res.message, "提示", {type: 'error'})
+							return ;
 						}
+						this.$alert(res.message, "提示", {type: 'error'})
 					}
 				})
 			},
@@ -188,6 +182,26 @@
 			setData(data){
 				// this.form = data
 				Object.assign(this.form, data)
+
+				this.menu.checked = this.form.authority.menu || [];
+				this.grid.checked = this.form.authority.grid || [];
+
+
+				console.log(this.menu)
+
+				if (this.form.type=='system') {
+					this.$http.post('system/group/menuSystem',{}).then((res) => {
+						if (res.code==200) {
+							// Object.assign(this.$data, res.data);
+							this.menu.list = res.data.menu;
+							this.grid.list = res.data.grid;
+							return false;
+						}
+						this.$alert(res.message, "提示", {type: 'error'});
+					});
+
+				}
+
 			}
 		}
 	}