From b46a665322be15b01751c76013d1b3f58653864e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A8=8B=E8=AF=9A?= <1009578407@qq.com>
Date: Tue, 1 Sep 2026 10:34:13 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=81=8C=E5=B7=A5=E7=A6=8F=E5=88=A9-?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=88=97=E8=A1=A8=E8=BF=87=E6=BB=A4=E9=9D=9E?=
 =?UTF-8?q?=E5=A5=97=E9=A4=90=E6=95=B0=E6=8D=AE=EF=BC=8C=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E6=A0=8F=E6=A0=B7=E5=BC=8F=E7=BB=9F=E4=B8=80=EF=BC=8C=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E7=BC=BA=E5=A4=B1=E5=8D=A0=E4=BD=8D=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WelfareUserSelectController.java          |  1 +
 .../zhghh5/welfare/address/addressManager.js  |  3 +-
 .../platform/zhghh5/welfare/mine/list.html    |  1 -
 .../platform/zhghh5/welfare/select/index.html | 48 ++++++++++++++++++-
 .../platform/zhghh5/welfare/select/list.html  | 29 ++++++++++-
 5 files changed, 75 insertions(+), 7 deletions(-)

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"){
 
         <!-- 项目头部信息 -->
         <div class="welfare-header" v-if="!pageLoading && projectInfo.id">
-            <img :src="projectInfo.cover" class="welfare-header-img"/>
+            <van-image v-if="projectInfo.cover" :src="projectInfo.cover" class="welfare-header-img" fit="cover">
+                <template #error>
+                    <div class="welfare-image-state">
+                        <van-icon name="photo-o"></van-icon>
+                        <span>图片加载失败</span>
+                    </div>
+                </template>
+            </van-image>
+            <div v-else class="welfare-header-img welfare-image-state">
+                <van-icon name="photo-o"></van-icon>
+                <span>暂无图片</span>
+            </div>
         </div>
 
         <div class="main-content" v-if="!pageLoading && projectInfo.id">
@@ -810,7 +843,18 @@ layout("/layouts/platform_h5.html"){
                     <div class="welfare-option-main">
                         <div class="welfare-option-image" role="button" aria-label="查看福利图片"
                              @click.stop="previewOptionImage(option)">
-                            <van-image :src="option.imgUrl" fit="cover" width="100%" height="100%" radius="4px"></van-image>
+                            <van-image v-if="option.imgUrl" :src="option.imgUrl" fit="cover" width="100%" height="100%" radius="4px">
+                                <template #error>
+                                    <div class="welfare-image-state">
+                                        <van-icon name="photo-o"></van-icon>
+                                        <span>图片加载失败</span>
+                                    </div>
+                                </template>
+                            </van-image>
+                            <div v-else class="welfare-image-state">
+                                <van-icon name="photo-o"></van-icon>
+                                <span>暂无图片</span>
+                            </div>
                         </div>
 
                         <div class="welfare-option-content">
diff --git a/src/main/resources/views/platform/zhghh5/welfare/select/list.html b/src/main/resources/views/platform/zhghh5/welfare/select/list.html
index 0a51e3b7..dedefee7 100644
--- a/src/main/resources/views/platform/zhghh5/welfare/select/list.html
+++ b/src/main/resources/views/platform/zhghh5/welfare/select/list.html
@@ -21,7 +21,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,
@@ -191,6 +190,24 @@ layout("/layouts/platform_h5.html"){
         font-size: 13px;
     }
 
+    .welfare-list-card__cover-state {
+        display: flex;
+        width: 100%;
+        height: 150px;
+        align-items: center;
+        justify-content: center;
+        flex-direction: column;
+        row-gap: 8px;
+        color: #8da1ba;
+        background-color: #edf4fc;
+        font-size: 13px;
+        line-height: normal;
+    }
+
+    .welfare-list-card__cover-state .van-icon {
+        font-size: 34px;
+    }
+
     .welfare-list-card__body {
         position: relative;
         padding: 12px 14px 14px;
@@ -468,6 +485,7 @@ layout("/layouts/platform_h5.html"){
                             @click="openChoose(row)"
                     >
                         <van-image
+                                v-if="row.cover"
                                 class="welfare-list-card__cover"
                                 :src="row.cover"
                                 :alt="row.name"
@@ -477,9 +495,16 @@ layout("/layouts/platform_h5.html"){
                                 <van-loading type="spinner" size="22"></van-loading>
                             </template>
                             <template #error>
-                                <van-icon name="photo-o" size="34"></van-icon>
+                                <div class="welfare-list-card__cover-state">
+                                    <van-icon name="photo-o"></van-icon>
+                                    <span>图片加载失败</span>
+                                </div>
                             </template>
                         </van-image>
+                        <div v-else class="welfare-list-card__cover-state">
+                            <van-icon name="photo-o"></van-icon>
+                            <span>暂无图片</span>
+                        </div>
 
                         <div class="welfare-list-card__body">
                             <div class="welfare-list-card__head">