From 350c38912c1768c86b2c1ba01eadbd361ed61386 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期四, 13 二月 2025 10:18:14 +0800 Subject: [PATCH] fix: task --- apps/cMiniApp/src/subpackages/curriculum/expectPosition/expectPosition.vue | 13 ++++++ apps/cMiniApp/src/subpackages/curriculum/mineCertificateAddOrEdit/InnerPage.vue | 0 apps/cMiniApp/src/subpackages/curriculum/editMineInfo/InnerPage.vue | 0 packages/components/src/Tag/JobTagList.vue | 22 +++++++++++ apps/cMiniApp/src/subpackages/curriculum/mineCertificate/InnerPage.vue | 0 apps/cMiniApp/src/subpackages/curriculum/mineWorkExperience/mineWorkExperience.vue | 0 apps/cMiniApp/src/constants/router.ts | 16 ++++--- apps/cMiniApp/src/app.config.ts | 14 +++++-- apps/cMiniApp/src/subpackages/curriculum/mineCertificate/mineCertificate.config.ts | 0 apps/cMiniApp/src/subpackages/curriculum/expectPosition/InnerPage.vue | 13 ++++++ apps/cMiniApp/src/subpackages/curriculum/expectPosition/expectPosition.config.ts | 0 apps/cMiniApp/src/subpackages/curriculum/mineCurriculumVitae/mineCurriculumVitae.vue | 2 apps/cMiniApp/src/pages/mine/index.vue | 2 apps/cMiniApp/src/subpackages/curriculum/mineCertificateAddOrEdit/mineCertificateAddOrEdit.config.ts | 0 apps/cMiniApp/src/subpackages/curriculum/mineJobIntention/mineJobIntention.vue | 0 apps/cMiniApp/src/subpackages/curriculum/editMineInfo/editMineInfo.config.ts | 0 apps/cMiniApp/src/subpackages/curriculum/mineDetailedInfo/mineDetailedInfo.config.ts | 0 apps/cMiniApp/src/subpackages/curriculum/mineJobIntention/mineJobIntention.config.ts | 0 apps/cMiniApp/src/subpackages/curriculum/mineCertificateAddOrEdit/mineCertificateAddOrEdit.vue | 0 apps/cMiniApp/src/subpackages/curriculum/mineJobIntention/InnerPage.vue | 2 apps/cMiniApp/src/subpackages/curriculum/mineCertificate/mineCertificate.vue | 2 apps/cMiniApp/project.private.config.json | 7 +++ apps/cMiniApp/src/styles/nut.scss | 6 +++ apps/cMiniApp/src/subpackages/curriculum/mineWorkExperience/mineWorkExperience.config.ts | 0 apps/cMiniApp/src/subpackages/curriculum/mineCurriculumVitae/InnerPage.vue | 9 ++++ apps/cMiniApp/src/subpackages/curriculum/editMineInfo/editMineInfo.vue | 0 apps/cMiniApp/src/subpackages/curriculum/mineDetailedInfo/mineDetailedInfo.vue | 0 apps/cMiniApp/src/subpackages/curriculum/mineDetailedInfo/InnerPage.vue | 0 apps/cMiniApp/src/subpackages/curriculum/mineWorkExperience/InnerPage.vue | 0 apps/bMiniApp/src/styles/nut.scss | 6 +++ apps/cMiniApp/src/subpackages/curriculum/mineCurriculumVitae/mineCurriculumVitae.config.ts | 0 31 files changed, 98 insertions(+), 16 deletions(-) diff --git a/apps/bMiniApp/src/styles/nut.scss b/apps/bMiniApp/src/styles/nut.scss index 580a0fc..0c1480f 100644 --- a/apps/bMiniApp/src/styles/nut.scss +++ b/apps/bMiniApp/src/styles/nut.scss @@ -99,6 +99,12 @@ .nut-uploader { // justify-content: flex-end; } + + .nut-form-item__top { + .nut-form-item__label { + margin-right: 0; + } + } } .bole-input-text:not(.nut-input--disabled) { diff --git a/apps/cMiniApp/project.private.config.json b/apps/cMiniApp/project.private.config.json index d5e0ebd..181a6fd 100644 --- a/apps/cMiniApp/project.private.config.json +++ b/apps/cMiniApp/project.private.config.json @@ -9,6 +9,13 @@ "miniprogram": { "list": [ { + "name": "姹傝亴鎰忓悜", + "pathName": "subpackages/curriculum/mineJobIntention/mineJobIntention", + "query": "", + "launchMode": "default", + "scene": null + }, + { "name": "楠屾敹璇︽儏", "pathName": "subpackages/task/taskCheckDetail/taskCheckDetail", "query": "id=57a8f533-2a46-7a88-e008-3a1775810dd2", diff --git a/apps/cMiniApp/src/app.config.ts b/apps/cMiniApp/src/app.config.ts index 76e08c2..8599939 100644 --- a/apps/cMiniApp/src/app.config.ts +++ b/apps/cMiniApp/src/app.config.ts @@ -79,14 +79,20 @@ 'mineCollectTask/mineCollectTask', 'mineAgreementSign/mineAgreementSign', 'mineAgreementSignDetail/mineAgreementSignDetail', - 'mineCurriculumVitae/mineCurriculumVitae', + 'setting/setting', + ], + }, + { + root: 'subpackages/curriculum', + pages: [ 'editMineInfo/editMineInfo', - 'mineJobIntention/mineJobIntention', - 'mineWorkExperience/mineWorkExperience', 'mineCertificate/mineCertificate', 'mineCertificateAddOrEdit/mineCertificateAddOrEdit', + 'mineCurriculumVitae/mineCurriculumVitae', 'mineDetailedInfo/mineDetailedInfo', - 'setting/setting', + 'mineJobIntention/mineJobIntention', + 'mineWorkExperience/mineWorkExperience', + 'expectPosition/expectPosition', ], }, { diff --git a/apps/cMiniApp/src/constants/router.ts b/apps/cMiniApp/src/constants/router.ts index cea6cc0..5ba6748 100644 --- a/apps/cMiniApp/src/constants/router.ts +++ b/apps/cMiniApp/src/constants/router.ts @@ -35,12 +35,14 @@ mineCollectTask = '/subpackages/mine/mineCollectTask/mineCollectTask', mineAgreementSign = '/subpackages/mine/mineAgreementSign/mineAgreementSign', mineAgreementSignDetail = '/subpackages/mine/mineAgreementSignDetail/mineAgreementSignDetail', - mineCurriculumVitae = '/subpackages/mine/mineCurriculumVitae/mineCurriculumVitae', - editMineInfo = '/subpackages/mine/editMineInfo/editMineInfo', - mineJobIntention = '/subpackages/mine/mineJobIntention/mineJobIntention', - mineWorkExperience = '/subpackages/mine/mineWorkExperience/mineWorkExperience', - mineCertificate = '/subpackages/mine/mineCertificate/mineCertificate', - mineCertificateAddOrEdit = '/subpackages/mine/mineCertificateAddOrEdit/mineCertificateAddOrEdit', - mineDetailedInfo = '/subpackages/mine/mineDetailedInfo/mineDetailedInfo', setting = '/subpackages/mine/setting/setting', + + mineCurriculumVitae = '/subpackages/curriculum/mineCurriculumVitae/mineCurriculumVitae', + editMineInfo = '/subpackages/curriculum/editMineInfo/editMineInfo', + mineJobIntention = '/subpackages/curriculum/mineJobIntention/mineJobIntention', + mineWorkExperience = '/subpackages/curriculum/mineWorkExperience/mineWorkExperience', + mineCertificate = '/subpackages/curriculum/mineCertificate/mineCertificate', + mineCertificateAddOrEdit = '/subpackages/curriculum/mineCertificateAddOrEdit/mineCertificateAddOrEdit', + mineDetailedInfo = '/subpackages/curriculum/mineDetailedInfo/mineDetailedInfo', + expectPosition = '/subpackages/curriculum/expectPosition/expectPosition', } diff --git a/apps/cMiniApp/src/pages/mine/index.vue b/apps/cMiniApp/src/pages/mine/index.vue index 54ac239..7177d99 100644 --- a/apps/cMiniApp/src/pages/mine/index.vue +++ b/apps/cMiniApp/src/pages/mine/index.vue @@ -1,5 +1,5 @@ <template> - <PageLayoutWithBg class="mine-page-wrapper" :need-auth="false"> + <PageLayoutWithBg class="mine-page-wrapper" title="鎴戠殑" :need-auth="false"> <template #navigationBar> <TransparentNavigationBar title="涓汉涓績" diff --git a/apps/cMiniApp/src/styles/nut.scss b/apps/cMiniApp/src/styles/nut.scss index 580a0fc..0c1480f 100644 --- a/apps/cMiniApp/src/styles/nut.scss +++ b/apps/cMiniApp/src/styles/nut.scss @@ -99,6 +99,12 @@ .nut-uploader { // justify-content: flex-end; } + + .nut-form-item__top { + .nut-form-item__label { + margin-right: 0; + } + } } .bole-input-text:not(.nut-input--disabled) { diff --git a/apps/cMiniApp/src/subpackages/mine/editMineInfo/InnerPage.vue b/apps/cMiniApp/src/subpackages/curriculum/editMineInfo/InnerPage.vue similarity index 100% rename from apps/cMiniApp/src/subpackages/mine/editMineInfo/InnerPage.vue rename to apps/cMiniApp/src/subpackages/curriculum/editMineInfo/InnerPage.vue diff --git a/apps/cMiniApp/src/subpackages/mine/editMineInfo/editMineInfo.config.ts b/apps/cMiniApp/src/subpackages/curriculum/editMineInfo/editMineInfo.config.ts similarity index 100% rename from apps/cMiniApp/src/subpackages/mine/editMineInfo/editMineInfo.config.ts rename to apps/cMiniApp/src/subpackages/curriculum/editMineInfo/editMineInfo.config.ts diff --git a/apps/cMiniApp/src/subpackages/mine/editMineInfo/editMineInfo.vue b/apps/cMiniApp/src/subpackages/curriculum/editMineInfo/editMineInfo.vue similarity index 100% rename from apps/cMiniApp/src/subpackages/mine/editMineInfo/editMineInfo.vue rename to apps/cMiniApp/src/subpackages/curriculum/editMineInfo/editMineInfo.vue diff --git a/apps/cMiniApp/src/subpackages/curriculum/expectPosition/InnerPage.vue b/apps/cMiniApp/src/subpackages/curriculum/expectPosition/InnerPage.vue new file mode 100644 index 0000000..77f18e3 --- /dev/null +++ b/apps/cMiniApp/src/subpackages/curriculum/expectPosition/InnerPage.vue @@ -0,0 +1,13 @@ +<template> + <div>InnerPage</div> +</template> + +<script setup lang="ts"> +defineOptions({ + name: 'InnerPage', +}); +</script> + +<style lang="scss"> +@import '@/styles/common.scss'; +</style> diff --git a/apps/cMiniApp/src/subpackages/mine/mineJobIntention/mineJobIntention.config.ts b/apps/cMiniApp/src/subpackages/curriculum/expectPosition/expectPosition.config.ts similarity index 100% copy from apps/cMiniApp/src/subpackages/mine/mineJobIntention/mineJobIntention.config.ts copy to apps/cMiniApp/src/subpackages/curriculum/expectPosition/expectPosition.config.ts diff --git a/apps/cMiniApp/src/subpackages/curriculum/expectPosition/expectPosition.vue b/apps/cMiniApp/src/subpackages/curriculum/expectPosition/expectPosition.vue new file mode 100644 index 0000000..872be0a --- /dev/null +++ b/apps/cMiniApp/src/subpackages/curriculum/expectPosition/expectPosition.vue @@ -0,0 +1,13 @@ +<template> + <PageLayout class="expectPosition-page-wrapper" :title="'鏈熸湜宀椾綅'"> + <InnerPage></InnerPage> + </PageLayout> +</template> + +<script setup lang="ts"> +import InnerPage from './InnerPage.vue'; + +defineOptions({ + name: 'expectPosition', +}); +</script> diff --git a/apps/cMiniApp/src/subpackages/mine/mineCertificate/InnerPage.vue b/apps/cMiniApp/src/subpackages/curriculum/mineCertificate/InnerPage.vue similarity index 100% rename from apps/cMiniApp/src/subpackages/mine/mineCertificate/InnerPage.vue rename to apps/cMiniApp/src/subpackages/curriculum/mineCertificate/InnerPage.vue diff --git a/apps/cMiniApp/src/subpackages/mine/mineCertificate/mineCertificate.config.ts b/apps/cMiniApp/src/subpackages/curriculum/mineCertificate/mineCertificate.config.ts similarity index 100% rename from apps/cMiniApp/src/subpackages/mine/mineCertificate/mineCertificate.config.ts rename to apps/cMiniApp/src/subpackages/curriculum/mineCertificate/mineCertificate.config.ts diff --git a/apps/cMiniApp/src/subpackages/mine/mineCertificate/mineCertificate.vue b/apps/cMiniApp/src/subpackages/curriculum/mineCertificate/mineCertificate.vue similarity index 74% rename from apps/cMiniApp/src/subpackages/mine/mineCertificate/mineCertificate.vue rename to apps/cMiniApp/src/subpackages/curriculum/mineCertificate/mineCertificate.vue index 8b45d8a..c569fba 100644 --- a/apps/cMiniApp/src/subpackages/mine/mineCertificate/mineCertificate.vue +++ b/apps/cMiniApp/src/subpackages/curriculum/mineCertificate/mineCertificate.vue @@ -1,5 +1,5 @@ <template> - <PageLayout class="index-page-wrapper" :title="'璧勬牸璇佷功'" has-border> + <PageLayout class="mineCertificate-page-wrapper" :title="'璧勬牸璇佷功'" has-border> <InnerPage></InnerPage> </PageLayout> </template> diff --git a/apps/cMiniApp/src/subpackages/mine/mineCertificateAddOrEdit/InnerPage.vue b/apps/cMiniApp/src/subpackages/curriculum/mineCertificateAddOrEdit/InnerPage.vue similarity index 100% rename from apps/cMiniApp/src/subpackages/mine/mineCertificateAddOrEdit/InnerPage.vue rename to apps/cMiniApp/src/subpackages/curriculum/mineCertificateAddOrEdit/InnerPage.vue diff --git a/apps/cMiniApp/src/subpackages/mine/mineCertificateAddOrEdit/mineCertificateAddOrEdit.config.ts b/apps/cMiniApp/src/subpackages/curriculum/mineCertificateAddOrEdit/mineCertificateAddOrEdit.config.ts similarity index 100% rename from apps/cMiniApp/src/subpackages/mine/mineCertificateAddOrEdit/mineCertificateAddOrEdit.config.ts rename to apps/cMiniApp/src/subpackages/curriculum/mineCertificateAddOrEdit/mineCertificateAddOrEdit.config.ts diff --git a/apps/cMiniApp/src/subpackages/mine/mineCertificateAddOrEdit/mineCertificateAddOrEdit.vue b/apps/cMiniApp/src/subpackages/curriculum/mineCertificateAddOrEdit/mineCertificateAddOrEdit.vue similarity index 100% rename from apps/cMiniApp/src/subpackages/mine/mineCertificateAddOrEdit/mineCertificateAddOrEdit.vue rename to apps/cMiniApp/src/subpackages/curriculum/mineCertificateAddOrEdit/mineCertificateAddOrEdit.vue diff --git a/apps/cMiniApp/src/subpackages/mine/mineCurriculumVitae/InnerPage.vue b/apps/cMiniApp/src/subpackages/curriculum/mineCurriculumVitae/InnerPage.vue similarity index 96% rename from apps/cMiniApp/src/subpackages/mine/mineCurriculumVitae/InnerPage.vue rename to apps/cMiniApp/src/subpackages/curriculum/mineCurriculumVitae/InnerPage.vue index 4e5ccbf..993dda0 100644 --- a/apps/cMiniApp/src/subpackages/mine/mineCurriculumVitae/InnerPage.vue +++ b/apps/cMiniApp/src/subpackages/curriculum/mineCurriculumVitae/InnerPage.vue @@ -5,6 +5,7 @@ :left-icon="false" background="transparent" close-mode + class="mine-curriculum-noticebar" /> <div class="mine-curriculum-info-wrapper"> <UserAvatar :size="60" class="mine-curriculum-avatar" /> @@ -91,7 +92,7 @@ <script setup lang="ts"> import { useUserStore } from '@/stores/modules/user'; import { useIsLogin } from '@/hooks'; -import MineAgreementSignDetailItem from '../mineAgreementSignDetail/MineAgreementSignDetailItem.vue'; +import MineAgreementSignDetailItem from '../../mine/mineAgreementSignDetail/MineAgreementSignDetailItem.vue'; import { List, ListItem } from '@12333/components'; import { RouterPath } from '@/constants'; import IconArrow from '@/assets/setting/icon-arrow.png'; @@ -130,6 +131,12 @@ <style lang="scss"> @import '@/styles/common.scss'; +.mine-curriculum-noticebar { + .nut-noticebar__page { + padding: 0; + } +} + .mine-curriculum-info-wrapper { padding: 24px 0 50px; display: flex; diff --git a/apps/cMiniApp/src/subpackages/mine/mineCurriculumVitae/mineCurriculumVitae.config.ts b/apps/cMiniApp/src/subpackages/curriculum/mineCurriculumVitae/mineCurriculumVitae.config.ts similarity index 100% rename from apps/cMiniApp/src/subpackages/mine/mineCurriculumVitae/mineCurriculumVitae.config.ts rename to apps/cMiniApp/src/subpackages/curriculum/mineCurriculumVitae/mineCurriculumVitae.config.ts diff --git a/apps/cMiniApp/src/subpackages/mine/mineCurriculumVitae/mineCurriculumVitae.vue b/apps/cMiniApp/src/subpackages/curriculum/mineCurriculumVitae/mineCurriculumVitae.vue similarity index 75% rename from apps/cMiniApp/src/subpackages/mine/mineCurriculumVitae/mineCurriculumVitae.vue rename to apps/cMiniApp/src/subpackages/curriculum/mineCurriculumVitae/mineCurriculumVitae.vue index 76e97ee..c0338b0 100644 --- a/apps/cMiniApp/src/subpackages/mine/mineCurriculumVitae/mineCurriculumVitae.vue +++ b/apps/cMiniApp/src/subpackages/curriculum/mineCurriculumVitae/mineCurriculumVitae.vue @@ -1,5 +1,5 @@ <template> - <PageLayoutWithBg class="index-page-wrapper" :title="'鎴戠殑绠�鍘�'"> + <PageLayoutWithBg class="mineCurriculumVitae-page-wrapper" :title="'鎴戠殑绠�鍘�'"> <InnerPage></InnerPage> </PageLayoutWithBg> </template> diff --git a/apps/cMiniApp/src/subpackages/mine/mineDetailedInfo/InnerPage.vue b/apps/cMiniApp/src/subpackages/curriculum/mineDetailedInfo/InnerPage.vue similarity index 100% rename from apps/cMiniApp/src/subpackages/mine/mineDetailedInfo/InnerPage.vue rename to apps/cMiniApp/src/subpackages/curriculum/mineDetailedInfo/InnerPage.vue diff --git a/apps/cMiniApp/src/subpackages/mine/mineDetailedInfo/mineDetailedInfo.config.ts b/apps/cMiniApp/src/subpackages/curriculum/mineDetailedInfo/mineDetailedInfo.config.ts similarity index 100% rename from apps/cMiniApp/src/subpackages/mine/mineDetailedInfo/mineDetailedInfo.config.ts rename to apps/cMiniApp/src/subpackages/curriculum/mineDetailedInfo/mineDetailedInfo.config.ts diff --git a/apps/cMiniApp/src/subpackages/mine/mineDetailedInfo/mineDetailedInfo.vue b/apps/cMiniApp/src/subpackages/curriculum/mineDetailedInfo/mineDetailedInfo.vue similarity index 100% rename from apps/cMiniApp/src/subpackages/mine/mineDetailedInfo/mineDetailedInfo.vue rename to apps/cMiniApp/src/subpackages/curriculum/mineDetailedInfo/mineDetailedInfo.vue diff --git a/apps/cMiniApp/src/subpackages/mine/mineJobIntention/InnerPage.vue b/apps/cMiniApp/src/subpackages/curriculum/mineJobIntention/InnerPage.vue similarity index 97% rename from apps/cMiniApp/src/subpackages/mine/mineJobIntention/InnerPage.vue rename to apps/cMiniApp/src/subpackages/curriculum/mineJobIntention/InnerPage.vue index 2f84827..2420203 100644 --- a/apps/cMiniApp/src/subpackages/mine/mineJobIntention/InnerPage.vue +++ b/apps/cMiniApp/src/subpackages/curriculum/mineJobIntention/InnerPage.vue @@ -1,7 +1,7 @@ <template> <ContentScrollView :paddingH="false"> <nut-form :model-value="form" ref="formRef" :rules="rules"> - <nut-form-item label="鏈熸湜宀椾綅:" class="bole-form-item" prop="job"> + <nut-form-item label="鏈熸湜宀椾綅:" class="bole-form-item" prop="job" label-position="top"> <ChooseInputWithPicker v-model="form.job" placeholder="璇烽�夋嫨鏈熸湜宀椾綅" diff --git a/apps/cMiniApp/src/subpackages/mine/mineJobIntention/mineJobIntention.config.ts b/apps/cMiniApp/src/subpackages/curriculum/mineJobIntention/mineJobIntention.config.ts similarity index 100% rename from apps/cMiniApp/src/subpackages/mine/mineJobIntention/mineJobIntention.config.ts rename to apps/cMiniApp/src/subpackages/curriculum/mineJobIntention/mineJobIntention.config.ts diff --git a/apps/cMiniApp/src/subpackages/mine/mineJobIntention/mineJobIntention.vue b/apps/cMiniApp/src/subpackages/curriculum/mineJobIntention/mineJobIntention.vue similarity index 100% rename from apps/cMiniApp/src/subpackages/mine/mineJobIntention/mineJobIntention.vue rename to apps/cMiniApp/src/subpackages/curriculum/mineJobIntention/mineJobIntention.vue diff --git a/apps/cMiniApp/src/subpackages/mine/mineWorkExperience/InnerPage.vue b/apps/cMiniApp/src/subpackages/curriculum/mineWorkExperience/InnerPage.vue similarity index 100% rename from apps/cMiniApp/src/subpackages/mine/mineWorkExperience/InnerPage.vue rename to apps/cMiniApp/src/subpackages/curriculum/mineWorkExperience/InnerPage.vue diff --git a/apps/cMiniApp/src/subpackages/mine/mineWorkExperience/mineWorkExperience.config.ts b/apps/cMiniApp/src/subpackages/curriculum/mineWorkExperience/mineWorkExperience.config.ts similarity index 100% rename from apps/cMiniApp/src/subpackages/mine/mineWorkExperience/mineWorkExperience.config.ts rename to apps/cMiniApp/src/subpackages/curriculum/mineWorkExperience/mineWorkExperience.config.ts diff --git a/apps/cMiniApp/src/subpackages/mine/mineWorkExperience/mineWorkExperience.vue b/apps/cMiniApp/src/subpackages/curriculum/mineWorkExperience/mineWorkExperience.vue similarity index 100% rename from apps/cMiniApp/src/subpackages/mine/mineWorkExperience/mineWorkExperience.vue rename to apps/cMiniApp/src/subpackages/curriculum/mineWorkExperience/mineWorkExperience.vue diff --git a/packages/components/src/Tag/JobTagList.vue b/packages/components/src/Tag/JobTagList.vue new file mode 100644 index 0000000..a438ebd --- /dev/null +++ b/packages/components/src/Tag/JobTagList.vue @@ -0,0 +1,22 @@ +<template> + <div class="mine-curriculum-intention-job-content"> + <div class="mine-curriculum-intention-job-item">瀹㈡埧鏈嶅姟鍛�</div> + <div class="mine-curriculum-intention-job-item">瀹㈡埧鏈嶅姟鍛�</div> + <div class="mine-curriculum-intention-job-item">瀹㈡埧鏈嶅姟鍛�</div> + <div class="mine-curriculum-intention-job-item">瀹㈡埧鏈嶅姟鍛�</div> + </div> +</template> + +<script setup lang="ts"> +defineOptions({ + name: 'JobTagList', +}); + +// type Props = {}; + +// const props = withDefaults(defineProps<Props>(), {}); +</script> + +<style lang="scss"> +@import '@/styles/common.scss'; +</style> -- Gitblit v1.9.1