server_commit

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();

src/main/resources/views/mobile/activity/Sports/activityEventList.html

@@ -228,7 +228,7 @@ layout("/mobile/platform.html"){
         <div style="display: flex; justify-content: center" v-if="!isView">
             <van-radio-group v-model="formData.isCy" direction="horizontal" v-if="activityData.isSign">
                 <van-radio name="1"></van-radio>
-                <span style="color: red" @click="fxgzsActionPopup=true">自愿参赛责任及风险告知书</span>
+                <span style="color: red" @click="fxgzsActionPopup=true">我已阅读参赛责任及风险告知书</span>
             </van-radio-group>
         </div>
 

src/main/resources/views/mobile/activity/Sports/activityList.html

@@ -75,7 +75,7 @@ layout("/mobile/platform.html"){
     <van-action-sheet v-model="show" title="活动通知">
         <div v-html="activityInfo.eventNotification" style="padding: 1px 15px 30px 15px"></div>
 
-        <van-button type="primary" block @click="openApply" style="position: fixed; bottom: 0">进入报名</van-button>
+        <van-button type="primary" block @click="openApply" style="position: fixed; bottom: 40px">进入报名</van-button>
     </van-action-sheet>
 </div>
 

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)

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) {