Merge remote-tracking branch 'origin/main'

src/main/java/com/budwk/app/sys/controller/SysH5IndexController.java

@@ -76,7 +76,10 @@ public class SysH5IndexController {
             Date startDate = activity.getStartDate();
             Date endDate = activity.getEndDate();
             // 判断当前时间是否在活动范围内，不在就过滤掉
-            if (!DateUtil.isIn(today, startDate, endDate)) {
+            /*if (!DateUtil.isIn(today, startDate, endDate)) {
+                continue;
+            }*/
+            if(DateUtil.compare(today, endDate) > 0) {
                 continue;
             }
             Integer allowUserGroupId = activity.getAllowUserGroupId();

src/main/java/com/budwk/app/sys/controller/SysHomeController.java

@@ -176,7 +176,10 @@ public class SysHomeController {
             Date startDate = activity.getStartDate();
             Date endDate = activity.getEndDate();
             // 判断当前时间是否在活动范围内，不在就过滤掉
-            if (!DateUtil.isIn(today, startDate, endDate)) {
+            /*if (!DateUtil.isIn(today, startDate, endDate)) {
+                continue;
+            }*/
+            if(DateUtil.compare(today, endDate) > 0) {
                 continue;
             }
             Integer allowUserGroupId = activity.getAllowUserGroupId();

src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareListServiceImpl.java

@@ -468,6 +468,7 @@ public class WelfareListServiceImpl extends BaseServiceImpl<WelfareList> impleme
         cnd.andEX("u.personType", "in", pageForm.getPersonTypes());
         cnd.andEX("u.preparedBy", "in", pageForm.getPreparedBys());
         cnd.andEX("u.userState", "in", pageForm.getUserStates());
+        cnd.andEX("u.member","=",pageForm.getIsMember());
 
         if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
             cnd.asc("u.unionCode");
@@ -519,6 +520,7 @@ public class WelfareListServiceImpl extends BaseServiceImpl<WelfareList> impleme
         cnd.andEX("personType", "in", pageForm.getPersonTypes());
         cnd.andEX("preparedBy", "in", pageForm.getPreparedBys());
         cnd.andEX("userState", "in", pageForm.getUserStates());
+        cnd.andEX("member","=",pageForm.getIsMember());
 
         if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
             cnd.asc("unionCode");

src/main/resources/views/platform/sys/home/activity.js

@@ -22,9 +22,14 @@ const activity = {
                                     </el-tag>
 
                                     <el-tag class="act-item-tag" type="success" size="mini"
-                                            v-else-if="$moment().unix() < $moment(item.endDate).unix()">
+                                            v-else-if="$moment().unix() > $moment(item.startDate).unix() && $moment().unix() < $moment(item.endDate).unix()">
                                         进行中
                                     </el-tag>
+
+                                    <el-tag class="act-item-tag" type="success" size="mini"
+                                            v-else-if="$moment().unix() < $moment(item.startDate).unix()">
+                                        即将开始
+                                    </el-tag>
                                 </div>
                                 <div style="flex: 1;height: 90px;display: flex;flex-direction: column;justify-content: space-between;">
                                     <div style="color: #111">

src/main/resources/views/platform/zhghh5/sys/home/home.js

@@ -38,9 +38,13 @@ const home = {
                             已结束
                         </van-tag>
                         
-                        <van-tag class="act-item-wrapper-tag" type="success" v-else-if="$moment().unix() < $moment(item.endDate).unix()">
+                        <van-tag class="act-item-wrapper-tag" type="success" v-else-if="$moment().unix() > $moment(item.startDate).unix() && $moment().unix() < $moment(item.endDate).unix()">
                             进行中
                         </van-tag>
+
+                        <van-tag class="act-item-wrapper-tag" type="primary" v-else-if="$moment().unix() < $moment(item.startDate).unix()">
+                            即将开始
+                        </van-tag>
                         
                         <div class="act-item-cover">
                             <van-image v-if="item.cover" width="120" height="84" :src="item.cover"></van-image>

src/main/resources/views/platform/zhghh5/sys/home/index.html

@@ -6,7 +6,7 @@ layout("/layouts/platform_h5.html"){
 
 <div id="app" v-cloak>
     <div>
-        <div>
+        <div style="height: calc(100vh - 50px); overflow-y: auto">
             <home v-if="homeTabbarActive === 'home'" @module-click="moduleClick"></home>
             <work v-if="homeTabbarActive === 'work'"></work>
             <mine v-if="homeTabbarActive === 'mine'"></mine>