From f85738d978ed505b05bef6b09f851056801742c2 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 15 八月 2025 16:32:07 +0800
Subject: [PATCH] fix: bug
---
apps/cMiniApp/src/pages/task/InnerPage.vue | 60 +++++++++++++++++++++++++++---------------------------------
1 files changed, 27 insertions(+), 33 deletions(-)
diff --git a/apps/cMiniApp/src/pages/task/InnerPage.vue b/apps/cMiniApp/src/pages/task/InnerPage.vue
index 159140e..842cac1 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>
<ProTabs
- v-model="queryState.status"
+ v-model="queryState.checkReceiveStatus"
name="task-tab"
:showPaneContent="false"
class="task-tabs"
@@ -9,16 +9,26 @@
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"
+ :key="queryState.checkReceiveStatus"
>
<template #renderItem="{ item }">
- <MyTaskCard @click="goSubmitTaskDetail(item)" />
+ <MyTaskCard
+ :name="item.name"
+ :addressName="item.addressName"
+ :begin-time="item.beginTime"
+ :end-time="item.endTime"
+ @click="goSubmitTaskDetail(item)"
+ />
</template>
</InfiniteLoading>
</template>
@@ -26,42 +36,26 @@
<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 orderServices from '@12333/services/api/Order';
+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.FrontOrderListInput = {
- pageModel: {
- rows: 20,
- page: pageParam,
- orderInput: [{ property: 'lastShelfTime', order: OrderInputType.Desc }],
- },
- };
-
- return orderServices.getFrontOrderList(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: ['orderServices/getFrontOrderList', queryState],
}
-);
-
-function goSubmitTaskDetail(item: API.FrontOrderList) {
- Taro.navigateTo({
- url: `${RouterPath.taskDetail}?id=${item.id}`,
- });
+ if (Number(queryState.checkReceiveStatus) === EnumTaskCheckReceiveStatus.Completed) {
+ Taro.navigateTo({
+ url: `${RouterPath.taskCheckDetail}?id=${item.id}`,
+ });
+ }
}
</script>
--
Gitblit v1.9.1