diff --git a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareUserSelectController.java b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareUserSelectController.java index 6bf72b60..36e814a9 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareUserSelectController.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareUserSelectController.java @@ -70,6 +70,7 @@ public class WelfareUserSelectController { Cnd cnd = Cnd.NEW(); cnd.and("wp.provideMode", "in", "2,3"); + cnd.and("wp.flexible", "=", true); cnd.andEX("YEAR(wp.choiceTimeStart)", "in", year); cnd.and("wp.isDisabled", "=", 0); if (StrUtil.isNotBlank(name)) { diff --git a/src/main/resources/views/platform/zhghh5/welfare/address/addressManager.js b/src/main/resources/views/platform/zhghh5/welfare/address/addressManager.js index 0f51fe4c..8e111808 100644 --- a/src/main/resources/views/platform/zhghh5/welfare/address/addressManager.js +++ b/src/main/resources/views/platform/zhghh5/welfare/address/addressManager.js @@ -697,7 +697,7 @@ const WELFARE_ADDRESS_MANAGER_COMPONENT = { /deep/ .address-list-header { flex-shrink: 0; } /deep/ .address-list-header .van-nav-bar { z-index: 3; } /deep/ .address-list-header .van-nav-bar__title, - /deep/ .address-edit-page .van-nav-bar__title { color: #171d29; font-size: 17px; font-weight: 600; } + /deep/ .address-edit-page .van-nav-bar__title { color: #171d29; font-size: 16px; } /deep/ .address-list-header .van-nav-bar .van-icon, /deep/ .address-list-header .van-nav-bar__text, /deep/ .address-edit-page .van-nav-bar .van-icon, @@ -877,7 +877,6 @@ const WELFARE_ADDRESS_MANAGER_COMPONENT = { .welfare-address-manager.address-size-compact /deep/ .address-edit-page .van-nav-bar__title { color: #1f2937; font-size: 16px; - font-weight: 600; } .welfare-address-manager.address-size-compact /deep/ .address-list-header .van-nav-bar .van-icon, .welfare-address-manager.address-size-compact /deep/ .address-list-header .van-nav-bar__text, diff --git a/src/main/resources/views/platform/zhghh5/welfare/mine/list.html b/src/main/resources/views/platform/zhghh5/welfare/mine/list.html index 63039c7e..2e9605f4 100644 --- a/src/main/resources/views/platform/zhghh5/welfare/mine/list.html +++ b/src/main/resources/views/platform/zhghh5/welfare/mine/list.html @@ -20,7 +20,6 @@ layout("/layouts/platform_h5.html"){ .welfare-list-page .van-nav-bar__title { color: #1f2937; font-size: 16px; - font-weight: 600; } .welfare-list-page .van-nav-bar .van-icon, diff --git a/src/main/resources/views/platform/zhghh5/welfare/select/index.html b/src/main/resources/views/platform/zhghh5/welfare/select/index.html index f0090cc2..185ac32d 100644 --- a/src/main/resources/views/platform/zhghh5/welfare/select/index.html +++ b/src/main/resources/views/platform/zhghh5/welfare/select/index.html @@ -114,6 +114,24 @@ layout("/layouts/platform_h5.html"){ object-position: center; } + .welfare-image-state { + display: flex; + width: 100%; + height: 100%; + align-items: center; + justify-content: center; + flex-direction: column; + row-gap: 8px; + color: #8da1ba; + background-color: #edf4fc; + font-size: 13px; + box-sizing: border-box; + } + + .welfare-image-state .van-icon { + font-size: 34px; + } + .main-content { position: relative; z-index: 1; @@ -165,6 +183,10 @@ layout("/layouts/platform_h5.html"){ background: #f7f8fa; } + .welfare-option-image .welfare-image-state .van-icon { + font-size: 30px; + } + .welfare-option-content { padding: 16px 14px 14px; flex: 1; @@ -773,7 +795,18 @@ layout("/layouts/platform_h5.html"){