diff --git a/src/api/sys/sysRole.js b/src/api/sys/sysRole.js
index f95c255..0bcf90b 100644
--- a/src/api/sys/sysRole.js
+++ b/src/api/sys/sysRole.js
@@ -1,39 +1,57 @@
 import request from "@/utils/request";
 
-export function GetList(param){
+export function GetList(param) {
     return request({
         url: "/sys/role/list",
         method: "post",
-        data:param
+        data: param
     });
 }
 
-export function Insert(param){
+export function Insert(param) {
     return request({
         url: "/sys/role/insert",
         method: "post",
-        data:param
+        data: param
     });
 }
-export function Update(param){
+
+export function Update(param) {
     return request({
         url: "/sys/role/update",
         method: "post",
-        data:param
+        data: param
     });
 }
-export function Detail(id){
+
+export function Detail(id) {
     return request({
         url: "/sys/role/detail",
         method: "post",
-        params:{id}
+        params: {id}
     });
 }
 
-export function Delete(id){
+export function Delete(id) {
     return request({
         url: "/sys/role/delete",
         method: "post",
-        params:{id}
+        params: {id}
+    });
+}
+
+export function GetRoleMenu(roleId) {
+    return request({
+        url: "/sys/role/getRoleMenu",
+        method: "post",
+        params: {roleId}
+    });
+}
+
+export function SaveRoleMenu(param) {
+    return request({
+        url: "/sys/role/saveRoleMenu",
+        method: "post",
+        data: param
     });
 }
diff --git a/src/api/sys/sysUser.js b/src/api/sys/sysUser.js
new file mode 100644
index 0000000..70b40e5
--- /dev/null
+++ b/src/api/sys/sysUser.js
@@ -0,0 +1,46 @@
+import request from "@/utils/request";
+
+export function GetList(param){
+    return request({
+        url: "/sys/user/list",
+        method: "post",
+        data:param
+    });
+}
+
+export function Insert(param){
+    return request({
+        url: "/sys/user/insert",
+        method: "post",
+        data:param
+    });
+}
+export function Update(param){
+    return request({
+        url: "/sys/user/update",
+        method: "post",
+        data:param
+    });
+}
+export function Detail(id){
+    return request({
+        url: "/sys/user/detail",
+        method: "post",
+        params:{id}
+    });
+}
+
+export function Delete(id){
+    return request({
+        url: "/sys/user/delete",
+        method: "post",
+        params:{id}
+    });
+}
+export function GetRoleList(){
+    return request({
+        url: "/sys/role/list",
+        method: "post",
+        data: {page:1,limit:1000}
+    });
+}
diff --git a/src/router/index.js b/src/router/index.js
index 0854f6b..9c3b1fb 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -84,6 +84,7 @@ import udplatGoodsMatch from '../views/udplat/udplatGoodsMatch';
 //权限管理
 import sysMenu from "../views/sys/sysMenu";
 import sysRole from "../views/sys/sysRole";
+import sysUser from "../views/sys/sysUser";
 
 const err401 = r =>
     require.ensure([], () => r(require("../views/error/err401.vue")), "home");
@@ -774,6 +775,14 @@ export const asyncRouterMap = [
                         meta: {
                             authRule: ["sys/sysRole"]
                         }
+                    },
+                    {
+                        name: "用户管理",
+                        path: "sysUser",
+                        component: sysUser,
+                        meta: {
+                            authRule: ["sys/sysUser"]
+                        }
                     }
                 ]
             }
diff --git a/src/views/sys/sysMenu.vue b/src/views/sys/sysMenu.vue
index d039265..474b3d0 100644
--- a/src/views/sys/sysMenu.vue
+++ b/src/views/sys/sysMenu.vue
@@ -172,10 +172,11 @@ export default {
 
                 })
                 .catch(() => {
-                    _this.$message({
+                    console.log("catch");
+                    /*_this.$message({
                         type: 'error',
                         message:"发生错误！"
-                    });
+                    });*/
                 });
 
 
diff --git a/src/views/sys/sysRole.vue b/src/views/sys/sysRole.vue
index 81f78b4..a957970 100644
--- a/src/views/sys/sysRole.vue
+++ b/src/views/sys/sysRole.vue
@@ -58,6 +58,7 @@
                 <el-table-column label="创建时间" align="center" prop="createTime" :show-overflow-tooltip="true"/>
                 <el-table-column label="操作" fixed="right" >
                     <template slot-scope="scope">
+                        <el-button type="text" size="small" @click.native.stop="showRoleMenu(scope.row.id)">授权</el-button>
                         <el-button type="text" size="small" @click.native.stop="update(scope.row.id)">修改</el-button>
                         <el-button type="text" size="small" @click.native.stop="deleteRow(scope.row.id)">删除</el-button>
                     </template>
@@ -92,11 +93,26 @@
                 <el-button type="primary" @click="save">保存</el-button>
             </div>
         </el-dialog>
+        <el-dialog title="授权" :visible.sync = "roleMenuDialog.visible">
+            <el-tree
+                :data="roleMenuDialog.detail"
+                show-checkbox
+                ref="menu"
+                node-key="id"
+                empty-text="暂无数据"
+                :default-checked-keys="roleMenuDialog.checkKeys"
+                :props="roleMenuDialog.defaultProps"
+            ></el-tree>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="roleMenuDialog.visible = false">取 消</el-button>
+                <el-button type="primary" @click="saveRoleMenu">保存</el-button>
+            </div>
+        </el-dialog>
     </div>
 </template>
 
 <script>
-import {GetList, Insert, Update, Detail, Delete} from "@/api/sys/sysRole";
+import {GetList, Insert, Update, Detail, Delete,GetRoleMenu,SaveRoleMenu} from "@/api/sys/sysRole";
 export default {
     name: "sysRole",
     data(){
@@ -115,6 +131,16 @@ export default {
                 visible: false,
                 title: "新增",
                 detail: {}
+            },
+            roleMenuDialog:{
+                visible: false,
+                detail:{},
+                roleId:0,
+                checkKeys:[],
+                defaultProps: {
+                    children: "children",
+                    label: "name"
+                },
             }
         }
     },
@@ -221,7 +247,35 @@ export default {
                 });
 
 
-        }
+        },
+        showRoleMenu(roleId){
+            this.roleMenuDialog.roleId = roleId;
+            GetRoleMenu(roleId).then(result => {
+                this.roleMenuDialog.detail = result.data.menuTrees;
+                this.roleMenuDialog.checkKeys = result.data.roleMenuIds;
+                this.roleMenuDialog.visible = true;
+                //this.$refs.menu.setCheckedKeys(result.data.roleMenuIds);
+
+            })
+        },
+        saveRoleMenu(){
+            let param={roleId:this.roleMenuDialog.roleId,menuIds:this.getMenuAllCheckedKeys()};
+            SaveRoleMenu(param).then(result => {
+                if(result.code == 20000){
+                    this.$message.success("修改成功！");
+                    this.roleMenuDialog.visible = false;
+                    this.getList();
+                }
+            })
+        },
+        getMenuAllCheckedKeys() {
+            // 目前被选中的菜单节点
+            let checkedKeys = this.$refs.menu.getHalfCheckedKeys();
+            // 半选中的菜单节点
+            let halfCheckedKeys = this.$refs.menu.getCheckedKeys();
+            checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
+            return checkedKeys;
+        },
     }
 }
 </script>
