c-zhouhf1/zhgh_cug
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature_程诚_0831问题修复' into release_20260831

Browse Source
This commit is contained in:
c-chengc1
2026-09-01 10:34:54 +08:00
parent dc4a733af5 b46a665322
commit 3bfbb52470
5 changed files with 75 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareUserSelectController.java
+1
View File
@@ -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)) {
src/main/resources/views/platform/zhghh5/welfare/address/addressManager.js
+1 -2
View File
@@ -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,
src/main/resources/views/platform/zhghh5/welfare/mine/list.html
-1
View File
@@ -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,
src/main/resources/views/platform/zhghh5/welfare/select/index.html
+46 -2
View File
@@ -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">
src/main/resources/views/platform/zhghh5/welfare/select/list.html
+27 -2
View File
@@ -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">