From f790bdf751063dd882b5ae654cb540d81bf16d1d Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期二, 12 八月 2025 14:58:33 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/bMiniApp/src/subpackages/jobApplicationManage/components/JobDetail.vue | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/jobApplicationManage/components/JobDetail.vue b/apps/bMiniApp/src/subpackages/jobApplicationManage/components/JobDetail.vue
index 6a0d095..e10ac35 100644
--- a/apps/bMiniApp/src/subpackages/jobApplicationManage/components/JobDetail.vue
+++ b/apps/bMiniApp/src/subpackages/jobApplicationManage/components/JobDetail.vue
@@ -1,10 +1,10 @@
<template>
<LoadingLayout :loading="isLoading" :error="isError" :loadError="refetch">
<ContentScrollView style="background-color: transparent">
- <Cell :title="detail.taskName" titleSize="large">
+ <Cell :title="detail.name" titleSize="large">
<div class="taskDetail-time">
{{
- `${dayjs(detail.startDate).format('YYYY骞碝M鏈圖D鏃�')}鑷�${dayjs(detail.endDate).format(
+ `${dayjs(detail.beginTime).format('YYYY骞碝M鏈圖D鏃�')}鑷�${dayjs(detail.endTime).format(
'YYYY骞碝M鏈圖D鏃�'
)}`
}}
@@ -12,18 +12,21 @@
<div class="task-card-welfare-wrapper">
<div class="task-card-welfare-list">
<div class="task-card-welfare-list-item">
- {{ FlexTaskSettleTypeEnumText[detail.settleType] }}
+ {{ EnumSettlementCycleText[detail.settlementCycle] }}
</div>
</div>
- <TaskPrice :value="detail.fee" :unit="SalaryTimeTypeEnumUnit[detail.feeType]" />
+ <TaskPrice
+ :value="toThousand(detail.serviceFee ?? 0)"
+ :unit="BillingMethodEnumUnit[detail.billingMethod]"
+ />
</div>
<div class="taskDetail-address-wrapper">
<div class="taskDetail-address-title-wrapper">
<img :src="IconLocaltion" class="taskDetail-address-title-icon" />
- <div class="taskDetail-address-title">瀹佹尝鏌忔偊閰掑簵</div>
+ <div class="taskDetail-address-title">{{ detail?.addressName ?? '' }}</div>
</div>
<div class="taskDetail-address-info-wrapper">
- <div class="taskDetail-address-info">瀹佹尝甯傞劄宸炲尯涓滈挶婀栧ぇ鍫拌矾188鍙峰畞娉㈡煆鎮﹂厭搴�</div>
+ <div class="taskDetail-address-info">{{ detail?.addressDetail ?? '' }}</div>
<RectRight :size="8" class="taskDetail-address-info-icon" />
</div>
</div>
@@ -32,10 +35,10 @@
<CellChunk title="绂忓埄淇℃伅">
<div class="taskDetail-welfare-list">
<TaskDetailWelfareItem
- v-for="item in detail.taskWeals"
- :key="item.id"
- :icon="setOSSLink(item.imageUrl)"
- :text="item.name"
+ v-for="benefit in detail.benefits"
+ :key="benefit.benefitCode"
+ :icon="setOSSLink(benefit.benefitField2)"
+ :text="benefit.benefitContent"
/>
</div>
</CellChunk>
@@ -47,13 +50,13 @@
<script setup lang="ts">
import { useQuery } from '@tanstack/vue-query';
import Taro from '@tarojs/taro';
-import * as flexWorkerServices from '@12333/services/api/FlexWorker';
+import * as taskServices from '@12333/services/apiV2/task';
import IconLocaltion from '@/assets/flexJob/icon-localtion.png';
import { TaskPrice, TaskDetailWelfareItem } from '@12333/components';
-import { SalaryTimeTypeEnumUnit, FlexTaskSettleTypeEnumText } from '@12333/constants/task';
import dayjs from 'dayjs';
-import { setOSSLink } from '@12333/utils';
+import { setOSSLink, toThousand } from '@12333/utils';
import { RectRight } from '@nutui/icons-vue-taro';
+import { BillingMethodEnumUnit, EnumSettlementCycleText } from '@12333/constants';
defineOptions({
name: 'JobDetail',
@@ -72,17 +75,16 @@
data: detail,
refetch,
} = useQuery({
- queryKey: ['flexWorkerServices/getFlexTaskDto', taskId],
+ queryKey: ['taskServices/getTaskInfo', taskId],
queryFn: async () => {
- return await flexWorkerServices.getFlexTaskDto(
+ return await taskServices.getTaskInfo(
{ id: taskId },
{
showLoading: false,
}
);
},
- placeholderData: () => ({} as API.GetFlexTaskDtoOutput),
- onSuccess(data) {},
+ placeholderData: () => ({} as API.GetTaskInfoQueryResult),
});
</script>
--
Gitblit v1.9.1