From 11bfc34b15abd0753f9d829f2c5d20ba213cc8c8 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 07 十一月 2025 11:08:53 +0800
Subject: [PATCH] fix: s
---
apps/underTakeMiniApp/src/subpackages/task/components/TaskCheckCard.vue | 5 +++--
apps/bMiniApp/src/subpackages/task/components/TaskCheckCard.vue | 2 +-
apps/underTakeMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue | 4 ++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/task/components/TaskCheckCard.vue b/apps/bMiniApp/src/subpackages/task/components/TaskCheckCard.vue
index 02cda1e..da9bebf 100644
--- a/apps/bMiniApp/src/subpackages/task/components/TaskCheckCard.vue
+++ b/apps/bMiniApp/src/subpackages/task/components/TaskCheckCard.vue
@@ -94,7 +94,7 @@
checkInTime?: string;
/** 绛惧嚭鏃堕棿 */
checkOutTime?: string;
- checkReceiveMethod?: EnumTaskCheckReceiveMethod;
+ checkReceiveMethods?: EnumTaskCheckReceiveMethod[];
submitCheckReceiveStatus?: EnumTaskUserSubmitCheckReceiveStatus;
};
diff --git a/apps/underTakeMiniApp/src/subpackages/task/components/TaskCheckCard.vue b/apps/underTakeMiniApp/src/subpackages/task/components/TaskCheckCard.vue
index 02cda1e..4465026 100644
--- a/apps/underTakeMiniApp/src/subpackages/task/components/TaskCheckCard.vue
+++ b/apps/underTakeMiniApp/src/subpackages/task/components/TaskCheckCard.vue
@@ -9,7 +9,7 @@
:contactPhoneNumber="contactPhoneNumber"
>
<template #actions>
- <template v-if="checkReceiveMethod === EnumTaskCheckReceiveMethod.CheckIn">
+ <template v-if="OrderUtils.isContainCheckIn(checkReceiveMethods)">
<!-- <nut-button
v-if="!checkInTime"
type="primary"
@@ -72,6 +72,7 @@
import { CheckInOrOutEventEnum } from '../constants';
import { Portal } from 'senin-mini/components';
import { ActionSheet } from '@nutui/nutui-taro';
+import { OrderUtils } from '@12333/utils';
defineOptions({
name: 'TaskCheckCard',
@@ -94,7 +95,7 @@
checkInTime?: string;
/** 绛惧嚭鏃堕棿 */
checkOutTime?: string;
- checkReceiveMethod?: EnumTaskCheckReceiveMethod;
+ checkReceiveMethods?: EnumTaskCheckReceiveMethod[];
submitCheckReceiveStatus?: EnumTaskUserSubmitCheckReceiveStatus;
};
diff --git a/apps/underTakeMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue b/apps/underTakeMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue
index 17d66eb..f344fdd 100644
--- a/apps/underTakeMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue
+++ b/apps/underTakeMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue
@@ -23,7 +23,7 @@
:checkOutTime="item.checkOutTime"
:contactPhoneNumber="item.contactPhoneNumber"
:checkReceiveStatus="item.checkReceiveStatus"
- :checkReceiveMethod="detail?.checkReceiveMethod"
+ :checkReceiveMethods="detail?.checkReceiveMethods"
:submitCheckReceiveStatus="item.submitCheckReceiveStatus"
@checkReceive="goTaskDetail(item)"
@checkInOrOut="(ev) => checkReceiveTask(ev, item)"
@@ -242,7 +242,7 @@
let params: API.CheckReceiveTaskCommand = {
taskInfoUserId: form.taskInfoId,
date: dayjs(date).format('YYYY-MM-DD'),
- checkOutTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+ // checkOutTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
checkReceiveStatus: EnumTaskUserSubmitCheckReceiveStatus.Success,
serviceFee: form.serviceFee,
timeoutHours: form.timeoutHours,
--
Gitblit v1.10.0