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 | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue index dc40cd9..0bcc458 100644 --- a/apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue +++ b/apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue @@ -21,8 +21,7 @@ :isReal="item.isReal" :contactPhoneNumber="item.contactPhoneNumber" :checkReceiveStatus="item.checkReceiveStatus" - @checkReceive="goHandleTaskDetail(item)" - @taskChecked="goTaskCheckedDetail(item)" + @checkReceive="goTaskDetail(item)" /> </template> </InfiniteLoading> @@ -35,6 +34,7 @@ import { useInfiniteLoading } from '@12333/hooks'; 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'; @@ -68,15 +68,16 @@ } ); -function goHandleTaskDetail(item: API.GetCheckReceiveTaskQueryResultItem) { - Taro.navigateTo({ - url: `${RouterPath.taskHandleCheckDetail}?id=${item.id}&date=${date}`, - }); -} - -function goTaskCheckedDetail(item: API.GetCheckReceiveTaskQueryResultItem) { - Taro.navigateTo({ - url: `${RouterPath.taskCheckedDetail}?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