From 05b114a7408b1cf2868db92185be3f6f3819bf55 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 22 十月 2025 17:27:50 +0800
Subject: [PATCH] fix: bug
---
apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue | 7 ---
packages/services/apiV2/typings.d.ts | 45 +++++++++++++++++++---
apps/cMiniApp/src/pages/task/InnerPage.vue | 1
packages/components/src/Calendar/Calendar.vue | 1
packages/components/src/Card/MyTaskCard.vue | 9 ++++
packages/constants/apiEnum.ts | 8 ++++
6 files changed, 57 insertions(+), 14 deletions(-)
diff --git a/apps/cMiniApp/src/pages/task/InnerPage.vue b/apps/cMiniApp/src/pages/task/InnerPage.vue
index 76512dc..4d79b33 100644
--- a/apps/cMiniApp/src/pages/task/InnerPage.vue
+++ b/apps/cMiniApp/src/pages/task/InnerPage.vue
@@ -28,6 +28,7 @@
:addressName="item.addressName"
:begin-time="item.beginTime"
:end-time="item.endTime"
+ showActions
@click="goSubmitTaskDetail(item)"
/>
</template>
diff --git a/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue b/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue
index 2a2eb2a..7fd0dd5 100644
--- a/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue
@@ -97,12 +97,7 @@
></CompanyDesc>
</CellChunk>
</Cell>
- <Cell>
- <template #title>
- <div class="safe-cell-title-wrapper">
- <div class="safe-cell-title">浠诲姟鎻忚堪</div>
- </div>
- </template>
+ <Cell title="浠诲姟鎻忚堪">
<div class="safe-cell-content">{{ detail?.description ?? '' }}</div>
</Cell>
<Cell>
diff --git a/packages/components/src/Calendar/Calendar.vue b/packages/components/src/Calendar/Calendar.vue
index ec0665b..bb1db00 100644
--- a/packages/components/src/Calendar/Calendar.vue
+++ b/packages/components/src/Calendar/Calendar.vue
@@ -39,7 +39,6 @@
scrollView?.scrollIntoView?.('.nut-calendarcard-day.current.active');
}
});
- console.log('222', 223);
});
</script>
diff --git a/packages/components/src/Card/MyTaskCard.vue b/packages/components/src/Card/MyTaskCard.vue
index d86170e..a6b34bc 100644
--- a/packages/components/src/Card/MyTaskCard.vue
+++ b/packages/components/src/Card/MyTaskCard.vue
@@ -1,5 +1,5 @@
<template>
- <TaskCard v-bind="props" :show-actions="false" class="my-task-card-wrapper">
+ <TaskCard v-bind="props" class="my-task-card-wrapper">
<template #title-right>
<RectRight :size="12" class="my-task-card-arrow" v-if="showMyTaskArrow" />
<div v-else></div>
@@ -10,6 +10,10 @@
}}
</div>
<div v-else></div>
+
+ <template #actions>
+ <div>宸茬鍒�</div>
+ </template>
</TaskCard>
</template>
@@ -31,11 +35,14 @@
beginTime?: string;
endTime?: string;
addressName?: string;
+
+ showActions?: boolean;
};
const props = withDefaults(defineProps<Props>(), {
showMyTaskArrow: true,
showTime: true,
+ showActions: false,
});
</script>
diff --git a/packages/constants/apiEnum.ts b/packages/constants/apiEnum.ts
index d1a4e7e..ead0641 100644
--- a/packages/constants/apiEnum.ts
+++ b/packages/constants/apiEnum.ts
@@ -533,6 +533,14 @@
Complete = 20,
}
+/** 浠诲姟鐢ㄦ埛鎶ュ悕鐘舵�� */
+export enum EnumTaskUserApplyStatus {
+ /**鏈姤鍚� */
+ None = 10,
+ /**宸叉姤鍚� */
+ Completed = 20,
+}
+
/** 浠诲姟鐢ㄦ埛瀹夋帓鐘舵�� */
export enum EnumTaskUserArrangeStatus {
/**鏈畨鎺� */
diff --git a/packages/services/apiV2/typings.d.ts b/packages/services/apiV2/typings.d.ts
index 71b2e24..78ee6c3 100644
--- a/packages/services/apiV2/typings.d.ts
+++ b/packages/services/apiV2/typings.d.ts
@@ -559,8 +559,16 @@
interface EditTaskSettlementOrderRosterCommand {
/** 鍚嶅崟Id */
id?: string;
- /** 绱宸ユ椂 */
- totalWorkHours?: number;
+ /** 鏈嶅姟璐癸紙鍏冿級 */
+ serviceFee?: number;
+ /** 瓒呮椂锛堝皬鏃讹級 */
+ timeoutHours?: number;
+ /** 瓒呮椂璐圭敤锛堝厓锛� */
+ timeoutFee?: number;
+ /** 鍏朵粬璐圭敤锛堝厓锛� */
+ otherFee?: number;
+ /** 澶囨敞 */
+ remark?: string;
/** 缁撶畻閲戦 */
settlementAmount: number;
/** 瀹炲彂閲戦 */
@@ -1123,6 +1131,13 @@
Wait = 10,
/**宸插畨鎺� */
Complete = 20,
+ }
+
+ enum EnumTaskUserApplyStatus {
+ /**鏈姤鍚� */
+ None = 10,
+ /**宸叉姤鍚� */
+ Completed = 20,
}
enum EnumTaskUserArrangeStatus {
@@ -4922,6 +4937,7 @@
releaseStatus?: EnumTaskReleaseStatus;
recommendStatus?: EnumTaskRecommendStatus;
checkReceiveStatus?: EnumTaskCheckReceiveStatus;
+ applyStatus?: EnumTaskUserApplyStatus;
pageModel?: PagedListQueryPageModel;
}
@@ -5849,14 +5865,22 @@
/** 鏄惁瀹炲悕 */
isReal?: boolean;
realMethod?: EnumUserRealMethod;
- /** 绱宸ユ椂 */
- totalWorkHours?: number;
/** 鎵�灞為摱琛� */
bank?: string;
/** 寮�鎴锋敮琛屽悕绉� */
bankBranch?: string;
/** 鏀舵璐︽埛 */
receiveAccount?: string;
+ /** 鏈嶅姟璐癸紙鍏冿級 */
+ serviceFee?: number;
+ /** 瓒呮椂锛堝皬鏃讹級 */
+ timeoutHours?: number;
+ /** 瓒呮椂璐圭敤锛堝厓锛� */
+ timeoutFee?: number;
+ /** 鍏朵粬璐圭敤锛堝厓锛� */
+ otherFee?: number;
+ /** 澶囨敞 */
+ remark?: string;
/** 缁撶畻閲戦 */
settlementAmount?: number;
/** 瀹炲彂閲戦 */
@@ -6114,6 +6138,7 @@
checkReceiveStatus?: EnumTaskCheckReceiveStatus;
/** 鏄惁鏀惰棌 */
isCollected?: boolean;
+ applyStatus?: EnumTaskUserApplyStatus;
pageModel?: PagedListQueryPageModel;
}
@@ -6717,18 +6742,26 @@
identity?: string;
/** 鎵嬫満鍙� */
contactPhoneNumber?: string;
- /** 绱宸ユ椂 */
- totalWorkHours?: number;
/** 鎵�灞為摱琛� */
bank?: string;
/** 鎵�灞炴敮琛� */
bankBranch?: string;
/** 鏀舵璐︽埛 */
receiveAccount?: string;
+ /** 鏈嶅姟璐癸紙鍏冿級 */
+ serviceFee?: number;
+ /** 瓒呮椂锛堝皬鏃讹級 */
+ timeoutHours?: number;
+ /** 瓒呮椂璐圭敤锛堝厓锛� */
+ timeoutFee?: number;
+ /** 鍏朵粬璐圭敤锛堝厓锛� */
+ otherFee?: number;
/** 缁撶畻閲戦 */
settlementAmount?: number;
/** 瀹炲彂閲戦 */
actualSettlementAmount?: number;
+ /** 澶囨敞 */
+ remark?: string;
}
interface InviteElectronSignCommand {
--
Gitblit v1.9.1