From f15cb1adba958c95ef67793f52fb49287dadb7bd Mon Sep 17 00:00:00 2001 From: xjs Date: Mon, 1 Dec 2025 17:02:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A0=B7=E5=BC=8F=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../academicReport/capabilityReport.vue | 22 ++--- .../academicReport/characterReport.vue | 22 ++--- .../academicReport/interestReport.vue | 2 +- .../academicReport/opinionAboutReport.vue | 22 ++--- .../evaluate/components/AiFooter.vue | 2 +- src/http/http.ts | 6 -- src/pages-sub/about/userInfo.vue | 12 +-- src/pages-sub/information/highSchool.vue | 6 +- src/pages-sub/information/overTheYear.vue | 25 +++--- src/pages-sub/information/quota.vue | 24 +++--- src/pages-sub/me/evaluation.vue | 6 +- src/pages-sub/me/starSchool.vue | 6 +- src/pages-sub/me/wishlist.vue | 10 ++- src/pages-sub/talented/create/artFirst.vue | 6 +- src/pages-sub/talented/create/artSecond.vue | 2 +- src/pages-sub/talented/create/sportsFirst.vue | 8 +- .../talented/create/sportsSecond.vue | 4 +- .../create/components/FirstBatchSchool.vue | 77 +++++++++--------- .../create/components/SecondBatchSchool.vue | 59 +++++++------- .../create/components/ThirdBatchSchool.vue | 80 +++++++++---------- .../create/saveFirstBatchWishList.vue | 53 ++++++------ .../create/saveSecondBatchWishList.vue | 2 +- .../create/saveThirdBatchWishList.vue | 2 +- src/service/requestApi.ts | 30 +++++-- 24 files changed, 243 insertions(+), 245 deletions(-) diff --git a/src/chart-sub/evaluate/academicReport/capabilityReport.vue b/src/chart-sub/evaluate/academicReport/capabilityReport.vue index bd4cbd6..ac6a6eb 100644 --- a/src/chart-sub/evaluate/academicReport/capabilityReport.vue +++ b/src/chart-sub/evaluate/academicReport/capabilityReport.vue @@ -69,17 +69,17 @@ onLoad((options) => { pageType.value = +options.type pageId.value = options.id - // getAbilityDimension({ ScaleId: pageId.value }).then((resp) => { - // if (resp.code === 200) { - // studyRecord.value = resp.result as { - // description: string - // title: string - // linChart: any[] - // reportItems: any[] - // hTag: string - // } - // } - // }) + getAbilityDimension({ ScaleId: pageId.value }).then((resp) => { + if (resp.code === 200) { + studyRecord.value = resp.result as { + description: string + title: string + linChart: any[] + reportItems: any[] + hTag: string + } + } + }) }) diff --git a/src/chart-sub/evaluate/academicReport/characterReport.vue b/src/chart-sub/evaluate/academicReport/characterReport.vue index e8b74d3..64b0cc1 100644 --- a/src/chart-sub/evaluate/academicReport/characterReport.vue +++ b/src/chart-sub/evaluate/academicReport/characterReport.vue @@ -85,17 +85,17 @@ onLoad((options) => { pageType.value = +options.type pageId.value = options.id - // getMBTIDimension({ ScaleId: pageId.value }).then((resp) => { - // if (resp.code === 200) { - // studyRecord.value = resp.result as { - // description: string - // title: string - // linChart: any - // reportItem: { mainDomain: string; major: string; occupation: string } - // hTag: string - // } - // } - // }) + getMBTIDimension({ ScaleId: pageId.value }).then((resp) => { + if (resp.code === 200) { + studyRecord.value = resp.result as { + description: string + title: string + linChart: any + reportItem: { mainDomain: string; major: string; occupation: string } + hTag: string + } + } + }) }) diff --git a/src/chart-sub/evaluate/academicReport/interestReport.vue b/src/chart-sub/evaluate/academicReport/interestReport.vue index 558f452..8e93f53 100644 --- a/src/chart-sub/evaluate/academicReport/interestReport.vue +++ b/src/chart-sub/evaluate/academicReport/interestReport.vue @@ -2,7 +2,7 @@ diff --git a/src/chart-sub/evaluate/academicReport/opinionAboutReport.vue b/src/chart-sub/evaluate/academicReport/opinionAboutReport.vue index e78b7eb..f8d51ad 100644 --- a/src/chart-sub/evaluate/academicReport/opinionAboutReport.vue +++ b/src/chart-sub/evaluate/academicReport/opinionAboutReport.vue @@ -79,17 +79,17 @@ onLoad((options) => { pageType.value = +options.type pageId.value = options.id - // getOpinionAbout({ ScaleId: pageId.value }).then((resp) => { - // if (resp.code === 200) { - // studyRecord.value = resp.result as { - // description: string - // title: string - // picCharts: { radars: any[]; indicator: any[] } - // reportItems: any[] - // tag: string - // } - // } - // }) + getOpinionAbout({ ScaleId: pageId.value }).then((resp) => { + if (resp.code === 200) { + studyRecord.value = resp.result as { + description: string + title: string + picCharts: { radars: any[]; indicator: any[] } + reportItems: any[] + tag: string + } + } + }) }) diff --git a/src/chart-sub/evaluate/components/AiFooter.vue b/src/chart-sub/evaluate/components/AiFooter.vue index 640e708..c28f998 100644 --- a/src/chart-sub/evaluate/components/AiFooter.vue +++ b/src/chart-sub/evaluate/components/AiFooter.vue @@ -6,7 +6,7 @@ v-if="aiShow" > (options: CustomRequestOptions) { return reject(res) } - // 不存在的用户处理 - if (responseData.code === 400) { - tokenStore.logout() - uni.navigateTo({ url: LOGIN_PAGE }) - } - // 处理其他成功状态（HTTP状态码200-299） if (res.statusCode >= 200 && res.statusCode < 300) { // 处理业务逻辑错误 diff --git a/src/pages-sub/about/userInfo.vue b/src/pages-sub/about/userInfo.vue index c58beb7..093fd8e 100644 --- a/src/pages-sub/about/userInfo.vue +++ b/src/pages-sub/about/userInfo.vue @@ -174,19 +174,19 @@ onShow(() => { + custom-root-class="pt-[22rpx] pb-[20rpx]" custom-item-class="py-[12rpx] text-center " + active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none" @change="visible = false" /> + custom-root-class="pt-[22rpx] pb-[20rpx]" custom-item-class="py-[12rpx] text-center " + active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none" @change="visible = false" /> + custom-root-class="pt-[22rpx] pb-[20rpx]" custom-item-class="py-[12rpx] text-center " + active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none" @change="visible = false" /> diff --git a/src/pages-sub/information/highSchool.vue b/src/pages-sub/information/highSchool.vue index 5991cc2..c13753f 100644 --- a/src/pages-sub/information/highSchool.vue +++ b/src/pages-sub/information/highSchool.vue @@ -119,7 +119,7 @@ const handleComplete = () => { @@ -127,7 +127,7 @@ const handleComplete = () => { @@ -136,7 +136,7 @@ const handleComplete = () => { :options="schoolTypeList" label-key="label" value-key="value" custom-root-class="px-[32rpx] pt-[30rpx] pb-[40rpx]" custom-item-class="w-full py-[16rpx] text-center border-[1rpx] border-solid" - active-item-class="bg-[#e7f2ff] text-[#1580FF] border-[#1580FF]" + active-item-class="bg-white text-[#1580FF] border-1 border-solid border-[#1580FF]!" default-item-class="bg-[#F3F4F8] border-[#F3F4F8]" @change="handleComplete" /> diff --git a/src/pages-sub/information/overTheYear.vue b/src/pages-sub/information/overTheYear.vue index 1546938..bf56d72 100644 --- a/src/pages-sub/information/overTheYear.vue +++ b/src/pages-sub/information/overTheYear.vue @@ -113,8 +113,8 @@ onShow(() => { } }) getHistoryYearList().then(resp => { - if(resp.code ===200){ - yearList.value = [{ value: '', label: '不限' },...resp.result] + if (resp.code === 200) { + yearList.value = [{ value: '', label: '不限' }, ...resp.result] } }) handleChange() @@ -126,28 +126,28 @@ onShow(() => { - + - + + custom-item-class="w-full py-[16rpx] text-center border-[1rpx] border-solid" @change="handleChange" /> - + + custom-item-class="w-full py-[16rpx] text-center border-[1rpx] border-solid" @change="handleChange" /> @@ -168,6 +168,11 @@ onShow(() => { :style="{ 'text-align': item.align }">{{ record[item.prop] }} + + + 暂无数据 + + diff --git a/src/pages-sub/information/quota.vue b/src/pages-sub/information/quota.vue index 141e18d..7cd7713 100644 --- a/src/pages-sub/information/quota.vue +++ b/src/pages-sub/information/quota.vue @@ -53,7 +53,7 @@ const handleChange = () => { onLoad(() => { getAreaList().then(resp => { if (resp.code === 200) { - regions.value = [{label:'不限',value:''},...resp.result] + regions.value = [{ label: '不限', value: '' }, ...resp.result] } }) handleChange() @@ -71,8 +71,7 @@ onLoad(() => { {{ searchParams.regionLabel === '' || searchParams.regionLabel === '不限' ? '区域' : searchParams.regionLabel }} - + @@ -94,26 +93,23 @@ onLoad(() => { - - - + active-item-class="bg-white text-[#1580FF] border-1 border-solid border-[#1580FF]!" + default-item-class="bg-[#F3F4F8] border-[#F3F4F8]" @change="regionVisible = false" /> - + + diff --git a/src/pages-sub/me/evaluation.vue b/src/pages-sub/me/evaluation.vue index 8bc3fe8..e7b8e4e 100644 --- a/src/pages-sub/me/evaluation.vue +++ b/src/pages-sub/me/evaluation.vue @@ -23,9 +23,9 @@ onShow(() => { diff --git a/src/pages-sub/wishlist/create/saveFirstBatchWishList.vue b/src/pages-sub/wishlist/create/saveFirstBatchWishList.vue index c9280f7..303fffb 100644 --- a/src/pages-sub/wishlist/create/saveFirstBatchWishList.vue +++ b/src/pages-sub/wishlist/create/saveFirstBatchWishList.vue @@ -6,7 +6,7 @@ import { storeToRefs } from "pinia" const wishlistStore = useWishlistStore() -const {extendWishlist} = storeToRefs(wishlistStore) +const { extendWishlist } = storeToRefs(wishlistStore) definePage({ style: { @@ -19,18 +19,18 @@ const show = ref(false) const handleSave = () => { show.value = true } -const handleSubmit = () =>{ - saveWishlist({data:{title:wishListName.value,contents:extendWishlist.value.contents,batchName:'第一批次',TotalScore:totalScore.value}}).then(resp => { - if(resp.code === 200){ +const handleSubmit = () => { + saveWishlist({ data: { title: wishListName.value, contents: extendWishlist.value.contents, batchName: '第一批次', TotalScore: totalScore.value } }).then(resp => { + if (resp.code === 200) { show.value = false wishlistStore.clearExtendWishlist(); - uni.switchTab({url:"/pages/index/index"}) + uni.switchTab({ url: "/pages/index/index" }) } }) } const navigateToHome = () => { wishlistStore.clearExtendWishlist(); - uni.switchTab({url:"/pages/index/index"}) + uni.switchTab({ url: "/pages/index/index" }) } @@ -41,9 +41,9 @@ const totalScore = ref(0) onShow(() => { getMyScore().then(resp => { - if (resp.code === 200 && resp.result) { - totalScore.value = resp.result.totalScore - } + if (resp.code === 200 && resp.result) { + totalScore.value = resp.result.totalScore + } }) }) @@ -61,7 +61,8 @@ onBackPress(() => { {{ val.schoolName }} - {{new Date().getFullYear()}}计划招生：{{val.planCount}}人 + {{ new Date().getFullYear() }}计划招生：{{ val.planCount }}人 +