From a4907e75088054574d7dce76c9995502779c5eeb Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 14 八月 2025 11:28:00 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue | 78 ++++++++++++++++++++-------------------
1 files changed, 40 insertions(+), 38 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue
index d149ccc..0bcc458 100644
--- a/apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue
@@ -1,16 +1,28 @@
<template>
- <LoadingLayout :loading="isLoading" :error="isError" :loadError="refetch">
+ <LoadingLayout>
<ContentView>
- <MyTaskCard :showMyTaskArrow="false" :showTime="false"></MyTaskCard>
+ <MyTaskCard
+ :name="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.name"
+ :addressName="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.addressName"
+ :showMyTaskArrow="false"
+ :showTime="false"
+ ></MyTaskCard>
<ChunkTitle title="楠屾敹鍒楄〃" />
</ContentView>
<InfiniteLoading
scrollViewClassName="common-infinite-scroll-list"
v-bind="infiniteLoadingProps"
- :key="queryState.status"
>
<template #renderItem="{ item }">
- <TaskCheckCard @click="goHandleTaskDetail(item)" />
+ <TaskCheckCard
+ :avatar="setOSSLink(item.avatar)"
+ :name="item.name"
+ :gender="item.gender"
+ :isReal="item.isReal"
+ :contactPhoneNumber="item.contactPhoneNumber"
+ :checkReceiveStatus="item.checkReceiveStatus"
+ @checkReceive="goTaskDetail(item)"
+ />
</template>
</InfiniteLoading>
</LoadingLayout>
@@ -18,64 +30,54 @@
<script setup lang="ts">
import Taro from '@tarojs/taro';
-import { useQuery } from '@tanstack/vue-query';
-import * as orderServices from '@12333/services/api/Order';
+import * as taskCheckReceiveServices from '@12333/services/apiV2/taskCheckReceive';
import { useInfiniteLoading } from '@12333/hooks';
-import { OrderInputType } from '@12333/constants';
import TaskCheckCard from '../components/TaskCheckCard.vue';
import { MyTaskCard } from '@12333/components';
+import { EnumTaskCheckReceiveStatus } from '@12333/constants';
+import { setOSSLink } from '@12333/utils';
+import dayjs from 'dayjs';
defineOptions({
name: 'InnerPage',
});
const router = Taro.useRouter();
-const taskId = router.params?.id ?? '';
-
-const {
- isLoading,
- isError,
- data: detail,
- refetch,
-} = useQuery({
- queryKey: ['orderServices/getOrdeForDetail', taskId],
- queryFn: async () => {
- return await orderServices.getOrdeForDetail(
- { id: taskId },
- {
- showLoading: false,
- }
- );
- },
- placeholderData: () => ({} as API.OrderInfoDto),
-});
-
-const queryState = reactive({
- status: 10,
-});
+const id = router.params?.id ?? '';
+const date = router.params?.date ?? '';
+const checkReceiveStatus = Number(router.params?.checkReceiveStatus);
const { infiniteLoadingProps } = useInfiniteLoading(
({ pageParam }) => {
- let params: API.FrontOrderListInput = {
+ let params: API.GetCheckReceiveTaskQuery = {
pageModel: {
rows: 20,
page: pageParam,
- orderInput: [{ property: 'lastShelfTime', order: OrderInputType.Desc }],
},
+ taskInfoId: id,
+ date: dayjs(date).format('YYYY-MM-DD'),
+ checkReceiveStatus: checkReceiveStatus,
};
- return orderServices.getFrontOrderList(params, {
+ return taskCheckReceiveServices.getCheckReceiveTask(params, {
showLoading: false,
});
},
{
- queryKey: ['orderServices/getFrontOrderList', queryState],
+ queryKey: ['taskCheckReceiveServices/getCheckReceiveTask'],
}
);
-function goHandleTaskDetail(item: API.FrontOrderList) {
- Taro.navigateTo({
- url: `${RouterPath.taskHandleCheckDetail}?id=${item.id}`,
- });
+function goTaskDetail(item: API.GetCheckReceiveTaskQueryResultItem) {
+ if (item.checkReceiveStatus === EnumTaskCheckReceiveStatus.Completed) {
+ Taro.navigateTo({
+ url: `${RouterPath.taskCheckedDetail}?id=${item.id}`,
+ });
+ }
+ if (item.checkReceiveStatus === EnumTaskCheckReceiveStatus.WaitCheckReceive) {
+ Taro.navigateTo({
+ url: `${RouterPath.taskHandleCheckDetail}?id=${item.id}&date=${date}`,
+ });
+ }
}
</script>
--
Gitblit v1.9.1