From 7575d9eb00c2473eed898781817f85d88190a37e Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Sat, 11 May 2024 09:41:09 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=BC=B1?= =?UTF-8?q?=E5=AF=86=E7=A0=81=E7=99=BB=E5=BD=95=E5=90=8E=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AF=86=E7=A0=81=E5=BC=B9=E5=B1=82=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E5=AD=98=E5=82=A8=E6=96=B9=E5=BC=8F=E5=88=A4=E6=96=AD=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/Home/AdminDefault/index.js | 8 ++++++-- .../Views/LR_Content/script/lr-admin.js | 4 ++++ .../Views/Login/Default/FirstIndexWxLogin.js | 2 ++ .../Learun.Application.Web/Views/Login/Default/Index.js | 6 ++++-- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault/index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault/index.js index 3b210bfd1..e3a636f8b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault/index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault/index.js @@ -198,7 +198,7 @@ var bootstrap = function ($, learun) { // area: ['500px', '300px'] // }); //} - if (pwd == "true") { + if (pwd == "true" || sessionStorage.getItem("pase_29d") == "hm") { top.layer.open({ id: 'pwdform', title: '密码修改', @@ -215,6 +215,8 @@ var bootstrap = function ($, learun) { }, yes: function (index, layero) { var flag = top['layer_pwdform'].acceptClick(function () { + //删除seesion + sessionStorage.removeItem("pase_29d"); top.location.href = "/Login/Index"; }); if (!!flag) { @@ -226,7 +228,7 @@ var bootstrap = function ($, learun) { } }); } - if (pwd == "first") { + if (pwd == "first" || sessionStorage.getItem("pase_29d") == "fs") { top.layer.open({ id: 'pwdform', title: '密码修改', @@ -243,6 +245,8 @@ var bootstrap = function ($, learun) { }, yes: function (index, layero) { var flag = top['layer_pwdform'].acceptClick(function () { + //删除seesion + sessionStorage.removeItem("pase_29d"); top.location.href = "/Login/Index"; }); if (!!flag) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-admin.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-admin.js index 2169b35a1..3a860bdcb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-admin.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-admin.js @@ -101,6 +101,8 @@ var loaddfimg; if (ACIp2 != null && ACIp2 != "") { sendToAc(ACIp2, 'logout', Ip, loginInfo.enCode, ''); } + //清空session + sessionStorage.clear(); learun.httpAsyncPost($.rootUrl + '/Login/OutLogin', {}, function (data) { window.location.href = $.rootUrl + "/Login/Index"; }); @@ -111,6 +113,8 @@ var loaddfimg; learun.layerConfirm("注：您确定要清空全部后台缓存数据吗？", function (r) { if (r) { learun.loading(true, '清理缓存数据中...'); + //清空session + sessionStorage.clear(); learun.httpAsyncPost($.rootUrl + '/Home/ClearRedis', {}, function (data) { window.location.href = $.rootUrl + "/Login/Index"; }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default/FirstIndexWxLogin.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default/FirstIndexWxLogin.js index 8e7c830d3..3e9a0eb51 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default/FirstIndexWxLogin.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default/FirstIndexWxLogin.js @@ -153,6 +153,8 @@ window.location.href = "/SSOSystem/Index"; } else { if (res.data.pwd == true) { + //存储seesion + sessionStorage.setItem("pase_29d", "fs"); window.location.href = "/Home/Index?pwd=first"; } else { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default/Index.js index 0d5ebb737..ef91baea4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default/Index.js @@ -163,13 +163,15 @@ window.location.href = "/SSOSystem/Index"; } else { if (res.data.pwd == true) { + //存储seesion + sessionStorage.setItem("pase_29d", "hm"); window.location.href = "/Home/Index?pwd=true"; } else if (res.data.pwdtip == true) { window.location.href = "/Home/Index?pwdtip=true"; } - else + else { window.location.href = "/Home/Index"; - //window.location.href = "/Home/Index"; + } } } else if (res.code == 400) {