From f95d3066203612a450e462edd679eb5a4973f35c Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 10 十一月 2025 16:59:29 +0800
Subject: [PATCH] fix: bug

---
 apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue |   84 ++++++++++++++++++++++++++----------------
 1 files changed, 52 insertions(+), 32 deletions(-)

diff --git a/apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue
index b8760a6..3525f58 100644
--- a/apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/taskCheck/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"
-    v-bind="infiniteLoadingProps"
-    :key="queryState.checkReceiveStatus"
-  >
-    <template #renderItem="{ item }">
-      <MyTaskCard
-        :name="item.name"
-        :beginTime="item.beginTime"
-        :endTime="item.endTime"
-        :addressName="item.addressName"
-        @click="goSubmitTaskDetail(item)"
-      />
-    </template>
-  </InfiniteLoading>
+  <div class="task-list-container">
+    <InfiniteLoading
+      scrollViewClassName="common-infinite-scroll-list"
+      v-bind="infiniteLoadingProps"
+      :key="queryState.checkReceiveStatus"
+    >
+      <template #renderItem="{ item }">
+        <MyTaskCard
+          :name="item.name"
+          :beginTime="item.beginTime"
+          :endTime="item.endTime"
+          :addressName="item.addressName"
+          @click="goSubmitTaskDetail(item)"
+        />
+      </template>
+    </InfiniteLoading>
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -47,21 +49,39 @@
 const { queryState, infiniteLoadingProps } = useCheckReceiveTasks();
 
 function goSubmitTaskDetail(item: API.GetCheckReceiveTasksQueryResultItem) {
-  if (
-    item.checkReceiveMethod === EnumTaskCheckReceiveMethod.CheckIn &&
-    dayjs(queryState.date).isBefore(dayjs())
-  ) {
-    Taro.navigateTo({
-      url: `${RouterPath.taskUserSubmitCheckHistories}?id=${item.id}&date=${dayjs(
-        queryState.date
-      ).format('YYYY-MM-DD')}`,
-    });
-  } else {
-    Taro.navigateTo({
-      url: `${RouterPath.taskCheckDetail}?id=${item.id}&date=${dayjs(queryState.date).format(
-        'YYYY-MM-DD'
-      )}&checkReceiveStatus=${queryState.checkReceiveStatus}`,
-    });
-  }
+  // if (
+  //   item.checkReceiveMethod === EnumTaskCheckReceiveMethod.CheckIn &&
+  //   dayjs(queryState.date).isBefore(dayjs(), 'day')
+  // ) {
+  //   Taro.navigateTo({
+  //     url: `${RouterPath.taskUserSubmitCheckHistories}?id=${item.id}&date=${dayjs(
+  //       queryState.date
+  //     ).format('YYYY-MM-DD')}`,
+  //   });
+  // } else {
+  //   Taro.navigateTo({
+  //     url: `${RouterPath.taskCheckDetail}?id=${item.id}&date=${dayjs(queryState.date).format(
+  //       'YYYY-MM-DD'
+  //     )}&checkReceiveStatus=${queryState.checkReceiveStatus}`,
+  //   });
+  // }
+  Taro.navigateTo({
+    url: `${RouterPath.taskCheckDetail}?id=${item.id}&date=${dayjs(queryState.date).format(
+      'YYYY-MM-DD'
+    )}&checkReceiveStatus=${queryState.checkReceiveStatus}`,
+  });
 }
 </script>
+
+<style lang="scss">
+@import '@/styles/common.scss';
+
+.taskCheck-page-wrapper {
+  .task-list-container {
+    flex: 1;
+    min-height: 0;
+    display: flex;
+    flex-direction: column;
+  }
+}
+</style>

--
Gitblit v1.9.1