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/editMineInfo/InnerPage.vue | 46 +++++++++++++++++++++------------------------- 1 files changed, 21 insertions(+), 25 deletions(-) diff --git a/apps/cMiniApp/src/subpackages/curriculum/editMineInfo/InnerPage.vue b/apps/cMiniApp/src/subpackages/curriculum/editMineInfo/InnerPage.vue index 61ef2e5..3eb5d6a 100644 --- a/apps/cMiniApp/src/subpackages/curriculum/editMineInfo/InnerPage.vue +++ b/apps/cMiniApp/src/subpackages/curriculum/editMineInfo/InnerPage.vue @@ -26,7 +26,7 @@ </nut-form-item> <nut-form-item label="甯搁┗鍩庡競:" class="bole-form-item" prop="areaList"> <ChooseInputWithAreaPicker - :columns="completeAreaTree" + :columns="areaTree" v-model="form.areaList" placeholder="璇烽�夋嫨甯搁┗鍩庡競" ></ChooseInputWithAreaPicker> @@ -42,15 +42,21 @@ import { FormRules } from '@nutui/nutui-taro/dist/types/__VUE/form/types'; import { ChooseInputWithPicker, ChooseInputWithAreaPicker } from '@12333/components'; import { convertApi2FormUrlOnlyOne, Message, setOSSLink } from '@12333/utils'; -import { useArea, useDictionaryDataSelect } from '@12333/hooks'; -import { CategoryCode } from '@12333/constants'; +import { useAreaTree, useDictionaryDataSelect } from '@12333/hooks'; +import { AreaType, CategoryCode } from '@12333/constants'; import * as userResumeServices from '@12333/services/apiV2/userResume'; import Taro from '@tarojs/taro'; import { useQuery } from '@tanstack/vue-query'; +import { useEventChannel } from 'senin-mini/hooks'; +import { goBack } from '@/utils'; defineOptions({ name: 'InnerPage', }); + +const { updateUserResume } = useUpdateResume(); + +const eventChannel = useEventChannel(); const { dictionaryDataList: identityList } = useDictionaryDataSelect({ categoryCode: CategoryCode.Identity, @@ -60,12 +66,13 @@ categoryCode: CategoryCode.Education, }); -const { completeAreaTree } = useArea(); +const { areaTree } = useAreaTree({ + maxLayer: AreaType.City, +}); const form = reactive({ avatar: [], name: '', - identity: '', contactPhoneNumber: '', personalIdentityCode: '', educationalBackgroundCode: '', @@ -89,14 +96,12 @@ }, placeholderData: () => ({} as API.GetUserResumePersonalQueryResult), onSuccess(data) { - form.avatar = convertApi2FormUrlOnlyOne(setOSSLink(data.avatar)); - form.name = data.name; - form.identity = data.identity; - form.contactPhoneNumber = data.contactPhoneNumber; + form.avatar = convertApi2FormUrlOnlyOne(data.avatar); + form.name = data.name ?? ''; + form.contactPhoneNumber = data.contactPhoneNumber ?? ''; form.personalIdentityCode = data.personalIdentityCode ?? ''; form.educationalBackgroundCode = data.educationalBackgroundCode ?? ''; - form.areaList = - data.provinceCode && data.cityCode ? [data.provinceCode, data.cityCode] : ['', '']; + form.areaList = [data.provinceCode, data.cityCode].filter(Boolean); }, }); @@ -130,31 +135,22 @@ try { let params: API.SaveUserResumePersonalCommand = { name: form.name, - identity: form.identity, - avatar: form.avatar[0]?.path, + avatar: form.avatar?.[0]?.path ?? '', contactPhoneNumber: form.contactPhoneNumber, educationalBackgroundCode: form.educationalBackgroundCode, personalIdentityCode: form.personalIdentityCode, - provinceCode: form.areaList[0], - cityCode: form.areaList[1], + provinceCode: form.areaList?.[0] ?? '', + cityCode: form.areaList?.[1] ?? '', }; let res = await userResumeServices.saveUserResumePersonal(params); if (res) { Message.success('淇濆瓨鎴愬姛', { onClosed() { - Taro.navigateTo({ - url: `${RouterPath.mineCurriculumVitae}`, - success: function (res) { - res.eventChannel.emit('updateResume', { content: true }); - }, - }); + goBack(); + updateUserResume(); }, }); } } catch (error) {} } </script> - -<style lang="scss"> -@import '@/styles/common.scss'; -</style> -- Gitblit v1.9.1