From 71a0dff750c1422320154d397bc6747c0650779c Mon Sep 17 00:00:00 2001 From: xjs Date: Wed, 10 Jun 2026 11:44:18 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- env/.env | 10 +-- .../academicReport/capabilityReport.vue | 4 +- .../academicReport/characterReport.vue | 4 +- .../academicReport/interestReport.vue | 4 +- .../academicReport/opinionAboutReport.vue | 4 +- .../psychologicalReport/sasReport.vue | 6 +- .../psychologicalReport/sdsReport.vue | 6 +- .../evaluate/studyReport/LearnSkillReport.vue | 6 +- .../evaluate/studyReport/LearnStudyReport.vue | 6 +- .../evaluate/studyReport/anxietyReport.vue | 6 +- src/http/http.ts | 5 ++ src/http/interceptor.ts | 1 - src/pages-fg/login/login.vue | 4 + src/pages-sub/about/fillCollection.vue | 82 +++++++++++++++++++ src/pages-sub/about/onlineCustom.vue | 2 +- src/pages-sub/about/userInfo.vue | 2 +- src/pages-sub/ai-service/index.vue | 4 +- src/pages-sub/components/read-more/index.vue | 4 +- src/pages-sub/components/upload/index.vue | 14 ++++ .../components/HighSchoolDetailHeader.vue | 3 +- .../components/SchoolIntroduce.vue | 4 +- src/pages-sub/information/highSchool.vue | 2 +- src/pages-sub/information/middleSchool.vue | 34 +++++--- src/pages-sub/information/overTheYear.vue | 3 +- src/pages-sub/information/quota.vue | 4 +- src/pages-sub/talented/create/artFirst.vue | 2 +- src/pages-sub/talented/create/artSecond.vue | 30 ++----- src/pages-sub/talented/create/sportsFirst.vue | 2 +- .../talented/create/sportsSecond.vue | 16 ++-- .../create/components/FirstBatchSchool.vue | 6 +- .../create/components/SecondBatchSchool.vue | 23 +++--- .../create/components/ThirdBatchSchool.vue | 6 +- src/pages-sub/wishlist/create/first.vue | 2 +- src/pages-sub/wishlist/create/second.vue | 2 +- src/pages-sub/wishlist/school.vue | 2 +- src/pages/index/index.vue | 11 ++- src/pages/me/me.vue | 2 +- src/utils/index.ts | 6 +- 38 files changed, 218 insertions(+), 116 deletions(-) create mode 100644 src/pages-sub/about/fillCollection.vue diff --git a/env/.env b/env/.env index 25c9a69..fbde80d 100644 --- a/env/.env +++ b/env/.env @@ -5,7 +5,7 @@ VITE_UNI_APPID = 'H57F2ACE4' # VITE_WX_APPID = 'wxc48ad15d58a3e417' 六纬中考通 # VITE_WX_APPID = 'wx4b925e36c17dd54a' 智能中专学校的 # wx487ac749c0e10be5 深泉外国语的 -VITE_WX_APPID = 'wx487ac749c0e10be5' +VITE_WX_APPID = 'wxc48ad15d58a3e417' # VITE_WX_VIDEO_ID= 'sphju9MCfZetYHP' 智能中专学校的 # VITE_WX_VIDEO_ID= 'spht0MPpWjxEKb4' 深泉外国语 VITE_WX_VIDEO_ID= 'spht0MPpWjxEKb4' @@ -16,12 +16,12 @@ VITE_WX_VIDEO_ID= 'spht0MPpWjxEKb4' # VITE_CLOUD_BOT_ID= 'agent-wxai-4gl75um61026324f', # 深泉外国语学院的 -VITE_CLOUD_ENV_ID='cloud1-d9g4odcaqf6a2114f' -VITE_CLOUD_BOT_ID='agent-wxai-9gi3rts96061202f' +# VITE_CLOUD_ENV_ID='cloud1-d9g4odcaqf6a2114f' +# VITE_CLOUD_BOT_ID='agent-wxai-9gi3rts96061202f' # 六纬中考通 -# VITE_CLOUD_ENV_ID='cloud1-d3g5q6bq61a240786' -# VITE_CLOUD_BOT_ID='agent-wxai-4gl75um61026324f' +VITE_CLOUD_ENV_ID='cloud1-d3g5q6bq61a240786' +VITE_CLOUD_BOT_ID='agent-wxai-4gl75um61026324f' # h5部署网站的base，配置到 manifest.config.ts 里的 h5.router.base # https://uniapp.dcloud.net.cn/collocation/manifest.html#h5-router diff --git a/src/chart-sub/evaluate/academicReport/capabilityReport.vue b/src/chart-sub/evaluate/academicReport/capabilityReport.vue index d1b788f..18ab09d 100644 --- a/src/chart-sub/evaluate/academicReport/capabilityReport.vue +++ b/src/chart-sub/evaluate/academicReport/capabilityReport.vue @@ -20,7 +20,7 @@ - + @@ -28,7 +28,7 @@ import Navbar from '@/chart-sub/components/navbar/Navbar.vue' import LineReport from '../components/interestChart/LineReport.vue' import AbilityDimension from '../components/AbilityDimension.vue' -import AiFooter from '../components/AiFooter.vue' +// import AiFooter from '../components/AiFooter.vue' import { handleBack } from '../hooks/useEvaluateBack' import { getAbilityDimension } from '@/service' diff --git a/src/chart-sub/evaluate/academicReport/characterReport.vue b/src/chart-sub/evaluate/academicReport/characterReport.vue index 9bd853f..01ec6e0 100644 --- a/src/chart-sub/evaluate/academicReport/characterReport.vue +++ b/src/chart-sub/evaluate/academicReport/characterReport.vue @@ -38,7 +38,7 @@ - + @@ -46,7 +46,7 @@ import Navbar from '@/chart-sub/components/navbar/Navbar.vue' import CharacterChart from '../components/interestChart/CharacterChart.vue' import DependenciesChart from '../components/interestChart/DependenciesChart.vue' -import AiFooter from '../components/AiFooter.vue' +// import AiFooter from '../components/AiFooter.vue' import { getMBTIDimension } from '@/service' import { handleBack } from '../hooks/useEvaluateBack' diff --git a/src/chart-sub/evaluate/academicReport/interestReport.vue b/src/chart-sub/evaluate/academicReport/interestReport.vue index a47c5fa..3593147 100644 --- a/src/chart-sub/evaluate/academicReport/interestReport.vue +++ b/src/chart-sub/evaluate/academicReport/interestReport.vue @@ -25,7 +25,7 @@ - + @@ -35,7 +35,7 @@ import InterestRadar from '../components/interestChart/InterestRadar.vue' import { getHollandDimensionInfo } from '@/service' import InterestingThings from '../components/InterestingThings.vue' -import AiFooter from '../components/AiFooter.vue' +// import AiFooter from '../components/AiFooter.vue' import { handleBack } from '../hooks/useEvaluateBack' import Navbar from '@/chart-sub/components/navbar/Navbar.vue' diff --git a/src/chart-sub/evaluate/academicReport/opinionAboutReport.vue b/src/chart-sub/evaluate/academicReport/opinionAboutReport.vue index 006ebad..c69727d 100644 --- a/src/chart-sub/evaluate/academicReport/opinionAboutReport.vue +++ b/src/chart-sub/evaluate/academicReport/opinionAboutReport.vue @@ -31,7 +31,7 @@ - + @@ -39,7 +39,7 @@ import Navbar from '@/chart-sub/components/navbar/Navbar.vue' import OpinionChart from '../components/interestChart/OpinionChart.vue' import AbilityDimension from '../components/AbilityDimension.vue' -import AiFooter from '../components/AiFooter.vue' +// import AiFooter from '../components/AiFooter.vue' import { handleBack } from '../hooks/useEvaluateBack' import { getOpinionAbout } from '@/service' diff --git a/src/chart-sub/evaluate/psychologicalReport/sasReport.vue b/src/chart-sub/evaluate/psychologicalReport/sasReport.vue index 8996ccd..6340844 100644 --- a/src/chart-sub/evaluate/psychologicalReport/sasReport.vue +++ b/src/chart-sub/evaluate/psychologicalReport/sasReport.vue @@ -33,7 +33,7 @@ - + @@ -41,8 +41,8 @@ import Navbar from '@/chart-sub/components/navbar/Navbar.vue' import StatusCard from '../components/StatusCard.vue' import SuggestionCard from '../components/SuggestionCard.vue' -import AiFooter from '../components/AiFooter.vue' -import { getCustomScaleExplains } from '@/service' +// import AiFooter from '../components/AiFooter.vue' +// import { getCustomScaleExplains } from '@/service' import { handleBack } from '../hooks/useEvaluateBack' // #ifdef MP-WEIXIN diff --git a/src/chart-sub/evaluate/psychologicalReport/sdsReport.vue b/src/chart-sub/evaluate/psychologicalReport/sdsReport.vue index 3394569..14ef299 100644 --- a/src/chart-sub/evaluate/psychologicalReport/sdsReport.vue +++ b/src/chart-sub/evaluate/psychologicalReport/sdsReport.vue @@ -33,7 +33,7 @@ - + @@ -41,8 +41,8 @@ import Navbar from '@/chart-sub/components/navbar/Navbar.vue' import StatusCard from '../components/StatusCard.vue' import SuggestionCard from '../components/SuggestionCard.vue' -import { getCustomScaleExplains } from '@/service' -import AiFooter from '../components/AiFooter.vue' +// import { getCustomScaleExplains } from '@/service' +// import AiFooter from '../components/AiFooter.vue' import { handleBack } from '../hooks/useEvaluateBack' // #ifdef MP-WEIXIN diff --git a/src/chart-sub/evaluate/studyReport/LearnSkillReport.vue b/src/chart-sub/evaluate/studyReport/LearnSkillReport.vue index 65c9608..8f75b9a 100644 --- a/src/chart-sub/evaluate/studyReport/LearnSkillReport.vue +++ b/src/chart-sub/evaluate/studyReport/LearnSkillReport.vue @@ -38,7 +38,7 @@ - + @@ -46,8 +46,8 @@ import Navbar from '@/chart-sub/components/navbar/Navbar.vue' import StatusCard from '../components/StatusCard.vue' import LearnSkillSuggestion from '../components/LearnSkillSuggestion.vue' -import AiFooter from '../components/AiFooter.vue' -import { getCustomScaleExplains } from '@/service' +// import AiFooter from '../components/AiFooter.vue' +// import { getCustomScaleExplains } from '@/service' import { handleBack } from '../hooks/useEvaluateBack' // #ifdef MP-WEIXIN diff --git a/src/chart-sub/evaluate/studyReport/LearnStudyReport.vue b/src/chart-sub/evaluate/studyReport/LearnStudyReport.vue index 48fd801..3be355f 100644 --- a/src/chart-sub/evaluate/studyReport/LearnStudyReport.vue +++ b/src/chart-sub/evaluate/studyReport/LearnStudyReport.vue @@ -29,7 +29,7 @@ - + @@ -37,8 +37,8 @@ import Navbar from '@/chart-sub/components/navbar/Navbar.vue' import LearnStyleChart from '../components/studyChart/LearnStyleChart.vue' import LearnStudySuggestion from '../components/LearnStudySuggestion.vue' -import AiFooter from '../components/AiFooter.vue' -import { getCustomScaleExplains } from '@/service' +// import AiFooter from '../components/AiFooter.vue' +// import { getCustomScaleExplains } from '@/service' import { handleBack } from '../hooks/useEvaluateBack' // #ifdef MP-WEIXIN diff --git a/src/chart-sub/evaluate/studyReport/anxietyReport.vue b/src/chart-sub/evaluate/studyReport/anxietyReport.vue index 7a6eca0..f67108e 100644 --- a/src/chart-sub/evaluate/studyReport/anxietyReport.vue +++ b/src/chart-sub/evaluate/studyReport/anxietyReport.vue @@ -37,7 +37,7 @@ - + @@ -45,8 +45,8 @@ import Navbar from '@/chart-sub/components/navbar/Navbar.vue' import StatusCard from '../components/StatusCard.vue' import LearnSkillSuggestion from '../components/LearnSkillSuggestion.vue' -import AiFooter from '../components/AiFooter.vue' -import { getCustomScaleExplains } from '@/service' +// import AiFooter from '../components/AiFooter.vue' +// import { getCustomScaleExplains } from '@/service' import { handleBack } from '../hooks/useEvaluateBack' // #ifdef MP-WEIXIN diff --git a/src/http/http.ts b/src/http/http.ts index bdb37dc..ae65cff 100644 --- a/src/http/http.ts +++ b/src/http/http.ts @@ -97,6 +97,11 @@ export function http(options: CustomRequestOptions) { if (res.statusCode >= 200 && res.statusCode < 300) { // 处理业务逻辑错误 if (code !== ResultEnum.Success0 && code !== ResultEnum.Success200) { + uni.showToast({ + title: `${responseData?.message || '请联系管理员'}`, + icon: 'none', + mask: true + }) throw new Error(`请求错误[${code}]：${responseData.message || responseData.msg}`) } if (responseData.code !== 200) { diff --git a/src/http/interceptor.ts b/src/http/interceptor.ts index 2f2cda4..4d105e9 100644 --- a/src/http/interceptor.ts +++ b/src/http/interceptor.ts @@ -57,7 +57,6 @@ const httpInterceptor = { } else if (token) { options.header.Authorization = `Bearer ${token}` } - console.log(import.meta.env.VITE_WX_APPID) return options }, } diff --git a/src/pages-fg/login/login.vue b/src/pages-fg/login/login.vue index 0555cca..132ca31 100644 --- a/src/pages-fg/login/login.vue +++ b/src/pages-fg/login/login.vue @@ -181,4 +181,8 @@ async function getUserInfo(_code: string) { border-color: #fff !important; background-color: #fff !important; } + +button::after{ + border:none; +} diff --git a/src/pages-sub/about/fillCollection.vue b/src/pages-sub/about/fillCollection.vue new file mode 100644 index 0000000..2ac4566 --- /dev/null +++ b/src/pages-sub/about/fillCollection.vue @@ -0,0 +1,82 @@ + + + + + \ No newline at end of file diff --git a/src/pages-sub/about/onlineCustom.vue b/src/pages-sub/about/onlineCustom.vue index 08718cf..b2678fd 100644 --- a/src/pages-sub/about/onlineCustom.vue +++ b/src/pages-sub/about/onlineCustom.vue @@ -74,7 +74,7 @@ const handleBack = () => { 扫码添加客服企业微信 - + 领取中考专属资源包 领取全年学习规划，掌握备考节奏 优质学习交流群，考情同步，答疑互助 diff --git a/src/pages-sub/about/userInfo.vue b/src/pages-sub/about/userInfo.vue index 30877a3..e448a4f 100644 --- a/src/pages-sub/about/userInfo.vue +++ b/src/pages-sub/about/userInfo.vue @@ -163,7 +163,7 @@ onShow(() => { - + {{ getTitle(activeType) }} diff --git a/src/pages-sub/ai-service/index.vue b/src/pages-sub/ai-service/index.vue index a6ab87c..156d794 100644 --- a/src/pages-sub/ai-service/index.vue +++ b/src/pages-sub/ai-service/index.vue @@ -17,11 +17,11 @@ const tokenStore = useTokenStore() // chatv2.ycymedu.com const url = ref(``) -function handleChildMessage(event) { +function handleChildMessage(event:any) { console.log('子应用传递的消息', event) } -onLoad((options) => { +onLoad((options:any) => { getAssistant().then((res) => { if (res.code === 200) { const data = res.result as unknown as string diff --git a/src/pages-sub/components/read-more/index.vue b/src/pages-sub/components/read-more/index.vue index 5ad75be..8059dbf 100644 --- a/src/pages-sub/components/read-more/index.vue +++ b/src/pages-sub/components/read-more/index.vue @@ -33,7 +33,7 @@ const fullHtml = computed(() => formatParagraph(paragraphText.value))