diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs index d312ca97f..74ab086d2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs @@ -635,14 +635,14 @@ namespace Learun.Application.Web.Controllers { if (password == Md5Helper.Encrypt(Config.GetValue("pwdprex") + "123456", 32) || password == Md5Helper.Encrypt(Config.GetValue("pwdprex") + "2020", 32) || password == Md5Helper.Encrypt(Config.GetValue("defaultpwd"), 32)) { - succresult.defaultPwdTip = true; + succresult.pwd = true; } } else { if (password == Md5Helper.Encrypt(Config.GetValue("pwdprex") + userEntity.F_IdentityCardNo.Substring(userEntity.F_IdentityCardNo.Length - 6, 6), 32) || password == Md5Helper.Encrypt(Config.GetValue("pwdprex") + "2020", 32) || password == Md5Helper.Encrypt(Config.GetValue("defaultpwd"), 32)) { - succresult.defaultPwdTip = true; + succresult.pwd = true; } } 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 503787816..f4a72e5d0 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 @@ -199,10 +199,7 @@ var bootstrap = function ($, learun) { // }); //} - //初始密码进行提示 - if (sessionStorage.getItem("df0fjl") == "hm") { - layer.alert("您当前密码为初始密码,请尽快修改!", { icon: 7, title: "提示", closeBtn: false, yes: function (index) { sessionStorage.removeItem("df0fjl"); layer.close(index); } }); - } + if (pwd == "true" || sessionStorage.getItem("pase_29d") == "hm") { top.layer.open({ id: 'pwdform', diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/ChangePwd.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/ChangePwd.cshtml index 7b9e7b530..f643ff42e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/ChangePwd.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/ChangePwd.cshtml @@ -17,7 +17,7 @@