diff --git a/src/main/java/io/v/nutz/zhgh/mobile/mobileLoginController.java b/src/main/java/io/v/nutz/zhgh/mobile/mobileLoginController.java index c97b835..cf29d46 100644 --- a/src/main/java/io/v/nutz/zhgh/mobile/mobileLoginController.java +++ b/src/main/java/io/v/nutz/zhgh/mobile/mobileLoginController.java @@ -138,6 +138,10 @@ public class mobileLoginController { } } + if (user.getLoginname().equals(newPwd)) { + return Result.error("请勿以工号作为密码"); + } + String pwd = PwdUtil.doSm4CbcEncrypt(newPwd); dao.update(Sys_user.class, Chain.make("password", pwd).add("weAppLoginCount", user.getWeAppLoginCount() + 1), Cnd.where("id", "=", ShiroUtil.getUserId())); @@ -154,7 +158,7 @@ public class mobileLoginController { @RequiresAuthentication public Object checkIsFirstLogin(){ Sys_user user = dao.fetch(Sys_user.class, Cnd.where("id", "=", ShiroUtil.getUserId())); - if (user.getWeAppLoginCount() == 1 && StrUtil.isNotBlank(user.getOpenId())) { + if ((user.getWeAppLoginCount() == null || user.getWeAppLoginCount() == 1) && StrUtil.isNotBlank(user.getOpenId())) { return Result.error(); } else { return Result.success(); diff --git a/src/main/resources/views/mobile/activity/Sports/activityEventList.html b/src/main/resources/views/mobile/activity/Sports/activityEventList.html index 78a71ea..5ca7a30 100644 --- a/src/main/resources/views/mobile/activity/Sports/activityEventList.html +++ b/src/main/resources/views/mobile/activity/Sports/activityEventList.html @@ -228,7 +228,7 @@ layout("/mobile/platform.html"){
- 自愿参赛责任及风险告知书 + 我已阅读参赛责任及风险告知书
diff --git a/src/main/resources/views/mobile/activity/Sports/activityList.html b/src/main/resources/views/mobile/activity/Sports/activityList.html index 5f05a9c..e5be647 100644 --- a/src/main/resources/views/mobile/activity/Sports/activityList.html +++ b/src/main/resources/views/mobile/activity/Sports/activityList.html @@ -75,7 +75,7 @@ layout("/mobile/platform.html"){
- 进入报名 + 进入报名 diff --git a/src/main/resources/views/mobile/home.html b/src/main/resources/views/mobile/home.html index 877c06b..ff6ba9b 100644 --- a/src/main/resources/views/mobile/home.html +++ b/src/main/resources/views/mobile/home.html @@ -542,6 +542,12 @@ layout("/mobile/platform.html"){ const resp = await $.post("/mobile/login/updatePwd", this.formData) if (resp.code === 0) { this.$toast("修改成功") + this.formData = { + sourcePwd: "", + newPwd: "", + confirmPwd: "" + } + await this.getWeAppLoginCount() this.updatePwdShow = false } else { this.$toast(resp.msg) diff --git a/src/main/resources/views/mobile/login.html b/src/main/resources/views/mobile/login.html index 0d5fd86..0ff3a2d 100644 --- a/src/main/resources/views/mobile/login.html +++ b/src/main/resources/views/mobile/login.html @@ -72,24 +72,26 @@ layout("/mobile/platform.html"){ left: 0; width: 100%; } + + .logo { + height: 300px; + position: relative; /* 如果之前使用了绝对定位，改为相对定位 */ + z-index: 1; /* 确保logo在content下方 */ + } + + .logo img { + width: 100%; + height: 100%; + }
- - Created with Lunacy - - - - - +
-

Welcome

 - - 欢迎登录智慧工会手机平台 +

{{ '' }}

+ + 欢迎登录智慧工会移动服务平台
diff --git a/src/main/resources/views/platform/sys/home/activity.js b/src/main/resources/views/platform/sys/home/activity.js index a3bd9de..cd24837 100644 --- a/src/main/resources/views/platform/sys/home/activity.js +++ b/src/main/resources/views/platform/sys/home/activity.js @@ -51,6 +51,10 @@ const activity = { }) }, enterActivity(item) { + if (item.type === "Activity" && "${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')}||${@shiro.hasRole('gh01')||@shiro.hasRole('gh08')}" === 'false') { + this.$message.warning("该活动只支持基层工会主席报名，个人报名请前往移动端") + return + } if (item.url) { sublime.jumpPagePjax(item.url) } else if (item.url) {