From 2935cf3629d1495d959381a1550cddaa500a0986 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期二, 12 八月 2025 14:09:09 +0800 Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp --- apps/cMiniApp/src/subpackages/curriculum/mineCurriculumVitae/InnerPage.vue | 91 +++++++++++++++++++++++++++------------------ 1 files changed, 55 insertions(+), 36 deletions(-) diff --git a/apps/cMiniApp/src/subpackages/curriculum/mineCurriculumVitae/InnerPage.vue b/apps/cMiniApp/src/subpackages/curriculum/mineCurriculumVitae/InnerPage.vue index 77d25d5..2e12b89 100644 --- a/apps/cMiniApp/src/subpackages/curriculum/mineCurriculumVitae/InnerPage.vue +++ b/apps/cMiniApp/src/subpackages/curriculum/mineCurriculumVitae/InnerPage.vue @@ -1,37 +1,57 @@ <template> <ContentView> <nut-noticebar - text="涓汉绠�鍘嗗凡瀹屽杽50%锛屽畬鍠勭畝鍘嗗彲鎻愬崌褰曠敤鐜�" + :text="`涓汉绠�鍘嗗凡瀹屽杽${userResumeInfo?.completeRate ?? 0}%锛屽畬鍠勭畝鍘嗗彲鎻愬崌褰曠敤鐜嘸" :left-icon="false" background="transparent" close-mode class="mine-curriculum-noticebar" /> <div class="mine-curriculum-info-wrapper"> - <UserAvatar :size="60" class="mine-curriculum-avatar" /> + <Avatar + :size="60" + class="mine-curriculum-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"> - {{ userStore.userDetail?.userName ?? '' }} + {{ userResumeInfo?.name ?? '' }} </div> - <div class="mine-curriculum-info-item-gender"> + <div class="mine-curriculum-info-item-gender" v-if="userResumeInfo?.gender"> <div class="mine-curriculum-info-item-gender-dot">路</div> - <img v-if="1" :src="IconMale" class="mine-curriculum-info-item-gender-icon" /> + <img + v-if="userResumeInfo?.gender === EnumUserGender.Male" + :src="IconMale" + class="mine-curriculum-info-item-gender-icon" + /> <img v-else :src="IconFemale" class="mine-curriculum-info-item-gender-icon" /> </div> </div> <IconFont name="rect-right" size="16" color="#6D6E6E" @click="goEditMineInfo"></IconFont> </div> <div class="mine-curriculum-info-item"> - <div class="mine-curriculum-info-item-left"> + <div class="mine-curriculum-info-item-left" v-if="userResumeInfo?.contactPhoneNumber"> <img :src="IconPhone" class="mine-curriculum-info-item-phone-icon" /> <div class="mine-curriculum-info-item-phone"> - {{ userStore.userDetail?.phoneNumber ?? '' }} + {{ userResumeInfo?.contactPhoneNumber ?? '' }} </div> </div> <div class="mine-curriculum-info-item-detail"> - {{ '26宀� | 闈炲鐢� | 鏈' }} + {{ + `${userResumeInfo?.age ? `${userResumeInfo?.age}宀乣 : ''} + ${ + userResumeInfo?.personalIdentityContent + ? `| ${userResumeInfo?.personalIdentityContent}` + : '' + } + ${ + userResumeInfo?.educationalBackgroundContent + ? `| ${userResumeInfo?.educationalBackgroundContent}` + : '' + }` + }} </div> </div> </div> @@ -47,17 +67,21 @@ </div> <MineAgreementSignDetailItem label="鏈熸湜宀椾綅" class="mine-curriculum-intention-job"> <template #detail> - <JobTagList /> + <JobTagList :jobTagList="jobTag" /> </template> </MineAgreementSignDetailItem> <MineAgreementSignDetailItem label="绌洪棽鏃堕棿"> <template #detail> - <div class="mine-curriculum-intention-bold">涓嶉檺</div> + <div class="mine-curriculum-intention-bold"> + {{ EnumPersonalFreeTimeText[userResumeInfo?.freeTime] }} + </div> </template> </MineAgreementSignDetailItem> <MineAgreementSignDetailItem label="姹傝亴鐘舵��"> <template #detail> - <div class="mine-curriculum-intention-bold">绉瀬鎵惧伐浣�</div> + <div class="mine-curriculum-intention-bold"> + {{ EnumPersonalJobSeekingStatusText[userResumeInfo?.jobSeekingStatus] }} + </div> </template> </MineAgreementSignDetailItem> </div> @@ -86,49 +110,44 @@ </template> <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 } from '@12333/components'; +import { List, ListItem, JobTagList, Avatar } from '@12333/components'; +import { + EnumUserGender, + EnumPersonalFreeTimeText, + EnumPersonalJobSeekingStatusText, +} from '@12333/constants'; import { RouterPath } from '@/constants'; -import * as userResumeServices from '@12333/services/api/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'; defineOptions({ name: 'InnerPage', }); -const userStore = useUserStore(); -const isLogin = useIsLogin(); -const router = Taro.useRouter(); +const { userResumeInfo, refetch } = useUserResume(); -const taskId = router.params?.taskId; - -const { - isLoading, - isError, - data: detail, - refetch, -} = useQuery({ - queryKey: ['userResumeServices/getUserResume', taskId], - queryFn: async () => { - return await userResumeServices.getUserResume({ - showLoading: false, - }); - }, - placeholderData: () => ({} as API.MyResumeOutput), - onSuccess(data) {}, -}); +const jobTag = computed( + () => userResumeInfo?.value?.userExpectJobs?.map((x) => x.expectJobContent) ?? [] +); function goPage(routeName: string) { Taro.navigateTo({ url: routeName, + // events: { + // updateResume(data: { content: boolean }) { + // if (data.content) { + // refetch({ + // type: 'inactive', + // }); + // } + // }, + // }, }); } function goEditMineInfo() { -- Gitblit v1.9.1