From 7e8b2ef0804942de658b16f9eed2d3fbd01e865b Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期一, 08 九月 2025 14:16:44 +0800 Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp --- apps/cMiniApp/src/pages/task/InnerPage.vue | 47 +++++++++++++++++++++++++++++------------------ 1 files changed, 29 insertions(+), 18 deletions(-) diff --git a/apps/cMiniApp/src/pages/task/InnerPage.vue b/apps/cMiniApp/src/pages/task/InnerPage.vue index 3f5639d..76512dc 100644 --- a/apps/cMiniApp/src/pages/task/InnerPage.vue +++ b/apps/cMiniApp/src/pages/task/InnerPage.vue @@ -1,5 +1,5 @@ <template> - <Calendar v-model="queryState.date"></Calendar> + <Calendar key="calendar" v-model="queryState.date"></Calendar> <ProTabs v-model="queryState.checkReceiveStatus" name="task-tab" @@ -16,21 +16,23 @@ ></ProTabPane> <ProTabPane :title="`宸查獙鏀禶" :pane-key="EnumTaskCheckReceiveStatus.Completed"></ProTabPane> </ProTabs> - <InfiniteLoading - scrollViewClassName="common-infinite-scroll-list task-list" - v-bind="infiniteLoadingProps" - :key="queryState.checkReceiveStatus" - > - <template #renderItem="{ item }"> - <MyTaskCard - :name="item.name" - :addressName="item.addressName" - :begin-time="item.beginTime" - :end-time="item.endTime" - @click="goSubmitTaskDetail(item)" - /> - </template> - </InfiniteLoading> + <div class="task-list-container"> + <InfiniteLoading + scrollViewClassName="common-infinite-scroll-list task-list" + v-bind="infiniteLoadingProps" + :key="queryState.checkReceiveStatus" + > + <template #renderItem="{ item }"> + <MyTaskCard + :name="item.name" + :addressName="item.addressName" + :begin-time="item.beginTime" + :end-time="item.endTime" + @click="goSubmitTaskDetail(item)" + /> + </template> + </InfiniteLoading> + </div> </template> <script setup lang="ts"> @@ -65,7 +67,16 @@ <style lang="scss"> @import '@/styles/common.scss'; -.task-list { - @include infiniteLoadingInTabBarPage; +.task-page-wrapper { + .task-list-container { + flex: 1; + min-height: 0; + display: flex; + flex-direction: column; + } + + .task-list { + @include infiniteLoadingInTabBarPage; + } } </style> -- Gitblit v1.9.1