diff --git a/CHANGELOG.md b/CHANGELOG.md index 0844e4e5b..640afb080 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # 版本日志 +## 2.4.3 + +### 新增功能 + +### 解决BUG、优化功能 + +1. 未登录重定向带入参数 +2. 页面登录方法调整支持自定义事件登录 + +----------------------------------------------------------- + ## 2.4.2 ### 新增功能 diff --git a/modules/server/src/main/resources/vm/common/userHead.vm b/modules/server/src/main/resources/vm/common/userHead.vm index 3f4c8fdfa..9ce0258a6 100644 --- a/modules/server/src/main/resources/vm/common/userHead.vm +++ b/modules/server/src/main/resources/vm/common/userHead.vm @@ -103,7 +103,10 @@ 'title': '系统提示' }, function (index) { layer.close(index); - layui.data('user', null); + layui.data('user', { + key: "loginOut", + value: true + }); window.location.href = "#if($node).#end./logout"; }) } diff --git a/modules/server/src/main/resources/vm/login.vm b/modules/server/src/main/resources/vm/login.vm index 2f3489380..bb9a5759f 100644 --- a/modules/server/src/main/resources/vm/login.vm +++ b/modules/server/src/main/resources/vm/login.vm @@ -115,6 +115,10 @@ key: "userName", value: sendData.userName }); + layui.data('user', { + key: "loginOut", + remove: true + }); window.location.href = './index'; } else { // 显示验证码