From fc1722c88aab8ca973e4301c942e269623253658 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期一, 11 八月 2025 14:02:38 +0800 Subject: [PATCH] fix: 修改简历 --- apps/cMiniApp/src/subpackages/curriculum/mineCurriculumVitae/InnerPage.vue | 54 +++++++++----------------- apps/cMiniApp/auto-imports.d.ts | 2 + apps/cMiniApp/.eslintrc-auto-import.json | 3 + apps/cMiniApp/src/hooks/user.ts | 25 ++++++++++++ 4 files changed, 47 insertions(+), 37 deletions(-) diff --git a/apps/cMiniApp/.eslintrc-auto-import.json b/apps/cMiniApp/.eslintrc-auto-import.json index 7a65a7d..ff1c0db 100644 --- a/apps/cMiniApp/.eslintrc-auto-import.json +++ b/apps/cMiniApp/.eslintrc-auto-import.json @@ -108,6 +108,7 @@ "useMyCertificationAuditInfo": true, "useSwitchTab": true, "useTaskList": true, - "useUser": true + "useUser": true, + "useUserResume": true } } diff --git a/apps/cMiniApp/auto-imports.d.ts b/apps/cMiniApp/auto-imports.d.ts index 4ff20fc..f8c3f8a 100644 --- a/apps/cMiniApp/auto-imports.d.ts +++ b/apps/cMiniApp/auto-imports.d.ts @@ -92,6 +92,7 @@ const useSwitchTab: typeof import('./src/hooks/router')['useSwitchTab'] const useTemplateRef: typeof import('vue')['useTemplateRef'] const useUser: typeof import('./src/hooks/user')['useUser'] + const useUserResume: typeof import('./src/hooks/user')['useUserResume'] const watch: typeof import('vue')['watch'] const watchEffect: typeof import('vue')['watchEffect'] const watchPostEffect: typeof import('vue')['watchPostEffect'] @@ -203,6 +204,7 @@ readonly useSwitchTab: UnwrapRef<typeof import('./src/hooks/router')['useSwitchTab']> readonly useTemplateRef: UnwrapRef<typeof import('vue')['useTemplateRef']> readonly useUser: UnwrapRef<typeof import('./src/hooks/user')['useUser']> + readonly useUserResume: UnwrapRef<typeof import('./src/hooks/user')['useUserResume']> readonly watch: UnwrapRef<typeof import('vue')['watch']> readonly watchEffect: UnwrapRef<typeof import('vue')['watchEffect']> readonly watchPostEffect: UnwrapRef<typeof import('vue')['watchPostEffect']> diff --git a/apps/cMiniApp/src/hooks/user.ts b/apps/cMiniApp/src/hooks/user.ts index d81560c..4238c51 100644 --- a/apps/cMiniApp/src/hooks/user.ts +++ b/apps/cMiniApp/src/hooks/user.ts @@ -2,10 +2,10 @@ import Taro from '@tarojs/taro'; import { object2query, LocationUtils } from '@12333/utils'; import { ParkOrHRStatus, UserCertificationFrontStatus } from '@12333/constants'; -import * as userServices from '@12333/services/api/User'; import { useQuery } from '@tanstack/vue-query'; import { MaybeRef } from 'vue'; import { useRefeshDidShow } from '@12333/hooks/infiniteLoading'; +import * as userResumeServices from '@12333/services/apiV2/userResume'; export function useUser() { const userStore = useUserStore(); @@ -94,3 +94,26 @@ goLoginFn, }; } + +export function useUserResume() { + const { userId } = useUser(); + + const { data, refetch } = useQuery({ + queryKey: ['userResumeServices/getUserResume', userId], + queryFn: async () => { + return await userResumeServices.getUserResume( + { userId: userId.value }, + { + showLoading: false, + } + ); + }, + placeholderData: () => ({} as API.GetUserResumeQueryResult), + enabled: computed(() => !!userId.value), + }); + + return { + userResumeInfo: data, + refetch, + }; +} diff --git a/apps/cMiniApp/src/subpackages/curriculum/mineCurriculumVitae/InnerPage.vue b/apps/cMiniApp/src/subpackages/curriculum/mineCurriculumVitae/InnerPage.vue index 6faed82..1106bdf 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="`涓汉绠�鍘嗗凡瀹屽杽${detail?.completeRate ?? 0}锛屽畬鍠勭畝鍘嗗彲鎻愬崌褰曠敤鐜嘸" + :text="`涓汉绠�鍘嗗凡瀹屽杽${userResumeInfo?.completeRate ?? 0}锛屽畬鍠勭畝鍘嗗彲鎻愬崌褰曠敤鐜嘸" :left-icon="false" background="transparent" close-mode @@ -11,18 +11,18 @@ <Avatar :size="60" class="mine-curriculum-avatar" - :src="setOSSLink(detail?.avatar ?? '')" + :src="setOSSLink(userResumeInfo?.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?.name ?? '' }} + {{ userResumeInfo?.name ?? '' }} </div> <div class="mine-curriculum-info-item-gender"> <div class="mine-curriculum-info-item-gender-dot">路</div> <img - v-if="detail?.gender === EnumUserGender.Male" + v-if="userResumeInfo?.gender === EnumUserGender.Male" :src="IconMale" class="mine-curriculum-info-item-gender-icon" /> @@ -35,16 +35,20 @@ <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?.contactPhoneNumber ?? '' }} + {{ userResumeInfo?.contactPhoneNumber ?? '' }} </div> </div> <div class="mine-curriculum-info-item-detail"> {{ - `${detail?.age ? `${detail?.age}宀乣 : ''} - ${detail?.personalIdentityContent ? `| ${detail?.personalIdentityContent}` : ''} + `${userResumeInfo?.age ? `${userResumeInfo?.age}宀乣 : ''} + ${ + userResumeInfo?.personalIdentityContent + ? `| ${userResumeInfo?.personalIdentityContent}` + : '' + } ${ - detail?.educationalBackgroundContent - ? `| ${detail?.educationalBackgroundContent}` + userResumeInfo?.educationalBackgroundContent + ? `| ${userResumeInfo?.educationalBackgroundContent}` : '' }` }} @@ -69,14 +73,14 @@ <MineAgreementSignDetailItem label="绌洪棽鏃堕棿"> <template #detail> <div class="mine-curriculum-intention-bold"> - {{ EnumPersonalFreeTimeText[detail?.freeTime] }} + {{ EnumPersonalFreeTimeText[userResumeInfo?.freeTime] }} </div> </template> </MineAgreementSignDetailItem> <MineAgreementSignDetailItem label="姹傝亴鐘舵��"> <template #detail> <div class="mine-curriculum-intention-bold"> - {{ EnumPersonalJobSeekingStatusText[detail?.jobSeekingStatus] }} + {{ EnumPersonalJobSeekingStatusText[userResumeInfo?.jobSeekingStatus] }} </div> </template> </MineAgreementSignDetailItem> @@ -106,7 +110,6 @@ </template> <script setup lang="ts"> -import { useUserStore } from '@/stores/modules/user'; import MineAgreementSignDetailItem from '../../mine/mineAgreementSignDetail/MineAgreementSignDetailItem.vue'; import { List, ListItem, JobTagList, Avatar } from '@12333/components'; import { @@ -115,22 +118,18 @@ EnumPersonalJobSeekingStatusText, } from '@12333/constants'; import { RouterPath } from '@/constants'; -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'; import IconFemale from '@/assets/mine/icon-female.png'; import IconPhone from '@/assets/mine/icon-phone.png'; import Taro from '@tarojs/taro'; -import { useQuery } from '@tanstack/vue-query'; import { setOSSLink } from '@12333/utils'; import { useEvent } from 'senin-mini/hooks'; defineOptions({ name: 'InnerPage', }); - -const { userId } = useUser(); useEvent('updateResume', function (data: { content: boolean }) { if (data.content) { @@ -140,26 +139,11 @@ } }); -const jobTag = computed(() => detail?.value?.userExpectJobs?.map((x) => x.expectJobContent) ?? []); +const jobTag = computed( + () => userResumeInfo?.value?.userExpectJobs?.map((x) => x.expectJobContent) ?? [] +); -const { - isLoading, - isError, - data: detail, - refetch, -} = useQuery({ - queryKey: ['userResumeServices/getUserResume', userId], - queryFn: async () => { - return await userResumeServices.getUserResume( - { userId: userId.value }, - { - showLoading: false, - } - ); - }, - placeholderData: () => ({} as API.GetUserResumeQueryResult), - enabled: computed(() => !!userId.value), -}); +const { userResumeInfo, refetch } = useUserResume(); function goPage(routeName: string) { Taro.navigateTo({ -- Gitblit v1.9.1