From 12f08c16ee7c7176368b5961fe104ed698227a8d Mon Sep 17 00:00:00 2001 From: wupengfei <834520024@qq.com> Date: 星期四, 11 九月 2025 17:41:50 +0800 Subject: [PATCH] Merge branch 'master' into dev-v1.1 --- apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue | 48 ++++++++++++++++++++++++++++++++++-------------- 1 files changed, 34 insertions(+), 14 deletions(-) diff --git a/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue b/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue index a10ccc6..4511852 100644 --- a/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue +++ b/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue @@ -92,6 +92,7 @@ @click="goCompanyDetail" :enterpriseName="detail?.enterpriseName ?? ''" :taskCount="detail?.taskCount ?? 0" + :isReal="detail?.isReal ?? false" ></CompanyDesc> </CellChunk> </Cell> @@ -121,7 +122,12 @@ :isFlex="false" @click="handleCall" ></PageFooterAction> - <PageFooterBtn v-if="from === 'sign'" type="primary" disabled> + <PageFooterBtn + v-if="from === 'sign'" + type="primary" + :disabled="detail?.applyButton === GetTaskInfoQueryResultApplyButton.WaitHire" + @click="handleSign" + > {{ GetTaskInfoQueryResultApplyButtonText[detail.applyButton] }} </PageFooterBtn> <PageFooterBtn @@ -154,6 +160,7 @@ import { useQuery } from '@tanstack/vue-query'; import * as taskServices from '@12333/services/apiV2/task'; import * as taskUserServices from '@12333/services/apiV2/taskUser'; +import * as enterpriseEmployeeServices from '@12333/services/apiV2/enterpriseEmployee'; import { useToggle } from 'senin-mini/hooks'; import { TaskPrice, TaskDetailWelfareItem } from '@12333/components'; import IconAttention from '@/assets/task/icon-attention.png'; @@ -176,6 +183,7 @@ GetPersonalHireTaskInfosQueryStatusColor, GetTaskInfoQueryResultHireButtonText, GetTaskInfoQueryResultHireButton, + GetTaskInfoQueryResultApplyButton, } from '@12333/constants'; import { useAccessLogin } from '@/hooks'; @@ -186,7 +194,7 @@ /** * TODO 缂哄皯 鎶曡瘔涓炬姤鎺ュ彛 */ - +const { userDetail } = useUser(); const router = Taro.useRouter(); const id = router.params?.id ?? ''; const from = router.params?.from ?? ''; @@ -228,18 +236,21 @@ } }); -const handleApply = useAccessLogin(async () => { - try { - let params: API.ApplyTaskCommand = { - ids: [id], - }; - let res = await taskUserServices.applyTask(params); - if (res) { - Message.success('鎶ュ悕鎴愬姛'); - refetch({ type: 'inactive' }); - } - } catch (error) {} -}); +const handleApply = useAccessReal( + async () => { + try { + let params: API.ApplyTaskCommand = { + ids: [id], + }; + let res = await taskUserServices.applyTask(params); + if (res) { + Message.success('鎶ュ悕鎴愬姛'); + refetch({ type: 'inactive' }); + } + } catch (error) {} + }, + { message: '瀹炲悕鎴愬姛鍚庢墠鍙姤鍚嶏紝璇峰墠寰�瀹炲悕璁よ瘉' } +); const handleAttention = useAccessLogin(async () => { try { @@ -275,6 +286,11 @@ url: `${RouterPath.taskSubmitCheck}?id=${id}`, }); } +const handleSign = useAccessReal(() => { + Taro.navigateTo({ + url: `${RouterPath.mineAgreementSignDetail}?id=${detail.value?.enterpriseEmployeeId}`, + }); +}); function goMap() { Taro.openLocation({ @@ -283,4 +299,8 @@ scale: 18, }); } + +Taro.useDidShow(() => { + refetch(); +}); </script> -- Gitblit v1.9.1