From f6d29d197b5e942514d2dd826c121db685c41763 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 22 十月 2025 17:02:21 +0800
Subject: [PATCH] fix: bug
---
apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue | 9 ++++++++-
packages/services/apiV2/typings.d.ts | 14 +++++++++++++-
apps/cMiniApp/project.private.config.json | 7 +++++++
apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue | 12 ++++++------
packages/constants/apiEnum.ts | 8 ++++++++
apps/cMiniApp/src/pages/mine/index.vue | 4 ++--
6 files changed, 44 insertions(+), 10 deletions(-)
diff --git a/apps/cMiniApp/project.private.config.json b/apps/cMiniApp/project.private.config.json
index bac5641..81e4067 100644
--- a/apps/cMiniApp/project.private.config.json
+++ b/apps/cMiniApp/project.private.config.json
@@ -23,6 +23,13 @@
"miniprogram": {
"list": [
{
+ "name": "浠诲姟",
+ "pathName": "pages/task/task",
+ "query": "",
+ "scene": null,
+ "launchMode": "default"
+ },
+ {
"name": "绠�鍘嗚缁嗕俊鎭�",
"pathName": "subpackages/curriculum/mineDetailedInfo/mineDetailedInfo",
"query": "",
diff --git a/apps/cMiniApp/src/pages/mine/index.vue b/apps/cMiniApp/src/pages/mine/index.vue
index bb56979..bfa6d83 100644
--- a/apps/cMiniApp/src/pages/mine/index.vue
+++ b/apps/cMiniApp/src/pages/mine/index.vue
@@ -100,11 +100,11 @@
<nut-badge
class="mine-order-list-item"
top="8"
- :value="userDetail?.inProcessTaskCount ?? 0"
+ :value="userDetail?.arrangeCompleteTaskCount ?? 0"
@click="goMineHire"
>
<img :src="IconOrderHire" class="mine-order-list-icon" />
- <div class="mine-order-list-text">浠诲姟涓�</div>
+ <div class="mine-order-list-text">宸插畨鎺�</div>
</nut-badge>
<nut-badge
class="mine-order-list-item"
diff --git a/apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue b/apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue
index a7defaf..2605683 100644
--- a/apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue
@@ -1,5 +1,5 @@
<template>
- <!-- <ProTabs
+ <ProTabs
v-model="queryState.status"
name="home-tab"
:showPaneContent="false"
@@ -18,7 +18,7 @@
:title="`宸插畬鎴恅"
:pane-key="GetPersonalHireTaskInfosQueryStatus.Completed"
></ProTabPane>
- </ProTabs> -->
+ </ProTabs>
<InfiniteLoading
scrollViewClassName="common-infinite-scroll-list home-list"
v-bind="infiniteLoadingProps"
@@ -78,12 +78,12 @@
page: pageParam,
orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
},
- status: GetPersonalHireTaskInfosQueryStatus.InProcess,
+ // status: GetPersonalHireTaskInfosQueryStatus.InProcess,
arrangeStatus: EnumTaskUserArrangeStatus.Complete,
};
- // if (Number(queryState.status)) {
- // params.status = queryState.status;
- // }
+ if (Number(queryState.status)) {
+ params.status = queryState.status;
+ }
return taskServices.getPersonalHireTaskInfos(params, {
showLoading: false,
});
diff --git a/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue b/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue
index f8240b9..2a2eb2a 100644
--- a/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue
@@ -140,7 +140,13 @@
{{ GetTaskInfoQueryResultApplyButtonText[detail.applyButton] }}
</PageFooterBtn>
<PageFooterBtn
- v-if="from === 'hire'"
+ v-if="
+ from === 'hire' &&
+ !(
+ detail?.checkReceiveMethod === EnumTaskCheckReceiveMethod.CheckIn &&
+ detail?.hireButton === GetTaskInfoQueryResultHireButton.ApplyCheckReceive
+ )
+ "
type="primary"
:disabled="detail?.hireButton !== GetTaskInfoQueryResultHireButton.ApplyCheckReceive"
@click="handleHire"
@@ -193,6 +199,7 @@
GetTaskInfoQueryResultHireButtonText,
GetTaskInfoQueryResultHireButton,
GetTaskInfoQueryResultApplyButton,
+ EnumTaskCheckReceiveMethod,
} from '@12333/constants';
import { useAccessLogin } from '@/hooks';
diff --git a/packages/constants/apiEnum.ts b/packages/constants/apiEnum.ts
index 1c1c992..d1a4e7e 100644
--- a/packages/constants/apiEnum.ts
+++ b/packages/constants/apiEnum.ts
@@ -202,6 +202,14 @@
}
/** 娌″啓娉ㄩ噴 */
+export enum EnumGetArrangeTaskUsersQueryApplyStatus {
+ /**鏈姤鍚� */
+ None = 10,
+ /**宸叉姤鍚� */
+ Completed = 20,
+}
+
+/** 娌″啓娉ㄩ噴 */
export enum EnumGetEnterpriseEmployeesQuerySignContractStatus {
/**鐏靛伐寰呯绾� */
UserWait = 10,
diff --git a/packages/services/apiV2/typings.d.ts b/packages/services/apiV2/typings.d.ts
index 943e9cc..71b2e24 100644
--- a/packages/services/apiV2/typings.d.ts
+++ b/packages/services/apiV2/typings.d.ts
@@ -821,6 +821,13 @@
Transfer = 20,
}
+ enum EnumGetArrangeTaskUsersQueryApplyStatus {
+ /**鏈姤鍚� */
+ None = 10,
+ /**宸叉姤鍚� */
+ Completed = 20,
+ }
+
enum EnumGetEnterpriseEmployeesQuerySignContractStatus {
/**鐏靛伐寰呯绾� */
UserWait = 10,
@@ -3428,6 +3435,7 @@
/** 鍏抽敭瀛楋紙濮撳悕/韬唤璇�/鐢佃瘽锛� */
keywords?: string;
arrangeStatus?: EnumTaskUserArrangeStatus;
+ applyStatus?: EnumGetArrangeTaskUsersQueryApplyStatus;
pageModel?: PagedListQueryPageModel;
}
@@ -5142,6 +5150,8 @@
hireRefuseTaskCount?: number;
/** 浠诲姟涓� */
inProcessTaskCount?: number;
+ /** 宸插畨鎺� */
+ arrangeCompleteTaskCount?: number;
/** 浣欓 */
balance?: number;
/** 鎴戠殑鏀剁泭 */
@@ -5703,6 +5713,8 @@
interface GetSettlementTasksQuery {
/** 鍏抽敭瀛� */
keywords?: string;
+ /** 浠诲姟Id */
+ taskInfoId?: string;
paymentStatus?: GetSettlementTasksQueryPaymentStatus;
settlementOrderStatus?: EnumTaskSettlementOrderStatus;
settlementStatus?: EnumTaskSettlementStatus;
@@ -7362,7 +7374,7 @@
name: string;
billingMethod: EnumBillingMethod;
/** 鏈嶅姟璐� */
- serviceFee: number;
+ serviceFee?: number;
/** 鏍稿畾宸ユ椂 */
verifyWorkHours?: number;
/** 瓒呮椂鏈嶅姟璐� */
--
Gitblit v1.9.1