From 5583271e6f5bb7a0dcc8e4876513f23a21a7b25f Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 13 八月 2025 13:22:22 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue | 68 ++++++++++++++++++----------------
apps/cMiniApp/src/subpackages/task/components/CompanyTaskList.vue | 2
apps/cMiniApp/src/pages/home/index.vue | 2
packages/constants/task.ts | 13 ++++++
apps/cMiniApp/src/subpackages/mine/mineSign/InnerPage.vue | 2
apps/cMiniApp/src/subpackages/mine/mineCollectTask/InnerPage.vue | 2
apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue | 2
7 files changed, 54 insertions(+), 37 deletions(-)
diff --git a/apps/cMiniApp/src/pages/home/index.vue b/apps/cMiniApp/src/pages/home/index.vue
index 5231954..d0097eb 100644
--- a/apps/cMiniApp/src/pages/home/index.vue
+++ b/apps/cMiniApp/src/pages/home/index.vue
@@ -113,7 +113,7 @@
function goTaskDetail(item: API.GetTaskInfosQueryResultItem) {
Taro.navigateTo({
- url: `${RouterPath.taskDetail}?id=${item.id}`,
+ url: `${RouterPath.taskDetail}?id=${item.id}&from=apply`,
});
}
diff --git a/apps/cMiniApp/src/subpackages/mine/mineCollectTask/InnerPage.vue b/apps/cMiniApp/src/subpackages/mine/mineCollectTask/InnerPage.vue
index d9bad76..7c1f311 100644
--- a/apps/cMiniApp/src/subpackages/mine/mineCollectTask/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/mine/mineCollectTask/InnerPage.vue
@@ -44,7 +44,7 @@
function goTaskDetail(id: string) {
Taro.navigateTo({
- url: `${RouterPath.taskDetail}?id=${id}`,
+ url: `${RouterPath.taskDetail}?id=${id}&from=apply`,
});
}
diff --git a/apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue b/apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue
index 6404b11..d8bd3f9 100644
--- a/apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue
@@ -91,7 +91,7 @@
function goTaskDetail(item: API.GetPersonalHireTaskInfosQueryResultItem) {
Taro.navigateTo({
- url: `${RouterPath.taskDetail}?id=${item.id}&from=mine`,
+ url: `${RouterPath.taskDetail}?id=${item.id}&from=hire`,
});
}
</script>
diff --git a/apps/cMiniApp/src/subpackages/mine/mineSign/InnerPage.vue b/apps/cMiniApp/src/subpackages/mine/mineSign/InnerPage.vue
index f0a47a1..4cc1bd6 100644
--- a/apps/cMiniApp/src/subpackages/mine/mineSign/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/mine/mineSign/InnerPage.vue
@@ -94,7 +94,7 @@
function goTaskDetail(item: API.GetPersonalApplyTaskInfosQueryResultItem) {
Taro.navigateTo({
- url: `${RouterPath.taskDetail}?id=${item.id}&from=mine`,
+ url: `${RouterPath.taskDetail}?id=${item.id}&from=sign`,
});
}
</script>
diff --git a/apps/cMiniApp/src/subpackages/task/components/CompanyTaskList.vue b/apps/cMiniApp/src/subpackages/task/components/CompanyTaskList.vue
index cda3e9c..33e9a8a 100644
--- a/apps/cMiniApp/src/subpackages/task/components/CompanyTaskList.vue
+++ b/apps/cMiniApp/src/subpackages/task/components/CompanyTaskList.vue
@@ -29,7 +29,7 @@
function goTaskDetail(item: API.GetTaskInfosQueryResultItem) {
Taro.navigateTo({
- url: `${RouterPath.taskDetail}?id=${item.id}`,
+ url: `${RouterPath.taskDetail}?id=${item.id}&from=apply`,
});
}
</script>
diff --git a/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue b/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue
index bc00fd5..a0435bc 100644
--- a/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue
@@ -4,10 +4,23 @@
<Cell :title="detail?.name ?? ''" titleSize="large">
<template #title-right>
<img
+ v-if="from === 'apply'"
:src="detail.isCollected ? IconAttentioActive : IconAttention"
class="taskDetail-attention-icon"
@click="handleAttention"
/>
+ <div
+ v-if="from === 'sign'"
+ :style="{ color: GetPersonalApplyTaskInfosQueryStatusColor[detail.applyButton] }"
+ >
+ {{ GetTaskInfoQueryResultApplyButtonText[detail.applyButton] }}
+ </div>
+ <div
+ v-if="from === 'hire'"
+ :style="{ color: GetPersonalHireTaskInfosQueryStatusColor[detail.hireButton] }"
+ >
+ {{ GetTaskInfoQueryResultHireButtonText[detail.hireButton] }}
+ </div>
</template>
<div class="taskDetail-time">
{{ dayjs(detail?.beginTime).format('YYYY骞碝M鏈圖D鏃�') }} 鑷�
@@ -107,40 +120,23 @@
:isFlex="false"
@click="handleCall"
></PageFooterAction>
- <template v-if="from === 'mine'">
- <PageFooterBtn
- v-if="detail.applyButton === GetTaskInfoQueryResultApplyButton.WaitHire"
- color="#999999"
- disabled
- >寰呯‘璁�</PageFooterBtn
- >
- <!-- <PageFooterBtn
- v-if="detail.applyButton === GetTaskInfoQueryResultApplyButton.WaitSignContract"
- >鍘荤绾�</PageFooterBtn
- > -->
- <PageFooterBtn
- v-if="detail.hireButton === GetTaskInfoQueryResultHireButton.InProcess"
- color="#999999"
- disabled
- >杩涜涓�</PageFooterBtn
- >
- <!-- <PageFooterBtn
- v-if="detail.hireButton === GetTaskInfoQueryResultHireButton.ApplyCheckReceive"
- >鐢宠楠屾敹</PageFooterBtn
- > -->
- <PageFooterBtn
- v-if="detail.hireButton === GetTaskInfoQueryResultHireButton.Completed"
- color="#999999"
- disabled
- >宸插畬鎴�</PageFooterBtn
- >
- </template>
- <template v-else>
+ <PageFooterBtn v-if="from === 'sign'" type="primary" disabled>
+ {{ GetTaskInfoQueryResultApplyButtonText[detail.applyButton] }}
+ </PageFooterBtn>
+ <PageFooterBtn
+ v-if="from === 'hire'"
+ type="primary"
+ :disabled="detail?.hireButton !== GetTaskInfoQueryResultHireButton.ApplyCheckReceive"
+ @click="handleHire"
+ >
+ {{ GetTaskInfoQueryResultHireButtonText[detail.hireButton] }}
+ </PageFooterBtn>
+ <template v-if="from === 'apply'">
<PageFooterBtn
v-if="detail?.releaseStatus === EnumTaskReleaseStatus.InProcess"
type="primary"
@click="handleApply"
- :disabled="detail?.hireStatus"
+ :disabled="!!detail?.hireStatus"
>{{ `鎶ュ悕锛�${detail?.applyCount ?? 0}浜哄凡鎶ュ悕锛塦 }}</PageFooterBtn
>
@@ -174,8 +170,10 @@
EnumSettlementCycleText,
BillingMethodEnumUnit,
EnumTaskReleaseStatus,
- EnumTaskUserHireStatus,
- GetTaskInfoQueryResultApplyButton,
+ GetPersonalApplyTaskInfosQueryStatusColor,
+ GetTaskInfoQueryResultApplyButtonText,
+ GetPersonalHireTaskInfosQueryStatusColor,
+ GetTaskInfoQueryResultHireButtonText,
GetTaskInfoQueryResultHireButton,
} from '@12333/constants';
import { useAccessLogin } from '@/hooks';
@@ -270,4 +268,10 @@
});
}
});
+
+function handleHire() {
+Taro.navigateTo({
+ url: `${RouterPath.taskSubmitCheck}?id=${id}`,
+})
+}
</script>
diff --git a/packages/constants/task.ts b/packages/constants/task.ts
index 41352e4..a3f36c2 100644
--- a/packages/constants/task.ts
+++ b/packages/constants/task.ts
@@ -10,6 +10,8 @@
EnumTaskUserHireStatus,
GetPersonalApplyTaskInfosQueryStatus,
GetPersonalHireTaskInfosQueryStatus,
+ GetTaskInfoQueryResultHireButton,
+ GetTaskInfoQueryResultApplyButton,
} from './apiEnum';
export const EnumBillingMethodText = {
@@ -98,3 +100,14 @@
[GetPersonalHireTaskInfosQueryStatus.InProcess]: '#2A9E1B',
[GetPersonalHireTaskInfosQueryStatus.Completed]: '#9FA4AC',
};
+
+export const GetTaskInfoQueryResultHireButtonText = {
+ [GetTaskInfoQueryResultHireButton.ApplyCheckReceive]: '鐢宠楠屾敹',
+ [GetTaskInfoQueryResultHireButton.InProcess]: '杩涜涓�',
+ [GetTaskInfoQueryResultHireButton.Completed]: '宸插畬鎴�',
+};
+
+export const GetTaskInfoQueryResultApplyButtonText = {
+ [GetTaskInfoQueryResultApplyButton.WaitHire]: '寰呯‘璁�',
+ [GetTaskInfoQueryResultApplyButton.WaitSignContract]: '鍘荤绾�',
+};
--
Gitblit v1.9.1