From 7039c7f1a1feacc5479cbe7b886f239dea3ef1e6 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期一, 10 十一月 2025 14:05:08 +0800
Subject: [PATCH] Merge branch 'dev-1.3.0.1' of http://120.26.58.240:8888/r/flexJobMiniApp into dev-1.3.0.1
---
apps/bMiniApp/src/subpackages/jobApplicationManage/components/JobDetail.vue | 147 ++----------------------------------------------
1 files changed, 8 insertions(+), 139 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/jobApplicationManage/components/JobDetail.vue b/apps/bMiniApp/src/subpackages/jobApplicationManage/components/JobDetail.vue
index 9caeaae..42c13d3 100644
--- a/apps/bMiniApp/src/subpackages/jobApplicationManage/components/JobDetail.vue
+++ b/apps/bMiniApp/src/subpackages/jobApplicationManage/components/JobDetail.vue
@@ -1,45 +1,7 @@
<template>
<LoadingLayout :loading="isLoading" :error="isError" :loadError="refetch">
<ContentScrollView style="background-color: transparent">
- <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">
- {{ FlexTaskSettleTypeEnumText[detail.settleType] }}
- </div>
- </div>
- <TaskPrice :value="detail.fee" :unit="SalaryTimeTypeEnumUnit[detail.feeType]" />
- </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>
- <div class="taskDetail-address-info-wrapper">
- <div class="taskDetail-address-info">瀹佹尝甯傞劄宸炲尯涓滈挶婀栧ぇ鍫拌矾188鍙峰畞娉㈡煆鎮﹂厭搴�</div>
- <RectRight :size="8" class="taskDetail-address-info-icon" />
- </div>
- </div>
- </Cell>
- <Cell :show-title="false">
- <CellChunk title="绂忓埄淇℃伅">
- <div class="taskDetail-welfare-list">
- <TaskDetailWelfareItem
- v-for="item in detail.taskWeals"
- :key="item.id"
- :icon="setOSSLink(item.imageUrl)"
- :text="item.name"
- />
- </div>
- </CellChunk>
- </Cell>
+ <TaskDetailView :detail="detail"></TaskDetailView>
</ContentScrollView>
</LoadingLayout>
</template>
@@ -47,13 +9,8 @@
<script setup lang="ts">
import { useQuery } from '@tanstack/vue-query';
import Taro from '@tarojs/taro';
-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 '@/constants/task';
-import dayjs from 'dayjs';
-import { setOSSLink } from '@12333/utils';
-import { RectRight } from '@nutui/icons-vue-taro';
+import * as taskServices from '@12333/services/apiV2/task';
+import { TaskDetailView } from '@12333/components';
defineOptions({
name: 'JobDetail',
@@ -64,7 +21,7 @@
// const props = withDefaults(defineProps<Props>(), {});
const router = Taro.useRouter();
-const taskId = router.params?.taskId;
+const id = router.params?.id;
const {
isLoading,
@@ -72,107 +29,19 @@
data: detail,
refetch,
} = useQuery({
- queryKey: ['flexWorkerServices/getFlexTaskDto', taskId],
+ queryKey: ['taskServices/getTaskInfo', id],
queryFn: async () => {
- return await flexWorkerServices.getFlexTaskDto(
- { id: taskId },
+ return await taskServices.getTaskInfo(
+ { id: id },
{
showLoading: false,
}
);
},
- placeholderData: () => ({} as API.GetFlexTaskDtoOutput),
- onSuccess(data) {},
+ placeholderData: () => ({} as API.GetTaskInfoQueryResult),
});
</script>
<style lang="scss">
@import '@/styles/common.scss';
-
-.jobApplicationDetail-page-wrapper {
- .taskDetail-time {
- font-size: 24px;
- color: boleGetCssVar('text-color', 'regular');
- line-height: 36px;
- margin-bottom: 16px;
- }
-
- .task-card-welfare-wrapper {
- display: flex;
- align-items: flex-start;
- padding-bottom: 48px;
- border-bottom: 1px solid #d9d9d9;
- margin-bottom: 12px;
-
- .task-card-welfare-list {
- flex: 1;
- display: flex;
- min-width: 0;
- flex-wrap: wrap;
- min-height: 40px;
- row-gap: 6px;
- column-gap: 18px;
- margin-right: 10px;
-
- .task-card-welfare-list-item {
- font-size: 24px;
- color: #ff7d00;
- line-height: 36px;
- }
- }
- }
-
- .taskDetail-address-wrapper {
- padding: 28px 32px 14px;
- background: #f9fbff;
- border-radius: 8px;
-
- .taskDetail-address-title-wrapper {
- display: flex;
- align-items: center;
- margin-bottom: 22px;
-
- .taskDetail-address-title-icon {
- width: 40px;
- height: 40px;
- margin-right: 8px;
- }
-
- .taskDetail-address-title {
- flex: 1;
- min-width: 0;
- @include ellipsis;
- font-size: 28px;
- color: boleGetCssVar('text-color', 'primary');
- line-height: 42px;
- }
- }
-
- .taskDetail-address-info-wrapper {
- display: flex;
- align-items: center;
-
- .taskDetail-address-info {
- flex: 1;
- min-width: 0;
- @include ellipsis;
- font-weight: 400;
- font-size: 24px;
- color: boleGetCssVar('text-color', 'regular');
- line-height: 36px;
- }
-
- .taskDetail-address-info-icon {
- color: boleGetCssVar('text-color', 'secondary');
- margin-left: 10px;
- }
- }
- }
-
- .taskDetail-welfare-list {
- display: flex;
- flex-wrap: wrap;
- row-gap: 24px;
- }
-}
</style>
--
Gitblit v1.9.1