diff --git a/src/login-sub/components/LoginMask.vue b/src/login-sub/components/LoginMask.vue index c0cc6bf..983d65b 100644 --- a/src/login-sub/components/LoginMask.vue +++ b/src/login-sub/components/LoginMask.vue @@ -29,7 +29,9 @@ - 已阅读并同意《服务条款》和《隐私条款》 + + 已阅读并同意《服务条款》和《隐私条款》 + diff --git a/src/login-sub/components/navbar/Navbar.vue b/src/login-sub/components/navbar/Navbar.vue index 726f11d..b1557e8 100644 --- a/src/login-sub/components/navbar/Navbar.vue +++ b/src/login-sub/components/navbar/Navbar.vue @@ -10,10 +10,7 @@ - + @@ -49,6 +46,7 @@ backgroundColor: bgColor, }" > + @@ -84,6 +82,10 @@ const props = defineProps({ type: String, default: '#ffffff', }, + contentClass: { + type: String, + default: 'justify-between', + }, }) const emit = defineEmits(['clickLeft']) @@ -129,7 +131,7 @@ const handleClickLeft = () => { width: 100%; display: flex; align-items: center; - justify-content: space-between; + /* justify-content: space-between; */ padding: 0 32rpx; box-sizing: border-box; background-color: #fff; @@ -149,7 +151,6 @@ const handleClickLeft = () => { .navbar-left { display: flex; align-items: center; - min-width: 100rpx; height: 100%; } @@ -161,9 +162,8 @@ const handleClickLeft = () => { } .navbar-title { - flex: 1; + /* flex: 1; */ text-align: center; - padding: 0 100rpx; overflow: hidden; height: 100%; display: flex; @@ -172,7 +172,7 @@ const handleClickLeft = () => { } .title-text { - font-size: 32rpx; + font-size: 36rpx; color: #333; font-weight: 500; overflow: hidden; @@ -187,4 +187,19 @@ const handleClickLeft = () => { justify-content: flex-end; height: 100%; } + +@font-face { + font-family: 'iconfont'; + src: url('data:font/woff2;charset=utf-8;base64,d09GMgABAAAAAAKYAAsAAAAABlAAAAJMAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHFQGYACCcApcdgE2AiQDCAsGAAQgBYRnBzYbmQXIHpIkBQQKkYCABBEPz2/t/XN3twEbowBkQTxQEQ1RKaKSxEOi0agkJKF5Qvj/f037IFKwlZ2dWU2tJu0EhPwHkBwgOVAclKcvAQpI/v/fz/08XECy+YBymmPQiwIcSmhAY4uSFcgJ+IaxC1zCYwLtRjWSnZ2rGgQWBowLxCPrVBBYllQqNTQ0VISaBXEHtTRNUwW4jb4f/xYEC0kqMzDx6CGrQuKXxKc6Zf7POYQgQHs5kIwjYwEoxK3G/DpRwbi0dlNwKKjAL4lf6vw/R2zVWvTPIwuiCnp2wCRUZ3yJX5pJFVDfByyAFR2AblMAX/OR3t7+zOJi8GyyfzC1uQXLZvtnk/0zyfTy+PvH0/Xp5OzR98/H797/+/fDu3d/3739+/fd+/+nmxvLc5vrS+sry2vz84tLs9Mzc4vzs9NTM/Ozc1OzM3MzU/Mz0wvTU4vTk0tTE8uTEyuT4yv/G0E3XUxv7wwNbu/s9G8fbO9v7+3sb+3ubW4dbO4dbO3vbu4dbO3JzqPFtRE4gEGAX0NBkL+hpCZALkEp5FKUQqE0NHlXJIGrDNAOcEQBCHU+kXT5QNblC7kEv1EK9Y9SB/8o7YYu2m0YXrJLouNIjQJhH+QbVkVZrUQ+YuqzUJdzxPMHhdIj0+hg4o0D8ogj5r5bSoQUxjADz+A8hBDQFEYwh3mommXTul7Vm5ZtqAqJHIdoKCDYDyQ3mCqUG1YKn5+C0s0yiJ/qKVAQedKAhg6Y3mEHJBQaWKnvLVMiiEIxGAY8Aw6HIAhAJmEIzIIOUjLTTAB1taL1QvNq+fYN7QDjcc2okeioaOmy5LFXt3QAAAAA') + format('woff2'); +} + +.back-text { + font-family: 'iconfont' !important; + font-size: 48rpx; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + color: #333; +} diff --git a/src/login-sub/components/navbar/left.jpg b/src/login-sub/components/navbar/left.jpg deleted file mode 100644 index 69b166b..0000000 Binary files a/src/login-sub/components/navbar/left.jpg and /dev/null differ diff --git a/src/login-sub/index.vue b/src/login-sub/index.vue index 9687771..f7f1e05 100644 --- a/src/login-sub/index.vue +++ b/src/login-sub/index.vue @@ -14,13 +14,15 @@ :bordered="false" :fixed="true" :placeholder="true" + left-arrow bgColor="transparent" + @click-left="handleClickLeft" > - + { const handleAuthReady = () => { uni.navigateBack() } + +const handleClickLeft = () => { + uni.navigateBack() +} diff --git a/src/pages-sub/components/CustomPickerView.vue b/src/pages-sub/components/CustomPickerView.vue new file mode 100644 index 0000000..86dd6b4 --- /dev/null +++ b/src/pages-sub/components/CustomPickerView.vue @@ -0,0 +1,194 @@ + + + + + diff --git a/src/pages-sub/components/navbar/Navbar.vue b/src/pages-sub/components/navbar/Navbar.vue index 726f11d..b1557e8 100644 --- a/src/pages-sub/components/navbar/Navbar.vue +++ b/src/pages-sub/components/navbar/Navbar.vue @@ -10,10 +10,7 @@ - + @@ -49,6 +46,7 @@ backgroundColor: bgColor, }" > + @@ -84,6 +82,10 @@ const props = defineProps({ type: String, default: '#ffffff', }, + contentClass: { + type: String, + default: 'justify-between', + }, }) const emit = defineEmits(['clickLeft']) @@ -129,7 +131,7 @@ const handleClickLeft = () => { width: 100%; display: flex; align-items: center; - justify-content: space-between; + /* justify-content: space-between; */ padding: 0 32rpx; box-sizing: border-box; background-color: #fff; @@ -149,7 +151,6 @@ const handleClickLeft = () => { .navbar-left { display: flex; align-items: center; - min-width: 100rpx; height: 100%; } @@ -161,9 +162,8 @@ const handleClickLeft = () => { } .navbar-title { - flex: 1; + /* flex: 1; */ text-align: center; - padding: 0 100rpx; overflow: hidden; height: 100%; display: flex; @@ -172,7 +172,7 @@ const handleClickLeft = () => { } .title-text { - font-size: 32rpx; + font-size: 36rpx; color: #333; font-weight: 500; overflow: hidden; @@ -187,4 +187,19 @@ const handleClickLeft = () => { justify-content: flex-end; height: 100%; } + +@font-face { + font-family: 'iconfont'; + src: url('data:font/woff2;charset=utf-8;base64,d09GMgABAAAAAAKYAAsAAAAABlAAAAJMAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHFQGYACCcApcdgE2AiQDCAsGAAQgBYRnBzYbmQXIHpIkBQQKkYCABBEPz2/t/XN3twEbowBkQTxQEQ1RKaKSxEOi0agkJKF5Qvj/f037IFKwlZ2dWU2tJu0EhPwHkBwgOVAclKcvAQpI/v/fz/08XECy+YBymmPQiwIcSmhAY4uSFcgJ+IaxC1zCYwLtRjWSnZ2rGgQWBowLxCPrVBBYllQqNTQ0VISaBXEHtTRNUwW4jb4f/xYEC0kqMzDx6CGrQuKXxKc6Zf7POYQgQHs5kIwjYwEoxK3G/DpRwbi0dlNwKKjAL4lf6vw/R2zVWvTPIwuiCnp2wCRUZ3yJX5pJFVDfByyAFR2AblMAX/OR3t7+zOJi8GyyfzC1uQXLZvtnk/0zyfTy+PvH0/Xp5OzR98/H797/+/fDu3d/3739+/fd+/+nmxvLc5vrS+sry2vz84tLs9Mzc4vzs9NTM/Ozc1OzM3MzU/Mz0wvTU4vTk0tTE8uTEyuT4yv/G0E3XUxv7wwNbu/s9G8fbO9v7+3sb+3ubW4dbO4dbO3vbu4dbO3JzqPFtRE4gEGAX0NBkL+hpCZALkEp5FKUQqE0NHlXJIGrDNAOcEQBCHU+kXT5QNblC7kEv1EK9Y9SB/8o7YYu2m0YXrJLouNIjQJhH+QbVkVZrUQ+YuqzUJdzxPMHhdIj0+hg4o0D8ogj5r5bSoQUxjADz+A8hBDQFEYwh3mommXTul7Vm5ZtqAqJHIdoKCDYDyQ3mCqUG1YKn5+C0s0yiJ/qKVAQedKAhg6Y3mEHJBQaWKnvLVMiiEIxGAY8Aw6HIAhAJmEIzIIOUjLTTAB1taL1QvNq+fYN7QDjcc2okeioaOmy5LFXt3QAAAAA') + format('woff2'); +} + +.back-text { + font-family: 'iconfont' !important; + font-size: 48rpx; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + color: #333; +} diff --git a/src/pages-sub/components/navbar/left.jpg b/src/pages-sub/components/navbar/left.jpg deleted file mode 100644 index 69b166b..0000000 Binary files a/src/pages-sub/components/navbar/left.jpg and /dev/null differ diff --git a/src/pages-sub/home/career/components/CareerInfo.vue b/src/pages-sub/home/career/components/CareerInfo.vue new file mode 100644 index 0000000..fc3fd70 --- /dev/null +++ b/src/pages-sub/home/career/components/CareerInfo.vue @@ -0,0 +1,26 @@ + + + diff --git a/src/pages-sub/home/career/components/DevelopmentProspect.vue b/src/pages-sub/home/career/components/DevelopmentProspect.vue new file mode 100644 index 0000000..5fc1d5e --- /dev/null +++ b/src/pages-sub/home/career/components/DevelopmentProspect.vue @@ -0,0 +1,68 @@ + + + diff --git a/src/pages-sub/home/career/components/KnowledgeBackground.vue b/src/pages-sub/home/career/components/KnowledgeBackground.vue new file mode 100644 index 0000000..a5d27d4 --- /dev/null +++ b/src/pages-sub/home/career/components/KnowledgeBackground.vue @@ -0,0 +1,50 @@ + + + diff --git a/src/pages-sub/home/career/components/LeftMenu.vue b/src/pages-sub/home/career/components/LeftMenu.vue new file mode 100644 index 0000000..e39fcd1 --- /dev/null +++ b/src/pages-sub/home/career/components/LeftMenu.vue @@ -0,0 +1,69 @@ + + + + + diff --git a/src/pages-sub/home/career/components/TreeList.vue b/src/pages-sub/home/career/components/TreeList.vue new file mode 100644 index 0000000..35f457c --- /dev/null +++ b/src/pages-sub/home/career/components/TreeList.vue @@ -0,0 +1,56 @@ + + + + + diff --git a/src/pages-sub/home/career/components/VocationalSkill.vue b/src/pages-sub/home/career/components/VocationalSkill.vue new file mode 100644 index 0000000..930a1f6 --- /dev/null +++ b/src/pages-sub/home/career/components/VocationalSkill.vue @@ -0,0 +1,65 @@ + + + diff --git a/src/pages-sub/home/career/index.vue b/src/pages-sub/home/career/index.vue index 17b83e6..bafb1f4 100644 --- a/src/pages-sub/home/career/index.vue +++ b/src/pages-sub/home/career/index.vue @@ -1,5 +1,45 @@ + +{ + layout: 'page', + style: { + navigationStyle: 'custom', + }, +} + - + + + diff --git a/src/pages-sub/home/career/info.vue b/src/pages-sub/home/career/info.vue new file mode 100644 index 0000000..f49854a --- /dev/null +++ b/src/pages-sub/home/career/info.vue @@ -0,0 +1,176 @@ + +{ + layout: 'page', + style: { + navigationStyle: 'custom', + }, +} + + + + + + + diff --git a/src/pages-sub/home/college/components/EnrollmentMark.vue b/src/pages-sub/home/college/components/EnrollmentMark.vue index eb1ad35..796ebb8 100644 --- a/src/pages-sub/home/college/components/EnrollmentMark.vue +++ b/src/pages-sub/home/college/components/EnrollmentMark.vue @@ -23,7 +23,7 @@ - + 取消 @@ -37,6 +37,7 @@ import WXXTable from '@/pages-sub/home/components/Table.vue' import { getAdmissionMark } from '@/service/index/api' import { useUserStore } from '@/store' +import CustomPickerView from '@/pages-sub/components/CustomPickerView.vue' const props = defineProps({ id: { @@ -129,32 +130,5 @@ const handleConfirm = () => { } diff --git a/src/pages-sub/home/college/components/EnrollmentPlan.vue b/src/pages-sub/home/college/components/EnrollmentPlan.vue index 2db39fe..51ffbe9 100644 --- a/src/pages-sub/home/college/components/EnrollmentPlan.vue +++ b/src/pages-sub/home/college/components/EnrollmentPlan.vue @@ -26,7 +26,7 @@ - + 取消 @@ -39,6 +39,7 @@ diff --git a/src/pages-sub/home/college/components/Situation.vue b/src/pages-sub/home/college/components/Situation.vue index 3c6953c..3587765 100644 --- a/src/pages-sub/home/college/components/Situation.vue +++ b/src/pages-sub/home/college/components/Situation.vue @@ -23,12 +23,7 @@ - + 省份 @@ -53,6 +48,7 @@ import WXXTable from '@/pages-sub/home/components/Table.vue' import { getPlanProList } from '@/service/index/api' import { useUserStore } from '@/store' import Region from '@/pages-sub/home/components/Region.vue' +import CustomPickerView from '@/pages-sub/components/CustomPickerView.vue' const props = defineProps({ id: { @@ -147,32 +143,5 @@ const handleRegionChangeName = (val) => { } diff --git a/src/pages-sub/home/inputScore/index.vue b/src/pages-sub/home/inputScore/index.vue index bdd0352..ff54a1c 100644 --- a/src/pages-sub/home/inputScore/index.vue +++ b/src/pages-sub/home/inputScore/index.vue @@ -108,7 +108,6 @@ 保存 - @@ -120,9 +119,6 @@ import { requireSubjectList, optionalSubjectList, } from '@/pages-sub/home/inputScore/useRules' -import { useToast } from 'wot-design-uni' - -const toast = useToast() const userStore = useUserStore() @@ -167,7 +163,9 @@ onBeforeMount(() => { const saveScore = () => { if (score.value === '') { - toast.warning('请检查分数') + uni.showToast({ + title: '请检查分数', + }) return } const data = { diff --git a/src/pages-sub/home/major/components/MajorList.vue b/src/pages-sub/home/major/components/MajorList.vue index fc28c8a..2f41816 100644 --- a/src/pages-sub/home/major/components/MajorList.vue +++ b/src/pages-sub/home/major/components/MajorList.vue @@ -2,16 +2,19 @@ {{ item.name }} - + @@ -32,43 +35,16 @@ const props = defineProps({ }) const menus = ref([]) +const currentMenuObj = ref(null) -const currentMenu = ref('') - -const currentMenuObj = ref<{ - name: string - key: string - count: number - itemsCount: number - items: any[] -}>({ - name: '', - key: '', - count: 0, - itemsCount: 0, - items: [], -}) - -const subMajorList = ref([]) - -const changeMenu = (item: { - name: string - key: string - count: number - itemsCount: number - items: any[] -}) => { - currentMenu.value = item.key +const changeMenu = (item: any) => { currentMenuObj.value = item } const getMajorList = ({ Type, KeyWord }) => { getMajorLevelList({ Type, KeyWord }).then((resp) => { if (resp.code === 200) { - menus.value = resp.result[0].rootDtos as { key: string; name: string; items: any[] }[] - currentMenu.value = menus.value[0].key - subMajorList.value = menus.value[0].items - + menus.value = resp.result[0].rootDtos currentMenuObj.value = menus.value[0] } }) diff --git a/src/pages-sub/home/major/components/MajorTreeList.vue b/src/pages-sub/home/major/components/MajorTreeList.vue index 76fa3e1..733f42d 100644 --- a/src/pages-sub/home/major/components/MajorTreeList.vue +++ b/src/pages-sub/home/major/components/MajorTreeList.vue @@ -67,8 +67,11 @@ const value = ref('') watch( () => props.subMajorList, (newV) => { - value.value = newV.items[0].key.toString() + if (newV?.items?.length > 0) { + value.value = newV.items[0].key + } }, + { immediate: true }, ) const navigatorToMajorInfo = (item: unknown) => { @@ -82,9 +85,8 @@ const navigatorToMajorInfo = (item: unknown) => { diff --git a/src/pages-sub/home/major/info.vue b/src/pages-sub/home/major/info.vue index 5032931..cfbd954 100644 --- a/src/pages-sub/home/major/info.vue +++ b/src/pages-sub/home/major/info.vue @@ -8,22 +8,20 @@