Merge branch 'dev'

zhaoxiaohao

2020-09-18 daa697719eb0ddfd170f1ab94c5422a4f5b93951

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/index.js

@@ -38,9 +38,6 @@
        // 渲染左侧菜单栏
        initLeftNav: function () {
            admin.req('api-user/menus/current', {}, function (data) {
                //data = data[1];
                // console.log(data);
                // debugger;
                admin.putTempData("menus",data.data);
                var menus = data.data;
                // 判断权限
@@ -192,19 +189,27 @@
            layer.load(2);
            admin.req('api-user/users/current', {}, function (data) {
                layer.closeAll('loading');
                // console.log(data.code);
                // debugger;
                if (data && data.code === 0) {
                    let user = data.data;
                    // console.log(user);
                    // debugger;
                    config.putUser(user);
                    admin.putTempData("permissions",user.permissions);
                    admin.putTempData("organization",user.organizations[user.organizations.length-1]);
                    success(user);
                } else {
                    layer.msg('获取用户失败', {icon: 2});
                    if (data.code === 1000) {
                        layer.msg(data.msg, { icon: 2, time: 4 * 1000 }, function () {
                            //回调
                    config.removeToken();
                    location.replace('login.html');
                        })

                    } else {
                        layer.msg('获取用户失败,请联系管理员', { icon: 2, time: 4 * 1000 }, function () {
                            //回调
                            config.removeToken();
                            location.replace('login.html');
                        })
                    }
                }
            }, 'GET');
        },