diff --git a/src/hooks/useUserInfo.ts b/src/hooks/useUserInfo.ts index 18ae531..2d0b449 100644 --- a/src/hooks/useUserInfo.ts +++ b/src/hooks/useUserInfo.ts @@ -25,12 +25,3 @@ export const useWxInfo = ({ code, openId }) => { } }) } - -export const universityBaseInfo = ref() -export const useUniversityInfo = (provinceCode: number) => { - getUniversityInfo({ Id: provinceCode }).then((res) => { - if (res.code === 200) { - universityBaseInfo.value = res.result - } - }) -} diff --git a/src/login-sub/components/LoginMask.vue b/src/login-sub/components/LoginMask.vue index e7734cc..67a1693 100644 --- a/src/login-sub/components/LoginMask.vue +++ b/src/login-sub/components/LoginMask.vue @@ -109,7 +109,10 @@ const getUserInfo = async (code: string) => { // 根据微信的信息获取用户信息 getWxUserInfo().then((resp) => { - const infoData = resp.result as unknown as { userExtend: { provinceCode: string } } + const infoData = resp.result as unknown as { + userExtend: { provinceCode: string } + zyBatches: any[] + } userStore.setEstimatedAchievement(infoData.userExtend) if (resp.code === 200) { // 根据用户信息中的城市设置对应城市的分数等信息 diff --git a/src/pages-sub/home/college/components/Colleges.vue b/src/pages-sub/home/college/components/Colleges.vue index 30f6181..a89623e 100644 --- a/src/pages-sub/home/college/components/Colleges.vue +++ b/src/pages-sub/home/college/components/Colleges.vue @@ -1,44 +1,65 @@ diff --git a/src/pages-sub/home/college/components/EnrollmentIntro.vue b/src/pages-sub/home/college/components/EnrollmentIntro.vue new file mode 100644 index 0000000..736e0ad --- /dev/null +++ b/src/pages-sub/home/college/components/EnrollmentIntro.vue @@ -0,0 +1,53 @@ + + + + + diff --git a/src/pages-sub/home/college/components/EnrollmentMark.vue b/src/pages-sub/home/college/components/EnrollmentMark.vue new file mode 100644 index 0000000..33e2146 --- /dev/null +++ b/src/pages-sub/home/college/components/EnrollmentMark.vue @@ -0,0 +1,157 @@ + + + + diff --git a/src/pages-sub/home/college/components/EnrollmentPlan.vue b/src/pages-sub/home/college/components/EnrollmentPlan.vue new file mode 100644 index 0000000..2db39fe --- /dev/null +++ b/src/pages-sub/home/college/components/EnrollmentPlan.vue @@ -0,0 +1,159 @@ + + + + diff --git a/src/pages-sub/home/college/components/FirstClass.vue b/src/pages-sub/home/college/components/FirstClass.vue index 847ddb7..6c316f1 100644 --- a/src/pages-sub/home/college/components/FirstClass.vue +++ b/src/pages-sub/home/college/components/FirstClass.vue @@ -34,6 +34,23 @@ + + + 特色专业·{{ featureSubjectList.length }} + + + {{ featureSubjectList.join(',') }} + + + 查看全部 + + + +