From 5eb6e6bab29554390851bbed86615110e62efa48 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 11 八月 2025 13:43:18 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/cMiniApp/src/subpackages/curriculum/mineCurriculumVitae/InnerPage.vue | 64 +++++++++++++++-----------------
1 files changed, 30 insertions(+), 34 deletions(-)
diff --git a/apps/cMiniApp/src/subpackages/curriculum/mineCurriculumVitae/InnerPage.vue b/apps/cMiniApp/src/subpackages/curriculum/mineCurriculumVitae/InnerPage.vue
index 28bdc57..6faed82 100644
--- a/apps/cMiniApp/src/subpackages/curriculum/mineCurriculumVitae/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/curriculum/mineCurriculumVitae/InnerPage.vue
@@ -1,7 +1,7 @@
<template>
<ContentView>
<nut-noticebar
- text="涓汉绠�鍘嗗凡瀹屽杽50%锛屽畬鍠勭畝鍘嗗彲鎻愬崌褰曠敤鐜�"
+ :text="`涓汉绠�鍘嗗凡瀹屽杽${detail?.completeRate ?? 0}锛屽畬鍠勭畝鍘嗗彲鎻愬崌褰曠敤鐜嘸"
:left-icon="false"
background="transparent"
close-mode
@@ -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,18 @@
<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?.contactPhoneNumber ?? '' }}
</div>
</div>
<div class="mine-curriculum-info-item-detail">
{{
- `${detail?.resumeBaseInfo?.age ?? ''}宀� | ${
- detail?.resumeBaseInfo?.socialIdentityName
- } | ${detail?.resumeBaseInfo?.educationalLevelName}`
+ `${detail?.age ? `${detail?.age}宀乣 : ''}
+ ${detail?.personalIdentityContent ? `| ${detail?.personalIdentityContent}` : ''}
+ ${
+ detail?.educationalBackgroundContent
+ ? `| ${detail?.educationalBackgroundContent}`
+ : ''
+ }`
}}
</div>
</div>
@@ -65,16 +69,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>
@@ -105,16 +107,15 @@
<script setup lang="ts">
import { useUserStore } from '@/stores/modules/user';
-import { useIsLogin } from '@/hooks';
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';
@@ -123,19 +124,13 @@
import Taro from '@tarojs/taro';
import { useQuery } from '@tanstack/vue-query';
import { setOSSLink } from '@12333/utils';
-import { useEvent, useEventChannel } from 'senin-mini/hooks';
+import { useEvent } from 'senin-mini/hooks';
defineOptions({
name: 'InnerPage',
});
-const userStore = useUserStore();
-const isLogin = useIsLogin();
-const router = Taro.useRouter();
-
-const taskId = router.params?.taskId;
-
-const eventChannel = useEventChannel();
+const { userId } = useUser();
useEvent('updateResume', function (data: { content: boolean }) {
if (data.content) {
@@ -145,9 +140,7 @@
}
});
-const jobTag = computed(
- () => detail?.value?.resumeExpectationJob?.jobIdList?.map((x) => x.name) ?? []
-);
+const jobTag = computed(() => detail?.value?.userExpectJobs?.map((x) => x.expectJobContent) ?? []);
const {
isLoading,
@@ -155,14 +148,17 @@
data: detail,
refetch,
} = useQuery({
- queryKey: ['userResumeServices/getUserResume', taskId],
+ queryKey: ['userResumeServices/getUserResume', userId],
queryFn: async () => {
- return await userResumeServices.getUserResume({
- showLoading: false,
- });
+ return await userResumeServices.getUserResume(
+ { userId: userId.value },
+ {
+ showLoading: false,
+ }
+ );
},
- placeholderData: () => ({} as API.MyResumeOutput),
- onSuccess(data) {},
+ placeholderData: () => ({} as API.GetUserResumeQueryResult),
+ enabled: computed(() => !!userId.value),
});
function goPage(routeName: string) {
--
Gitblit v1.9.1