From c2463c02a17f92df55ec77ed2da3fb724290c072 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期一, 20 十月 2025 17:34:30 +0800
Subject: [PATCH] fix: bug

---
 apps/cMiniApp/src/pages/task/InnerPage.vue |   97 +++++++++++++++++++++++++-----------------------
 1 files changed, 51 insertions(+), 46 deletions(-)

diff --git a/apps/cMiniApp/src/pages/task/InnerPage.vue b/apps/cMiniApp/src/pages/task/InnerPage.vue
index 33a1569..76512dc 100644
--- a/apps/cMiniApp/src/pages/task/InnerPage.vue
+++ b/apps/cMiniApp/src/pages/task/InnerPage.vue
@@ -1,7 +1,7 @@
 <template>
-  <Calendar v-model="queryState.date"></Calendar>
+  <Calendar key="calendar" v-model="queryState.date"></Calendar>
   <ProTabs
-    v-model="queryState.status"
+    v-model="queryState.checkReceiveStatus"
     name="task-tab"
     :showPaneContent="false"
     class="task-tabs"
@@ -9,69 +9,74 @@
     title-gutter="8"
     title-scroll
   >
-    <ProTabPane :title="`寰呮彁浜" :pane-key="10"></ProTabPane>
-    <ProTabPane :title="`寰呴獙鏀禶" :pane-key="20"></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 task-list"
-    v-bind="infiniteLoadingProps"
-    :key="queryState.status"
-  >
-    <template #renderItem="{ item }">
-      <MyTaskCard @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">
 import { MyTaskCard, ProTabs, ProTabPane, Calendar } from '@12333/components';
 import Taro from '@tarojs/taro';
-import { useInfiniteLoading } from '@12333/hooks';
-import { OrderInputType } from '@12333/constants';
-import * as flexWorkerServices from '@12333/services/api/FlexWorker';
+import { useCheckReceiveTasks, useTaskList } from '@12333/hooks';
+import { EnumTaskCheckReceiveStatus } from '@12333/constants';
 
 defineOptions({
   name: 'InnerPage',
 });
 
-const queryState = reactive({
-  status: 10,
-  date: new Date(),
-});
+const { queryState, infiniteLoadingProps } = useCheckReceiveTasks();
 
-const { infiniteLoadingProps } = useInfiniteLoading(
-  ({ pageParam }) => {
-    let params: API.GetFlexTaskListInput = {
-      pageModel: {
-        rows: 20,
-        page: pageParam,
-        orderInput: [{ property: 'lastShelfTime', order: OrderInputType.Desc }],
-      },
-    };
-
-    return flexWorkerServices.getFlexTaskByArrange(params, {
-      showLoading: false,
+function goSubmitTaskDetail(item: API.GetCheckReceiveTasksQueryResultItem) {
+  if (Number(queryState.checkReceiveStatus) === EnumTaskCheckReceiveStatus.WaitSubmit) {
+    Taro.navigateTo({
+      url: `${RouterPath.taskSubmitCheck}?id=${item.id}&date=${queryState.date}`,
     });
-  },
-  {
-    queryKey: ['flexWorkerServices/getFlexTaskByArrange', queryState],
   }
-);
-
-function goSubmitTaskDetail(item: API.GetFlexTaskListOutput) {
-  //   Taro.navigateTo({
-  //     url: `${RouterPath.taskSubmitCheck}?id=${item.id}`,
-  //   });
-  Taro.navigateTo({
-    url: `${RouterPath.taskCheckDetail}?id=${item.taskId}`,
-  });
+  if (
+    Number(queryState.checkReceiveStatus) === EnumTaskCheckReceiveStatus.WaitCheckReceive ||
+    Number(queryState.checkReceiveStatus) === EnumTaskCheckReceiveStatus.Completed
+  ) {
+    Taro.navigateTo({
+      url: `${RouterPath.taskCheckDetail}?id=${item.id}`,
+    });
+  }
 }
 </script>
 
 <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