Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'
用户信息设置登录皮肤的值保存在cookie中，登录时user_id存入local一份 See merge request !510
Showing
7 changed files
with
50 additions
and
4 deletions
| @@ -227,6 +227,7 @@ layui.define(['sessions', 'form', 'common'],function (exports) { | @@ -227,6 +227,7 @@ layui.define(['sessions', 'form', 'common'],function (exports) { | ||
| 227 | sessionStorage.setItem('permissions',data.permissions); | 227 | sessionStorage.setItem('permissions',data.permissions); |
| 228 | sessionStorage.setItem('roles',roles); | 228 | sessionStorage.setItem('roles',roles); |
| 229 | sessionStorage.setItem('user_id',data.id); //保存用户id joke add 20211206 | 229 | sessionStorage.setItem('user_id',data.id); //保存用户id joke add 20211206 |
| 230 | + localStorage.setItem('user_id',data.id); //保存用户id lsq add 2022-03-31 | ||
| 230 | // Start Wang 2022/2/8 15:37 用户登录后，获取用户信息时，增加获取用户扩展信息 | 231 | // Start Wang 2022/2/8 15:37 用户登录后，获取用户信息时，增加获取用户扩展信息 |
| 231 | function initUserProperty() { | 232 | function initUserProperty() { |
| 232 | $.ajax({ | 233 | $.ajax({ |
| @@ -68,6 +68,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect | @@ -68,6 +68,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect | ||
| 68 | data.userProperty.forEach(function (v){ | 68 | data.userProperty.forEach(function (v){ |
| 69 | //if(v.username != '' && v.value != ''){ | 69 | //if(v.username != '' && v.value != ''){ |
| 70 | sessionStorage.setItem(v.property, v.value); | 70 | sessionStorage.setItem(v.property, v.value); |
| 71 | + //把loginSkin也存入cookie一份 lsq 2022-03-31 | ||
| 72 | + admin.setCookie(v.property, v.value,30); | ||
| 71 | reloadFlg = true; | 73 | reloadFlg = true; |
| 72 | //} | 74 | //} |
| 73 | }) | 75 | }) |
| @@ -227,7 +227,9 @@ layui.extend({ | @@ -227,7 +227,9 @@ layui.extend({ | ||
| 227 | let path = router.path.join('/') | 227 | let path = router.path.join('/') |
| 228 | if(pathURL.indexOf('/user/login') != -1){ | 228 | if(pathURL.indexOf('/user/login') != -1){ |
| 229 | var loginIndex = 'default'; | 229 | var loginIndex = 'default'; |
| 230 | - let loginSkin = sessionStorage.getItem("loginSkin"); | 230 | + // let loginSkin = sessionStorage.getItem("loginSkin"); |
| 231 | + //lsq 从cookie中获取登录皮肤 2022-03-31 | ||
| 232 | + let loginSkin = admin.getCookie("loginSkin"); | ||
| 231 | if(loginSkin && ["default",'skin1','skin2'].indexOf(loginSkin) != -1){ | 233 | if(loginSkin && ["default",'skin1','skin2'].indexOf(loginSkin) != -1){ |
| 232 | loginIndex = loginSkin; | 234 | loginIndex = loginSkin; |
| 233 | } | 235 | } |
| @@ -359,8 +359,27 @@ layui.define(['view'], function(exports){ | @@ -359,8 +359,27 @@ layui.define(['view'], function(exports){ | ||
| 359 | //纠正首尾 | 359 | //纠正首尾 |
| 360 | return href.replace(/^(\/+)/, '/') | 360 | return href.replace(/^(\/+)/, '/') |
| 361 | .replace(new RegExp('\/' + setter.entry + '$'), '/'); //过滤路由最后的默认视图文件名（如：index） | 361 | .replace(new RegExp('\/' + setter.entry + '$'), '/'); //过滤路由最后的默认视图文件名（如：index） |
| 362 | + }, | ||
| 363 | + //封装获取cookie | ||
| 364 | + getCookie:function(name) { | ||
| 365 | + var arr, reg = new RegExp("(^| )" + name + "=([^;]*)(;|$)"); | ||
| 366 | + if (arr = document.cookie.match(reg)) | ||
| 367 | + return (arr[2]); | ||
| 368 | + else | ||
| 369 | + return null; | ||
| 370 | + }, | ||
| 371 | + setCookie:function (c_name, value, expiredays) { | ||
| 372 | + var exdate = new Date(); | ||
| 373 | + exdate.setDate(exdate.getDate() + expiredays); | ||
| 374 | + document.cookie = c_name + "=" + escape(value) + ((expiredays == null) ? "" : ";expires=" + exdate.toGMTString()); | ||
| 375 | + }, | ||
| 376 | + delCookie:function (name) { | ||
| 377 | + var exp = new Date(); | ||
| 378 | + exp.setTime(exp.getTime() - 1); | ||
| 379 | + var cval = getCookie(name); | ||
| 380 | + if (cval != null) | ||
| 381 | + document.cookie = name + "=" + cval + ";expires=" + exp.toGMTString(); | ||
| 362 | } | 382 | } |
| 363 | - | ||
| 364 | //…… | 383 | //…… |
| 365 | }; | 384 | }; |
| 366 | 385 |
| @@ -1993,9 +1993,9 @@ layui.define(['xmSelect', 'md5'], function (exports) { | @@ -1993,9 +1993,9 @@ layui.define(['xmSelect', 'md5'], function (exports) { | ||
| 1993 | }); | 1993 | }); |
| 1994 | }); | 1994 | }); |
| 1995 | }; | 1995 | }; |
| 1996 | - //修改基本信息 joke add 20211206 | 1996 | + //修改基本信息 joke add 20211206 //个人信息的user_id在localStorage中也存储了一份 lsq 2022-03-31 |
| 1997 | admin.events.changeInfo = function () { | 1997 | admin.events.changeInfo = function () { |
| 1998 | - obj.openWin('baseconfig/user/userChange', '个人信息修改', {id: sessionStorage.getItem('user_id'),type:'userChange'}, ['保存', '取消'], function f() { | 1998 | + obj.openWin('baseconfig/user/userChange', '个人信息修改', {id: sessionStorage.getItem('user_id')?sessionStorage.getItem('user_id'):localStorage.getItem('user_id'),type:'userChange'}, ['保存', '取消'], function f() { |
| 1999 | $("#user_form_save_id").trigger("click"); | 1999 | $("#user_form_save_id").trigger("click"); |
| 2000 | },null,['60%', '45%']); | 2000 | },null,['60%', '45%']); |
| 2001 | }; | 2001 | }; |
| @@ -74,6 +74,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect | @@ -74,6 +74,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect | ||
| 74 | data.userProperty.forEach(function (v){ | 74 | data.userProperty.forEach(function (v){ |
| 75 | //if(v.username != '' && v.value != ''){ | 75 | //if(v.username != '' && v.value != ''){ |
| 76 | sessionStorage.setItem(v.property, v.value); | 76 | sessionStorage.setItem(v.property, v.value); |
| 77 | + //把loginSkin也存入cookie一份 lsq 2022-03-31 | ||
| 78 | + admin.setCookie(v.property, v.value,30); | ||
| 77 | reloadFlg = true; | 79 | reloadFlg = true; |
| 78 | //} | 80 | //} |
| 79 | }) | 81 | }) |
| @@ -359,6 +359,26 @@ layui.define(['view'], function(exports){ | @@ -359,6 +359,26 @@ layui.define(['view'], function(exports){ | ||
| 359 | //纠正首尾 | 359 | //纠正首尾 |
| 360 | return href.replace(/^(\/+)/, '/') | 360 | return href.replace(/^(\/+)/, '/') |
| 361 | .replace(new RegExp('\/' + setter.entry + '$'), '/'); //过滤路由最后的默认视图文件名（如：index） | 361 | .replace(new RegExp('\/' + setter.entry + '$'), '/'); //过滤路由最后的默认视图文件名（如：index） |
| 362 | + }, | ||
| 363 | + //封装获取cookie | ||
| 364 | + getCookie:function(name) { | ||
| 365 | + var arr, reg = new RegExp("(^| )" + name + "=([^;]*)(;|$)"); | ||
| 366 | + if (arr = document.cookie.match(reg)) | ||
| 367 | + return (arr[2]); | ||
| 368 | + else | ||
| 369 | + return null; | ||
| 370 | + }, | ||
| 371 | + setCookie:function (c_name, value, expiredays) { | ||
| 372 | + var exdate = new Date(); | ||
| 373 | + exdate.setDate(exdate.getDate() + expiredays); | ||
| 374 | + document.cookie = c_name + "=" + escape(value) + ((expiredays == null) ? "" : ";expires=" + exdate.toGMTString()); | ||
| 375 | + }, | ||
| 376 | + delCookie:function (name) { | ||
| 377 | + var exp = new Date(); | ||
| 378 | + exp.setTime(exp.getTime() - 1); | ||
| 379 | + var cval = getCookie(name); | ||
| 380 | + if (cval != null) | ||
| 381 | + document.cookie = name + "=" + cval + ";expires=" + exp.toGMTString(); | ||
| 362 | } | 382 | } |
| 363 | 383 | ||
| 364 | //…… | 384 | //…… |
-
Please register or login to post a comment