From 94a7350343f5b65ebbd5b327e48063014d39f021 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 11 八月 2025 10:44:08 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/bMiniApp/src/subpackages/jobApplicationManage/components/JobDetail.vue | 44 ++++++++++++++++++++++++++++----------------
1 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/jobApplicationManage/components/JobDetail.vue b/apps/bMiniApp/src/subpackages/jobApplicationManage/components/JobDetail.vue
index 6717cb2..6a0d095 100644
--- a/apps/bMiniApp/src/subpackages/jobApplicationManage/components/JobDetail.vue
+++ b/apps/bMiniApp/src/subpackages/jobApplicationManage/components/JobDetail.vue
@@ -1,15 +1,21 @@
<template>
<LoadingLayout :loading="isLoading" :error="isError" :loadError="refetch">
<ContentScrollView style="background-color: transparent">
- <Cell :title="'瀹㈡埧鏈嶅姟鍛�'" titleSize="large">
- <div class="taskDetail-time">2025骞�2鏈�5鏃� 鑷� 2025骞�3鏈�5鏃�</div>
+ <Cell :title="detail.taskName" titleSize="large">
+ <div class="taskDetail-time">
+ {{
+ `${dayjs(detail.startDate).format('YYYY骞碝M鏈圖D鏃�')}鑷�${dayjs(detail.endDate).format(
+ 'YYYY骞碝M鏈圖D鏃�'
+ )}`
+ }}
+ </div>
<div class="task-card-welfare-wrapper">
<div class="task-card-welfare-list">
- <div class="task-card-welfare-list-item">鏃ョ粨</div>
- <div class="task-card-welfare-list-item">鐢峰コ涓嶉檺</div>
- <div class="task-card-welfare-list-item">鍖呬笁椁�</div>
+ <div class="task-card-welfare-list-item">
+ {{ FlexTaskSettleTypeEnumText[detail.settleType] }}
+ </div>
</div>
- <TaskPrice :value="212" />
+ <TaskPrice :value="detail.fee" :unit="SalaryTimeTypeEnumUnit[detail.feeType]" />
</div>
<div class="taskDetail-address-wrapper">
<div class="taskDetail-address-title-wrapper">
@@ -25,11 +31,12 @@
<Cell :show-title="false">
<CellChunk title="绂忓埄淇℃伅">
<div class="taskDetail-welfare-list">
- <TaskDetailWelfareItem :icon="IconLocaltion" text="楂樻俯琛ヨ创" />
- <TaskDetailWelfareItem :icon="IconLocaltion" text="楂樻俯琛ヨ创" />
- <TaskDetailWelfareItem :icon="IconLocaltion" text="楂樻俯琛ヨ创" />
- <TaskDetailWelfareItem :icon="IconLocaltion" text="楂樻俯琛ヨ创" />
- <TaskDetailWelfareItem :icon="IconLocaltion" text="楂樻俯琛ヨ创" />
+ <TaskDetailWelfareItem
+ v-for="item in detail.taskWeals"
+ :key="item.id"
+ :icon="setOSSLink(item.imageUrl)"
+ :text="item.name"
+ />
</div>
</CellChunk>
</Cell>
@@ -40,9 +47,13 @@
<script setup lang="ts">
import { useQuery } from '@tanstack/vue-query';
import Taro from '@tarojs/taro';
-import * as orderServices from '@12333/services/api/Order';
+import * as flexWorkerServices from '@12333/services/api/FlexWorker';
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 { RectRight } from '@nutui/icons-vue-taro';
defineOptions({
name: 'JobDetail',
@@ -53,7 +64,7 @@
// const props = withDefaults(defineProps<Props>(), {});
const router = Taro.useRouter();
-const taskId = router.params?.id ?? 'c4cfe028-23e7-0be8-ee56-3a11e3743b9d';
+const taskId = router.params?.taskId;
const {
isLoading,
@@ -61,22 +72,23 @@
data: detail,
refetch,
} = useQuery({
- queryKey: ['orderServices/getOrdeForDetail', taskId],
+ queryKey: ['flexWorkerServices/getFlexTaskDto', taskId],
queryFn: async () => {
- return await orderServices.getOrdeForDetail(
+ return await flexWorkerServices.getFlexTaskDto(
{ id: taskId },
{
showLoading: false,
}
);
},
- placeholderData: () => ({} as API.OrderInfoDto),
+ placeholderData: () => ({} as API.GetFlexTaskDtoOutput),
onSuccess(data) {},
});
</script>
<style lang="scss">
@import '@/styles/common.scss';
+
.jobApplicationDetail-page-wrapper {
.taskDetail-time {
font-size: 24px;
--
Gitblit v1.9.1