diff --git a/src/views/sys/sysUser.vue b/src/views/sys/sysUser.vue
new file mode 100644
index 0000000..50dc015
--- /dev/null
+++ b/src/views/sys/sysUser.vue
@@ -0,0 +1,279 @@
+<template>
+    <div>
+        <el-card class="el-card">
+            <el-form
+                :inline="true"
+                :model="queryParams"
+                size="mini"
+            >
+                <el-form-item label="名称">
+                    <el-input
+                        v-model="queryParams.name"
+                        size="mini"
+                        placeholder="请输入名称"
+                    ></el-input>
+                </el-form-item>
+                <el-form-item label="状态">
+                    <el-select
+                        v-model="queryParams.status"
+                        placeholder="状态"
+                    >
+                        <el-option
+                            v-for="item in statusOptions"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button-group>
+                        <el-button
+                            type="primary"
+                            icon="el-icon-refresh"
+                            @click="onReset"
+                        ></el-button>
+                        <el-button type="primary" icon="search" @click="onSubmit"
+                        >查询
+                        </el-button>
+                        <el-button @click.native.stop="insert">新增</el-button>
+                    </el-button-group>
+                </el-form-item>
+
+            </el-form>
+            <el-table
+                v-loading="loading"
+                :data="list"
+                style="width: 100%"
+            >
+                <el-table-column label="key" prop="userKey"/>
+                <el-table-column label="用户账号" prop="userName"/>
+                <el-table-column label="用户昵称" prop="nickName"/>
+                <el-table-column label="状态" prop="status">
+                    <template slot-scope="scope">
+                        <span>{{ getStatus(scope.row.status) }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="角色" prop="status">
+                    <template slot-scope="scope">
+                        <span>{{ getRoleName(scope.row.roleId) }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="创建时间" align="center" prop="createTime" :show-overflow-tooltip="true"/>
+                <el-table-column label="操作" fixed="right" >
+                    <template slot-scope="scope">
+                        <el-button type="text" size="small" @click.native.stop="update(scope.row.id)">修改</el-button>
+                        <el-button type="text" size="small" @click.native.stop="deleteRow(scope.row.id)">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <el-pagination
+                :current-page="queryParams.page"
+                :page-size="queryParams.limit"
+                @current-change="handleCurrentChange"
+                layout="prev, pager, next"
+                :total="total"
+            ></el-pagination>
+        </el-card>
+        <el-dialog :title="dialog.title" :visible.sync="dialog.visible">
+            <el-form :model="dialog.detail" label-position="left" label-width="100px">
+                <el-form-item label="key" prop="userKey">
+                    <el-input v-model="dialog.detail.userKey" readonly/>
+                </el-form-item>
+                <el-form-item label="用户账号" prop="name">
+                    <el-input v-model="dialog.detail.userName"/>
+                </el-form-item>
+                <el-form-item label="用户昵称" prop="nickName">
+                    <el-input v-model="dialog.detail.nickName"/>
+                </el-form-item>
+                <el-form-item label="密码" prop="sort">
+                    <el-input v-model="dialog.detail.password"/>
+                </el-form-item>
+                <el-form-item label="状态" prop="status">
+                    <el-radio v-model="dialog.detail.status" label="0">启用</el-radio>
+                    <el-radio v-model="dialog.detail.status" label="1">禁用</el-radio>
+                </el-form-item>
+                <el-form-item label="角色" prop="roleId">
+                    <el-select
+                        v-model="dialog.detail.roleId"
+                        placeholder="角色"
+                    >
+                        <el-option
+                            v-for="item in roleList"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="appId" prop="udplat_appId">
+                    <el-input v-model="dialog.detail.udplat_appId"/>
+                </el-form-item>
+                <el-form-item label="userName" prop="udplat_userName">
+                    <el-input v-model="dialog.detail.udplat_userName"/>
+                </el-form-item>
+                <el-form-item label="密钥" prop="sort">
+                    <el-input v-model="dialog.detail.udplat_secretKey"/>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="dialog.visible = false">取 消</el-button>
+                <el-button type="primary" @click="save">保存</el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import {GetList, Insert, Update, Detail, Delete,GetRoleList} from "@/api/sys/sysUser";
+export default {
+    name: "sysUser",
+    data(){
+        return{
+            loading: false,
+            list: [],
+            total: 0,
+            statusOptions: [{value: "", label: "全部"},{value: "0", label: "启用"}, {value: "1", label: "禁用"}],
+            roleList:[],
+            queryParams: {
+                page: 1,
+                limit: 10,
+                name: "",
+                status:""
+            },
+            dialog: {
+                visible: false,
+                title: "新增",
+                detail: {}
+            }
+        }
+    },
+    created() {
+        this.getList();
+        this.getRoleList();
+    },
+    methods:{
+        getRoleList(){
+            GetRoleList().then(result => {
+                this.roleList = result.data.list;
+            })
+        },
+        getList(){
+            this.loading = true;
+            GetList(this.queryParams).then(res=>{
+                this.list = res.data.list;
+                this.total = res.data.total;
+                this.loading = false;
+            })
+        },
+        handleCurrentChange(val) {
+            this.queryParams.page = val;
+            this.getList();
+        },
+        getStatus(status) {
+            return this.selectDictLabel(this.statusOptions, status);
+        },
+        getRoleName(roleId){
+            for(const item of this.roleList){
+                if(item.id == roleId)
+                    return item.name;
+            }
+            return  "";
+        },
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.queryParams = {
+                page: 1,
+                limit: 10,
+                name: "",
+                status:""
+            };
+            this.getList();
+        },
+        onSubmit() {
+            this.queryParams.page = 1;
+            this.getList();
+        },
+        formRest() {
+            this.dialog.detail = {
+                id: 0,
+                userKey: "",
+                userName: "",
+                nickName: "",
+                password: "",
+                status: "0",
+                roleId: 0,
+                udplat_appId: "",
+                udplat_secretKey: "",
+                udplat_userName: ""
+            }
+        },
+        insert() {
+            this.formRest();
+            this.dialog.title = "新增";
+            this.dialog.visible = true;
+        },
+        update(id) {
+            this.formRest();
+            this.dialog.title="修改";
+            Detail(id).then(res=>{
+                this.dialog.detail = res.data;
+                this.dialog.visible = true;
+            })
+        },
+        save() {
+            let id = this.dialog.detail.id;
+            if(id>0){
+                Update(this.dialog.detail).then(res=>{
+                    if(res.code == 20000){
+                        this.$message.success("修改成功！");
+                        this.dialog.visible = false;
+                        this.getList();
+                    }
+
+                })
+            }else{
+                Insert(this.dialog.detail).then(res => {
+                    if(res.code == 20000){
+                        this.$message.success("新增成功！");
+                        this.dialog.visible = false;
+                        this.getList();
+                    }
+                })
+            }
+        },
+        deleteRow(id){
+            let _this=this;
+            this.$confirm("确定删除该行数据，删除后将不可恢复?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    Delete(id).then(result => {
+                        if(result.code == 20000){
+                            _this.$message.success("删除成功！");
+                            _this.getList();
+                        }
+                    })
+
+                })
+                .catch(() => {
+
+                   /* _this.$message({
+                        type: 'error',
+                        message:"发生错误！"
+                    });*/
+                });
+
+
+        }
+    }
+}
+</script>
+
+<style scoped>
+
+</style>