diff --git a/src/main/java/com/budwk/app/zhgh/activity/family/controller/manage/FamilyActivityApplyController.java b/src/main/java/com/budwk/app/zhgh/activity/family/controller/manage/FamilyActivityApplyController.java index 8d2004dc..f6fa95eb 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/family/controller/manage/FamilyActivityApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/family/controller/manage/FamilyActivityApplyController.java @@ -87,6 +87,9 @@ public class FamilyActivityApplyController { Cnd cnd = Cnd.NEW(); cnd.andEX("id", "=", id); cnd.andEX("`year`", "=", year); + if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) { + cnd.and("activityName", "like", "%" + pageForm.getSearchKeyword().trim() + "%"); + } //查询报名中 if (activityType == 2) { cnd.and(new Static("now() < activitySignUpEndTime")); @@ -117,6 +120,7 @@ public class FamilyActivityApplyController { @Param(value = "courseTypeId") String courseTypeId, @Param(value = "activityId") String activityId, @Param(value = "assortTypes") String[] assortTypes, + @Param(value = "searchKeyword") String searchKeyword, @Param(value = "dataType") String dataType) { FamilyActivity activity = dao.fetch(FamilyActivity.class, activityId); Sql sql = Sqls.create(""" @@ -131,6 +135,9 @@ public class FamilyActivityApplyController { Cnd cnd = Cnd.NEW(); cnd.andEX("type.id", "=", courseTypeId); cnd.and("tsuc.activityId", "=", activityId); + if (StrUtil.isNotBlank(searchKeyword)) { + cnd.and("tsuc.courseName", "like", "%" + searchKeyword.trim() + "%"); + } if(Lang.isNotEmpty(assortTypes)) { cnd.and("tsuc.assort", "in", assortTypes); } diff --git a/src/main/java/com/budwk/app/zhgh/activity/sports/param/ActivitySportsApplyUserPageParam.java b/src/main/java/com/budwk/app/zhgh/activity/sports/param/ActivitySportsApplyUserPageParam.java index 2182ddb6..dbcb592a 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/sports/param/ActivitySportsApplyUserPageParam.java +++ b/src/main/java/com/budwk/app/zhgh/activity/sports/param/ActivitySportsApplyUserPageParam.java @@ -18,6 +18,7 @@ public class ActivitySportsApplyUserPageParam extends PageForm { private String applyType; private String isAudit; private String groupName; + private String searchKeyword; private String activityId; private String eventId; private String year; diff --git a/src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsApplyUserServiceImpl.java b/src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsApplyUserServiceImpl.java index 8e6e1a43..6a6b2383 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsApplyUserServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsApplyUserServiceImpl.java @@ -122,6 +122,9 @@ public class ActivitySportsApplyUserServiceImpl extends BaseServiceImpl" : "=")))); } cnd.and("ase.activityId", "=", pageParam.getActivityId()); + if (StrUtil.isNotBlank(pageParam.getSearchKeyword())) { + cnd.and("eve.allName", "like", "%" + pageParam.getSearchKeyword().trim() + "%"); + } cnd.andEX("ase.eventId", "=", pageParam.getEventId()); cnd.andEX("YEAR(school.applyStartTime)", "=", pageParam.getYear()); diff --git a/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/manage/TrainSignUpApplyController.java b/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/manage/TrainSignUpApplyController.java index 2b5c931e..7aca142e 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/manage/TrainSignUpApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/manage/TrainSignUpApplyController.java @@ -126,6 +126,7 @@ public class TrainSignUpApplyController { @Param(value = "courseTypeId") String courseTypeId, @Param(value = "activityId") String activityId, @Param(value = "assortTypes") String[] assortTypes, + @Param(value = "searchKeyword") String searchKeyword, @Param(value = "dataType") String dataType) { Sql sql = Sqls.create(""" SELECT @@ -159,6 +160,9 @@ public class TrainSignUpApplyController { Cnd cnd = Cnd.NEW(); cnd.andEX("type.id", "=", courseTypeId); cnd.and("tsuc.activityId", "=", activityId); + if (StrUtil.isNotBlank(searchKeyword)) { + cnd.and("tsuc.courseName", "like", "%" + searchKeyword.trim() + "%"); + } if (Lang.isNotEmpty(assortTypes)) { cnd.and("tsuc.assort", "in", assortTypes); diff --git a/src/main/resources/static/assets/mobile/img/activity/family-empty.png b/src/main/resources/static/assets/mobile/img/activity/family-empty.png new file mode 100644 index 00000000..0a6d35c7 Binary files /dev/null and b/src/main/resources/static/assets/mobile/img/activity/family-empty.png differ diff --git a/src/main/resources/static/assets/mobile/img/activity/hero/brand-hero-v2.png b/src/main/resources/static/assets/mobile/img/activity/hero/brand-hero-v2.png new file mode 100644 index 00000000..cf56618c Binary files /dev/null and b/src/main/resources/static/assets/mobile/img/activity/hero/brand-hero-v2.png differ diff --git a/src/main/resources/static/assets/mobile/img/activity/hero/culture-hero-v2.png b/src/main/resources/static/assets/mobile/img/activity/hero/culture-hero-v2.png new file mode 100644 index 00000000..1b690574 Binary files /dev/null and b/src/main/resources/static/assets/mobile/img/activity/hero/culture-hero-v2.png differ diff --git a/src/main/resources/static/assets/mobile/img/activity/hero/culture-hero-v3.png b/src/main/resources/static/assets/mobile/img/activity/hero/culture-hero-v3.png new file mode 100644 index 00000000..a9b3777c Binary files /dev/null and b/src/main/resources/static/assets/mobile/img/activity/hero/culture-hero-v3.png differ diff --git a/src/main/resources/static/assets/mobile/img/activity/hero/family-hero-v2.png b/src/main/resources/static/assets/mobile/img/activity/hero/family-hero-v2.png new file mode 100644 index 00000000..21468506 Binary files /dev/null and b/src/main/resources/static/assets/mobile/img/activity/hero/family-hero-v2.png differ diff --git a/src/main/resources/static/assets/mobile/img/activity/hero/family-hero-v3.png b/src/main/resources/static/assets/mobile/img/activity/hero/family-hero-v3.png new file mode 100644 index 00000000..41b2d42a Binary files /dev/null and b/src/main/resources/static/assets/mobile/img/activity/hero/family-hero-v3.png differ diff --git a/src/main/resources/static/assets/mobile/img/activity/hero/sports-hero-v2.png b/src/main/resources/static/assets/mobile/img/activity/hero/sports-hero-v2.png new file mode 100644 index 00000000..1384656e Binary files /dev/null and b/src/main/resources/static/assets/mobile/img/activity/hero/sports-hero-v2.png differ diff --git a/src/main/resources/static/assets/mobile/img/activity/schedule-empty.png b/src/main/resources/static/assets/mobile/img/activity/schedule-empty.png new file mode 100644 index 00000000..c3a5a471 Binary files /dev/null and b/src/main/resources/static/assets/mobile/img/activity/schedule-empty.png differ diff --git a/src/main/resources/static/assets/mobile/img/common/smart-union-loading-red.svg b/src/main/resources/static/assets/mobile/img/common/smart-union-loading-red.svg index e806911b..25c2a727 100644 --- a/src/main/resources/static/assets/mobile/img/common/smart-union-loading-red.svg +++ b/src/main/resources/static/assets/mobile/img/common/smart-union-loading-red.svg @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/static/assets/mobile/img/home/v4/app-center-empty-v4.png b/src/main/resources/static/assets/mobile/img/home/v4/app-center-empty-v4.png new file mode 100644 index 00000000..34375bf8 Binary files /dev/null and b/src/main/resources/static/assets/mobile/img/home/v4/app-center-empty-v4.png differ diff --git a/src/main/resources/static/assets/mobile/img/home/v4/feature-activity-v2.png b/src/main/resources/static/assets/mobile/img/home/v4/feature-activity-v2.png new file mode 100644 index 00000000..016c82b9 Binary files /dev/null and b/src/main/resources/static/assets/mobile/img/home/v4/feature-activity-v2.png differ diff --git a/src/main/resources/static/assets/mobile/img/home/v4/feature-activity-v3.png b/src/main/resources/static/assets/mobile/img/home/v4/feature-activity-v3.png new file mode 100644 index 00000000..9b7ec1cb Binary files /dev/null and b/src/main/resources/static/assets/mobile/img/home/v4/feature-activity-v3.png differ diff --git a/src/main/resources/static/assets/mobile/img/home/v4/feature-activity-v4.png b/src/main/resources/static/assets/mobile/img/home/v4/feature-activity-v4.png new file mode 100644 index 00000000..0178d17d Binary files /dev/null and b/src/main/resources/static/assets/mobile/img/home/v4/feature-activity-v4.png differ diff --git a/src/main/resources/static/assets/mobile/img/home/v4/feature-activity-v5.png b/src/main/resources/static/assets/mobile/img/home/v4/feature-activity-v5.png new file mode 100644 index 00000000..9724d80e Binary files /dev/null and b/src/main/resources/static/assets/mobile/img/home/v4/feature-activity-v5.png differ diff --git a/src/main/resources/static/assets/mobile/img/home/v4/feature-benefit-v2.png b/src/main/resources/static/assets/mobile/img/home/v4/feature-benefit-v2.png new file mode 100644 index 00000000..d917fb4b Binary files /dev/null and b/src/main/resources/static/assets/mobile/img/home/v4/feature-benefit-v2.png differ diff --git a/src/main/resources/static/assets/mobile/img/home/v4/feature-benefit-v3.png b/src/main/resources/static/assets/mobile/img/home/v4/feature-benefit-v3.png new file mode 100644 index 00000000..01b89191 Binary files /dev/null and b/src/main/resources/static/assets/mobile/img/home/v4/feature-benefit-v3.png differ diff --git a/src/main/resources/static/assets/mobile/img/home/v4/feature-benefit-v4.png b/src/main/resources/static/assets/mobile/img/home/v4/feature-benefit-v4.png new file mode 100644 index 00000000..c4451a12 Binary files /dev/null and b/src/main/resources/static/assets/mobile/img/home/v4/feature-benefit-v4.png differ diff --git a/src/main/resources/static/assets/mobile/img/home/v4/feature-benefit-v5.png b/src/main/resources/static/assets/mobile/img/home/v4/feature-benefit-v5.png new file mode 100644 index 00000000..7098f633 Binary files /dev/null and b/src/main/resources/static/assets/mobile/img/home/v4/feature-benefit-v5.png differ diff --git a/src/main/resources/static/assets/mobile/img/home/v4/feature-inclusive-v2.png b/src/main/resources/static/assets/mobile/img/home/v4/feature-inclusive-v2.png new file mode 100644 index 00000000..2a73111d Binary files /dev/null and b/src/main/resources/static/assets/mobile/img/home/v4/feature-inclusive-v2.png differ diff --git a/src/main/resources/static/assets/mobile/img/home/v4/feature-inclusive-v3.png b/src/main/resources/static/assets/mobile/img/home/v4/feature-inclusive-v3.png new file mode 100644 index 00000000..d43df616 Binary files /dev/null and b/src/main/resources/static/assets/mobile/img/home/v4/feature-inclusive-v3.png differ diff --git a/src/main/resources/static/assets/mobile/img/home/v4/feature-inclusive-v4.png b/src/main/resources/static/assets/mobile/img/home/v4/feature-inclusive-v4.png new file mode 100644 index 00000000..1520d577 Binary files /dev/null and b/src/main/resources/static/assets/mobile/img/home/v4/feature-inclusive-v4.png differ diff --git a/src/main/resources/static/assets/mobile/img/home/v4/feature-inclusive-v5.png b/src/main/resources/static/assets/mobile/img/home/v4/feature-inclusive-v5.png new file mode 100644 index 00000000..532b1ad1 Binary files /dev/null and b/src/main/resources/static/assets/mobile/img/home/v4/feature-inclusive-v5.png differ diff --git a/src/main/resources/static/assets/mobile/img/home/v4/feature-model-v2.png b/src/main/resources/static/assets/mobile/img/home/v4/feature-model-v2.png new file mode 100644 index 00000000..d2720632 Binary files /dev/null and b/src/main/resources/static/assets/mobile/img/home/v4/feature-model-v2.png differ diff --git a/src/main/resources/static/assets/mobile/img/home/v4/feature-model-v3.png b/src/main/resources/static/assets/mobile/img/home/v4/feature-model-v3.png new file mode 100644 index 00000000..bb1f60a6 Binary files /dev/null and b/src/main/resources/static/assets/mobile/img/home/v4/feature-model-v3.png differ diff --git a/src/main/resources/static/assets/mobile/img/home/v4/feature-model-v4.png b/src/main/resources/static/assets/mobile/img/home/v4/feature-model-v4.png new file mode 100644 index 00000000..22532c68 Binary files /dev/null and b/src/main/resources/static/assets/mobile/img/home/v4/feature-model-v4.png differ diff --git a/src/main/resources/static/assets/mobile/img/home/v4/feature-model-v5.png b/src/main/resources/static/assets/mobile/img/home/v4/feature-model-v5.png new file mode 100644 index 00000000..92999376 Binary files /dev/null and b/src/main/resources/static/assets/mobile/img/home/v4/feature-model-v5.png differ diff --git a/src/main/resources/static/components/module/activity/ActivityScheduleCalendar.vue b/src/main/resources/static/components/module/activity/ActivityScheduleCalendar.vue new file mode 100644 index 00000000..371d58e6 --- /dev/null +++ b/src/main/resources/static/components/module/activity/ActivityScheduleCalendar.vue @@ -0,0 +1,634 @@ +
+ +
+
+ +
{{ currentYear }}年{{ currentMonth }}月
+ +
+ +
+ {{ item }} +
+
+ +
+ +
+ 已签到 + 可签到 + 未开始 +
+ +
+ +
+
+ {{ selectedDate ? selectedDate + ' 的活动时段' : '活动时段' }} +
+
+
+
+ +
+
+ {{ formatTime(item.courseStartTime) }} - {{ formatTime(item.courseEndTime) }} +
+
+ + {{ row.courseLocation }} +
+
+
+ 已签到 + + + {{ getScheduleStatus(item) }} + +
+
+
+ +
当天暂无签到时段
+
当前日期没有需要签到的活动安排
+
+
+
+
+ + + + +
+ + + + + diff --git a/src/main/resources/static/components/plugins/h5/TableList.vue b/src/main/resources/static/components/plugins/h5/TableList.vue index 4695055b..cc20e4a5 100644 --- a/src/main/resources/static/components/plugins/h5/TableList.vue +++ b/src/main/resources/static/components/plugins/h5/TableList.vue @@ -1,7 +1,9 @@