From 2fd7876d9a266025a1cf81f81df4b497a0ac576d Mon Sep 17 00:00:00 2001 From: zhangrui Date: Wed, 2 Sep 2026 16:18:20 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A6=8F=E5=88=A9=E7=AE=A1=E7=90=86=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=B8=A9=E9=A6=A8=E6=8F=90=E7=A4=BA=EF=BC=8C=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E7=A6=8F=E5=88=A9=E5=8F=AF=E4=BB=A5=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/commons/proc/NutShiroProcessor.java | 2 +- .../WelfareProjectMangeController.java | 1 + .../zhgh/welfare/model/WelfareProject.java | 8 ++++++ .../views/mobile/welfare/list/receive.html | 25 ++++++++++--------- .../welfare/project/ProjectMange.html | 10 ++++++++ .../views/platform/welfare/userChoose.html | 20 ++++++--------- 6 files changed, 40 insertions(+), 26 deletions(-) diff --git a/src/main/java/io/v/nutz/web/commons/proc/NutShiroProcessor.java b/src/main/java/io/v/nutz/web/commons/proc/NutShiroProcessor.java index 8f902a3..4ba4630 100644 --- a/src/main/java/io/v/nutz/web/commons/proc/NutShiroProcessor.java +++ b/src/main/java/io/v/nutz/web/commons/proc/NutShiroProcessor.java @@ -68,7 +68,7 @@ public class NutShiroProcessor extends AbstractProcessor { //不需要认证授权的url String[] authIgnoreUrlArr = Lang.array("/", "/sso/login", -// "/platform/login", + "/platform/login", "/platform/login(/doLogin|/logout|/captcha)", "/platform/qywechat/.*", "/platform/home/(500|403|404|UnknownAccountError|LockedAccountError)", diff --git a/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareProjectMangeController.java b/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareProjectMangeController.java index 5b126e1..6f072a7 100644 --- a/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareProjectMangeController.java +++ b/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareProjectMangeController.java @@ -119,6 +119,7 @@ public class WelfareProjectMangeController { @At @ViReturn + @Aop(TransAop.READ_COMMITTED) @RequiresPermissions("welfare.project.mange") public Object save(WelfareProject project) { diff --git a/src/main/java/io/v/nutz/zhgh/welfare/model/WelfareProject.java b/src/main/java/io/v/nutz/zhgh/welfare/model/WelfareProject.java index e5582c5..ce27f71 100644 --- a/src/main/java/io/v/nutz/zhgh/welfare/model/WelfareProject.java +++ b/src/main/java/io/v/nutz/zhgh/welfare/model/WelfareProject.java @@ -152,6 +152,14 @@ public class WelfareProject extends BaseModel implements Serializable, SysHomeCo @ColDefine(type = ColType.VARCHAR, width = 100) private String gift; + /** + * 职工选择福利时展示的项目提示内容，支持多行文本。 + */ + @Column + @Comment("温馨提示") + @ColDefine(type = ColType.TEXT) + private String warmTip; + @Column @Comment("弹性礼品") @ColDefine(type = ColType.MYSQL_JSON) diff --git a/src/main/resources/views/mobile/welfare/list/receive.html b/src/main/resources/views/mobile/welfare/list/receive.html index 96fee3e..789adcb 100644 --- a/src/main/resources/views/mobile/welfare/list/receive.html +++ b/src/main/resources/views/mobile/welfare/list/receive.html @@ -146,6 +146,10 @@ layout("/mobile/platform.html"){ .van-submit-bar__button { width: 150px; } + + .warm-tip .van-notice-bar__content { + white-space: pre-line; + }
@@ -160,18 +164,15 @@ layout("/mobile/platform.html"){ fit="cover">
- - -
- 温馨提醒 -
-
-
1.本次慰问品共2种套餐，教职工可任选其中1种套餐快递(1个快递发货)，快递地址仅限江浙沪(江苏，浙江，上海)。
-
2.快递预计于2026年6月18日前投递完成，请各位老师保持联系电话畅通并及时接听。
-
3.填写截止时间：5月26日13点，没有在规定时间内选套餐的默认套餐1，并统一快递至瓯江囗校区自取。
-
- - + + * {{projectInfo.warmTip}} + diff --git a/src/main/resources/views/platform/welfare/project/ProjectMange.html b/src/main/resources/views/platform/welfare/project/ProjectMange.html index 579b659..029f158 100644 --- a/src/main/resources/views/platform/welfare/project/ProjectMange.html +++ b/src/main/resources/views/platform/welfare/project/ProjectMange.html @@ -389,6 +389,15 @@ layout("/layouts/platform.html"){ ref="questionNaire" > + + + + @@ -757,6 +766,7 @@ layout("/layouts/platform.html"){ defaultFlexibleGifts: 0, flexible: false, noticePushMode: 1, + warmTip: '', welfareProjectSubjects: [], flexibleGifts: [{}] } diff --git a/src/main/resources/views/platform/welfare/userChoose.html b/src/main/resources/views/platform/welfare/userChoose.html index d8cd7f5..0a7f0a6 100644 --- a/src/main/resources/views/platform/welfare/userChoose.html +++ b/src/main/resources/views/platform/welfare/userChoose.html @@ -4,13 +4,6 @@ layout("/layouts/platform.html"){