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/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue | 7 ++++---
apps/cMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue | 8 +++++++-
packages/services/apiV2/index.ts | 4 ++--
apps/bMiniApp/src/subpackages/task/components/TaskCheckCard.vue | 4 +---
apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue | 25 +++++++++++++------------
apps/cMiniApp/src/subpackages/mine/mineCancel/InnerPage.vue | 8 ++++++++
packages/hooks/task.ts | 2 +-
7 files changed, 36 insertions(+), 22 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/task/components/TaskCheckCard.vue b/apps/bMiniApp/src/subpackages/task/components/TaskCheckCard.vue
index 9d89fd7..fe8e7ea 100644
--- a/apps/bMiniApp/src/subpackages/task/components/TaskCheckCard.vue
+++ b/apps/bMiniApp/src/subpackages/task/components/TaskCheckCard.vue
@@ -1,5 +1,5 @@
<template>
- <div class="task-check-card-wrapper" @click.stop="emit('taskChecked')">
+ <div class="task-check-card-wrapper" @click.stop="emit('checkReceive')">
<TaskCheckPersonalView
class="task-check-card-view"
:avatar="avatar"
@@ -13,7 +13,6 @@
v-if="checkReceiveStatus === EnumTaskCheckReceiveStatus.WaitCheckReceive"
type="primary"
class="task-check-card-phone-btn"
- @click.stop="emit('checkReceive')"
>楠屾敹</nut-button
>
<div v-else class="task-check-card-phone-status" :style="{ color: Colors.Success }">
@@ -50,7 +49,6 @@
const emit = defineEmits<{
(e: 'checkReceive'): void;
- (e: 'taskChecked'): void;
}>();
</script>
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>
diff --git a/apps/cMiniApp/src/subpackages/mine/mineCancel/InnerPage.vue b/apps/cMiniApp/src/subpackages/mine/mineCancel/InnerPage.vue
index 122a79d..48ee139 100644
--- a/apps/cMiniApp/src/subpackages/mine/mineCancel/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/mine/mineCancel/InnerPage.vue
@@ -13,6 +13,7 @@
:service-fee="item.serviceFee"
:settlement-cycle="item.settlementCycle"
:address-name="item.addressName"
+ @click="goTaskDetail(item)"
>
<template #actions>
<div class="task-card-actions-text">{{ '宸插彇娑�' }}</div>
@@ -27,6 +28,7 @@
import { useInfiniteLoading } from '@12333/hooks';
import { EnumPagedListOrder } from '@12333/constants';
import * as taskServices from '@12333/services/apiV2/task';
+import Taro from '@tarojs/taro';
defineOptions({
name: 'InnerPage',
@@ -49,6 +51,12 @@
queryKey: ['taskServices/getPersonalCancelTaskInfos'],
}
);
+
+function goTaskDetail(item: API.GetPersonalHireTaskInfosQueryResultItem) {
+ Taro.navigateTo({
+ url: `${RouterPath.taskDetail}?id=${item.id}&from=cancel`,
+ });
+}
</script>
<style lang="scss">
diff --git a/apps/cMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue b/apps/cMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue
index 7f2f3eb..58aa1f6 100644
--- a/apps/cMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue
@@ -1,6 +1,12 @@
<template>
<ContentScrollView style="background-color: transparent">
- <MyTaskCard :showMyTaskArrow="false"></MyTaskCard>
+ <MyTaskCard
+ :name="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.taskInfo?.name"
+ :addressName="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.taskInfo?.addressName"
+ :beginTime="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.taskInfo?.beginTime"
+ :endTime="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.taskInfo?.endTime"
+ :showMyTaskArrow="false"
+ ></MyTaskCard>
<div class="taskCheckFileCard-status-title">楠屾敹鐓х墖</div>
<InfiniteLoading
scrollViewClassName="common-infinite-scroll-list task-list"
diff --git a/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue b/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue
index a0435bc..fc871cd 100644
--- a/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue
@@ -21,6 +21,7 @@
>
{{ GetTaskInfoQueryResultHireButtonText[detail.hireButton] }}
</div>
+ <div v-if="from === 'cancel'" :style="{ color: '#999999' }">宸插彇娑�</div>
</template>
<div class="taskDetail-time">
{{ dayjs(detail?.beginTime).format('YYYY骞碝M鏈圖D鏃�') }} 鑷�
@@ -270,8 +271,8 @@
});
function handleHire() {
-Taro.navigateTo({
- url: `${RouterPath.taskSubmitCheck}?id=${id}`,
-})
+ Taro.navigateTo({
+ url: `${RouterPath.taskSubmitCheck}?id=${id}`,
+ });
}
</script>
diff --git a/packages/hooks/task.ts b/packages/hooks/task.ts
index a29fbb1..474681a 100644
--- a/packages/hooks/task.ts
+++ b/packages/hooks/task.ts
@@ -161,7 +161,7 @@
rows: 20,
page: pageParam,
},
- id: id,
+ taskInfoId: id,
};
return taskCheckReceiveServices.getCheckReceiveTaskUserSubmits(params, {
diff --git a/packages/services/apiV2/index.ts b/packages/services/apiV2/index.ts
index 9cabf40..679903f 100644
--- a/packages/services/apiV2/index.ts
+++ b/packages/services/apiV2/index.ts
@@ -7,10 +7,10 @@
import * as role from './role';
import * as enterprise from './enterprise';
import * as task from './task';
+import * as taskCheckReceive from './taskCheckReceive';
import * as dictionary from './dictionary';
import * as userResume from './userResume';
import * as auth from './auth';
-import * as taskCheckReceive from './taskCheckReceive';
import * as resource from './resource';
import * as taskUser from './taskUser';
import * as menu from './menu';
@@ -20,10 +20,10 @@
role,
enterprise,
task,
+ taskCheckReceive,
dictionary,
userResume,
auth,
- taskCheckReceive,
resource,
taskUser,
menu,
--
Gitblit v1.9.1