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/cMiniApp/src/subpackages/curriculum/mineCurriculumVitae/InnerPage.vue | 49 ++++++++++++------------
packages/constants/task.ts | 16 ++++++++
2 files changed, 41 insertions(+), 24 deletions(-)
diff --git a/apps/cMiniApp/src/subpackages/curriculum/mineCurriculumVitae/InnerPage.vue b/apps/cMiniApp/src/subpackages/curriculum/mineCurriculumVitae/InnerPage.vue
index 28bdc57..4526023 100644
--- a/apps/cMiniApp/src/subpackages/curriculum/mineCurriculumVitae/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/curriculum/mineCurriculumVitae/InnerPage.vue
@@ -11,18 +11,18 @@
<Avatar
:size="60"
class="mine-curriculum-avatar"
- :src="setOSSLink(detail?.resumeBaseInfo?.avatarUrl ?? '')"
+ :src="setOSSLink(detail?.avatar ?? '')"
></Avatar>
<div class="mine-curriculum-info-content">
<div class="mine-curriculum-info-item">
<div class="mine-curriculum-info-item-left">
<div class="mine-curriculum-info-item-name">
- {{ detail?.resumeBaseInfo?.name ?? '' }}
+ {{ detail?.name ?? '' }}
</div>
<div class="mine-curriculum-info-item-gender">
<div class="mine-curriculum-info-item-gender-dot">路</div>
<img
- v-if="detail?.resumeBaseInfo?.genderType === Gender.Male"
+ v-if="detail?.gender === EnumUserGender.Male"
:src="IconMale"
class="mine-curriculum-info-item-gender-icon"
/>
@@ -35,14 +35,14 @@
<div class="mine-curriculum-info-item-left">
<img :src="IconPhone" class="mine-curriculum-info-item-phone-icon" />
<div class="mine-curriculum-info-item-phone">
- {{ detail?.resumeBaseInfo?.phoneNumber ?? '' }}
+ {{ detail?.phoneNumber ?? '' }}
</div>
</div>
<div class="mine-curriculum-info-item-detail">
{{
- `${detail?.resumeBaseInfo?.age ?? ''}宀� | ${
- detail?.resumeBaseInfo?.socialIdentityName
- } | ${detail?.resumeBaseInfo?.educationalLevelName}`
+ `${detail?.age ?? ''}宀� | ${detail?.personalIdentityContent} | ${
+ detail?.educationalBackgroundContent
+ }`
}}
</div>
</div>
@@ -65,16 +65,14 @@
<MineAgreementSignDetailItem label="绌洪棽鏃堕棿">
<template #detail>
<div class="mine-curriculum-intention-bold">
- {{ UserResumeFreeTimeEnumText[detail?.resumeExpectationJob?.freeTime] }}
+ {{ EnumPersonalFreeTimeText[detail?.freeTime] }}
</div>
</template>
</MineAgreementSignDetailItem>
<MineAgreementSignDetailItem label="姹傝亴鐘舵��">
<template #detail>
<div class="mine-curriculum-intention-bold">
- {{
- UserResumeJobSeekingStatusEnumText[detail?.resumeExpectationJob?.jobSeekingStatus]
- }}
+ {{ EnumPersonalJobSeekingStatusText[detail?.jobSeekingStatus] }}
</div>
</template>
</MineAgreementSignDetailItem>
@@ -109,12 +107,12 @@
import MineAgreementSignDetailItem from '../../mine/mineAgreementSignDetail/MineAgreementSignDetailItem.vue';
import { List, ListItem, JobTagList, Avatar } from '@12333/components';
import {
- Gender,
- UserResumeFreeTimeEnumText,
- UserResumeJobSeekingStatusEnumText,
+ EnumUserGender,
+ EnumPersonalFreeTimeText,
+ EnumPersonalJobSeekingStatusText,
} from '@12333/constants';
import { RouterPath } from '@/constants';
-import * as userResumeServices from '@12333/services/api/userResume';
+import * as userResumeServices from '@12333/services/apiV2/userResume';
import IconArrow from '@/assets/setting/icon-arrow.png';
import IconAuth from '@/assets/mine/icon-auth.png';
import IconMale from '@/assets/mine/icon-male.png';
@@ -129,11 +127,11 @@
name: 'InnerPage',
});
-const userStore = useUserStore();
+const { userDetail } = useUserStore();
const isLogin = useIsLogin();
const router = Taro.useRouter();
-const taskId = router.params?.taskId;
+const usrId = computed(() => userDetail?.userId ?? '');
const eventChannel = useEventChannel();
@@ -146,7 +144,7 @@
});
const jobTag = computed(
- () => detail?.value?.resumeExpectationJob?.jobIdList?.map((x) => x.name) ?? []
+ () => detail?.value?.userExpectJobs?.map((x) => x.personalIdentityContent) ?? []
);
const {
@@ -155,14 +153,17 @@
data: detail,
refetch,
} = useQuery({
- queryKey: ['userResumeServices/getUserResume', taskId],
+ queryKey: ['userResumeServices/getUserResume', usrId],
queryFn: async () => {
- return await userResumeServices.getUserResume({
- showLoading: false,
- });
+ return await userResumeServices.getUserResume(
+ { userId: usrId.value },
+ {
+ showLoading: false,
+ }
+ );
},
- placeholderData: () => ({} as API.MyResumeOutput),
- onSuccess(data) {},
+ placeholderData: () => ({} as API.GetUserResumeQueryResult),
+ enabled: !!usrId.value,
});
function goPage(routeName: string) {
diff --git a/packages/constants/task.ts b/packages/constants/task.ts
index bc23d2c..6e1fd23 100644
--- a/packages/constants/task.ts
+++ b/packages/constants/task.ts
@@ -4,6 +4,8 @@
EnumSettlementCycle,
EnumTaskReleaseStatus,
EnumTaskCheckReceiveStatus,
+ EnumPersonalFreeTime,
+ EnumPersonalJobSeekingStatus,
} from './apiEnum';
export const EnumBillingMethodText = {
@@ -46,3 +48,17 @@
[EnumTaskCheckReceiveStatus.Wait]: '寰呴獙鏀�',
[EnumTaskCheckReceiveStatus.Completed]: '宸查獙鏀�',
};
+
+export const EnumPersonalFreeTimeText = {
+ [EnumPersonalFreeTime.NoLimit]: '涓嶉檺',
+ [EnumPersonalFreeTime.WinterSummerVacations]: '瀵掓殤鍋�',
+ [EnumPersonalFreeTime.FestivalAndHoliday]: '鑺傚亣鏃�',
+ [EnumPersonalFreeTime.Weekend]: '鍛ㄥ叚鏃�',
+ [EnumPersonalFreeTime.Weekday]: '宸ヤ綔鏃�',
+};
+
+export const EnumPersonalJobSeekingStatusText = {
+ [EnumPersonalJobSeekingStatus.Active]: '绉瀬鎵句换鍔�',
+ [EnumPersonalJobSeekingStatus.Whatever]: '闅忎究鐪嬬湅',
+ [EnumPersonalJobSeekingStatus.Not]: '鏆傛椂涓嶆壘浠诲姟',
+};
--
Gitblit v1.9.1