Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'

用户信息设置登录皮肤的值保存在cookie中，登录时user_id存入local一份



See merge request !510

@@ -227,6 +227,7 @@ layui.define(['sessions', 'form', 'common'],function (exports) {
                                     sessionStorage.setItem('permissions',data.permissions);
                                     sessionStorage.setItem('roles',roles);
                                     sessionStorage.setItem('user_id',data.id);  //保存用户id  joke add 20211206
+                                    localStorage.setItem('user_id',data.id);  //保存用户id  lsq add 2022-03-31
                                     // Start Wang 2022/2/8 15:37 用户登录后，获取用户信息时，增加获取用户扩展信息
                                     function initUserProperty() {
                                         $.ajax({

@@ -68,6 +68,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                 data.userProperty.forEach(function (v){
                     //if(v.username != '' && v.value != ''){
                         sessionStorage.setItem(v.property, v.value);
+                        //把loginSkin也存入cookie一份 lsq 2022-03-31
+                        admin.setCookie(v.property, v.value,30);
                         reloadFlg = true;
                     //}
                 })

@@ -227,7 +227,9 @@ layui.extend({
         let path = router.path.join('/')
         if(pathURL.indexOf('/user/login') != -1){
             var loginIndex = 'default';
-            let loginSkin = sessionStorage.getItem("loginSkin");
+            // let loginSkin = sessionStorage.getItem("loginSkin");
+            //lsq 从cookie中获取登录皮肤 2022-03-31
+            let loginSkin = admin.getCookie("loginSkin");
             if(loginSkin && ["default",'skin1','skin2'].indexOf(loginSkin) != -1){
                 loginIndex = loginSkin;
             }

@@ -359,8 +359,27 @@ layui.define(['view'], function(exports){
                 //纠正首尾
                 return href.replace(/^(\/+)/, '/')
                     .replace(new RegExp('\/' + setter.entry + '$'), '/'); //过滤路由最后的默认视图文件名（如：index）
+            },
+            //封装获取cookie
+            getCookie:function(name) {
+                var arr, reg = new RegExp("(^| )" + name + "=([^;]*)(;|$)");
+                if (arr = document.cookie.match(reg))
+                    return (arr[2]);
+                else
+                    return null;
+            },
+            setCookie:function (c_name, value, expiredays) {
+                var exdate = new Date();
+                exdate.setDate(exdate.getDate() + expiredays);
+                document.cookie = c_name + "=" + escape(value) + ((expiredays == null) ? "" : ";expires=" + exdate.toGMTString());
+            },
+            delCookie:function (name) {
+                var exp = new Date();
+                exp.setTime(exp.getTime() - 1);
+                var cval = getCookie(name);
+                if (cval != null)
+                    document.cookie = name + "=" + cval + ";expires=" + exp.toGMTString();
             }
-
             //……
         };
 

@@ -1993,9 +1993,9 @@ layui.define(['xmSelect', 'md5'], function (exports) {
             });
         });
     };
-    //修改基本信息  joke add 20211206
+    //修改基本信息  joke add 20211206 //个人信息的user_id在localStorage中也存储了一份 lsq 2022-03-31
     admin.events.changeInfo = function () {
-        obj.openWin('baseconfig/user/userChange', '个人信息修改', {id: sessionStorage.getItem('user_id'),type:'userChange'}, ['保存', '取消'], function f() {
+        obj.openWin('baseconfig/user/userChange', '个人信息修改', {id: sessionStorage.getItem('user_id')?sessionStorage.getItem('user_id'):localStorage.getItem('user_id'),type:'userChange'}, ['保存', '取消'], function f() {
             $("#user_form_save_id").trigger("click");
         },null,['60%', '45%']);
     };

@@ -74,6 +74,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                 data.userProperty.forEach(function (v){
                     //if(v.username != '' && v.value != ''){
                         sessionStorage.setItem(v.property, v.value);
+                        //把loginSkin也存入cookie一份 lsq 2022-03-31
+                        admin.setCookie(v.property, v.value,30);
                         reloadFlg = true;
                     //}
                 })

@@ -359,6 +359,26 @@ layui.define(['view'], function(exports){
                 //纠正首尾
                 return href.replace(/^(\/+)/, '/')
                     .replace(new RegExp('\/' + setter.entry + '$'), '/'); //过滤路由最后的默认视图文件名（如：index）
+            },
+            //封装获取cookie
+            getCookie:function(name) {
+                var arr, reg = new RegExp("(^| )" + name + "=([^;]*)(;|$)");
+                if (arr = document.cookie.match(reg))
+                    return (arr[2]);
+                else
+                    return null;
+            },
+            setCookie:function (c_name, value, expiredays) {
+                var exdate = new Date();
+                exdate.setDate(exdate.getDate() + expiredays);
+                document.cookie = c_name + "=" + escape(value) + ((expiredays == null) ? "" : ";expires=" + exdate.toGMTString());
+            },
+            delCookie:function (name) {
+                var exp = new Date();
+                exp.setTime(exp.getTime() - 1);
+                var cval = getCookie(name);
+                if (cval != null)
+                    document.cookie = name + "=" + cval + ";expires=" + exp.toGMTString();
             }
 
             //……