From 40ed21141404ea96af41bac752b22c0f9a838168 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 10 十一月 2025 14:55:20 +0800
Subject: [PATCH] fix: bug

---
 apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue |   89 ++++++++++++++++++++++++++++++--------------
 1 files changed, 61 insertions(+), 28 deletions(-)

diff --git a/apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue
index 2010249..3525f58 100644
--- a/apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue
@@ -1,7 +1,7 @@
 <template>
-  <Calendar v-model="queryMenuState.time"></Calendar>
+  <Calendar key="calendar" v-model="queryState.date"></Calendar>
   <ProTabs
-    v-model="queryMenuState.checkReceiveStatus"
+    v-model="queryState.checkReceiveStatus"
     name="task-tab"
     :showPaneContent="false"
     class="task-tabs"
@@ -9,46 +9,79 @@
     title-gutter="8"
     title-scroll
   >
-    <ProTabPane :title="`寰呮彁浜" :pane-key="EnumTaskCheckReceiveStatus.Wait"></ProTabPane>
-    <ProTabPane :title="`寰呴獙鏀禶" :pane-key="EnumTaskCheckReceiveStatus.Wait"></ProTabPane>
+    <ProTabPane :title="`寰呮彁浜" :pane-key="EnumTaskCheckReceiveStatus.WaitSubmit"></ProTabPane>
+    <ProTabPane
+      :title="`寰呴獙鏀禶"
+      :pane-key="EnumTaskCheckReceiveStatus.WaitCheckReceive"
+    ></ProTabPane>
     <ProTabPane :title="`宸查獙鏀禶" :pane-key="EnumTaskCheckReceiveStatus.Completed"></ProTabPane>
   </ProTabs>
-  <InfiniteLoading
-    scrollViewClassName="common-infinite-scroll-list"
-    v-bind="infiniteLoadingProps"
-    :key="queryMenuState.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">
 import { MyTaskCard, ProTabs, ProTabPane, Calendar } from '@12333/components';
 import Taro from '@tarojs/taro';
-import { EnumTaskCheckReceiveStatus } from '@12333/constants';
-import { useTaskList } from '@12333/hooks';
+import { EnumTaskCheckReceiveStatus, EnumTaskCheckReceiveMethod } from '@12333/constants';
+import { useCheckReceiveTasks } from '@12333/hooks';
+import dayjs from 'dayjs';
 
 defineOptions({
   name: 'InnerPage',
 });
 
-const { queryMenuState, infiniteLoadingProps } = useTaskList({
-  defaultQueryMenuState: {
-    checkReceiveStatus: EnumTaskCheckReceiveStatus.Wait,
-  },
-});
+const { queryState, infiniteLoadingProps } = useCheckReceiveTasks();
 
-function goSubmitTaskDetail(item: API.GetTaskInfosQueryResultItem) {
+function goSubmitTaskDetail(item: API.GetCheckReceiveTasksQueryResultItem) {
+  // 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}?taskId=${item.id}`,
+    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