From 0a3f6301eccb28b6a5d71c90ebde390dc2ef6475 Mon Sep 17 00:00:00 2001
From: xjs <xjs@ycymedu.com>
Date: Mon, 21 Apr 2025 15:59:18 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/aiService-sub/index/index.vue             |  3 +-
 .../academicReport/CapabilityReport.vue       |  5 +---
 .../academicReport/CharacterReport.vue        |  5 +---
 .../academicReport/InterestReport.vue         |  5 +---
 .../academicReport/opinionAboutReport.vue     |  5 +---
 .../components/studyChart/LearnStyleChart.vue |  2 +-
 .../evaluate/hooks/useEvaluateBack.ts         | 11 +++++++
 .../psychologicalReport/mhtReport.vue         |  5 +---
 .../psychologicalReport/sasReport.vue         |  5 +---
 .../psychologicalReport/sdsReport.vue         |  6 ++--
 .../evaluate/studyReport/LearnSkillReport.vue |  5 +---
 .../evaluate/studyReport/LearnStudyReport.vue |  6 +---
 .../evaluate/studyReport/anxietyReport.vue    |  5 +---
 src/pages-evaluation-sub/rank/index.vue       | 12 ++++++--
 src/pages-sub/home/autoFill/index.vue         | 11 +++----
 src/pages-sub/home/city/index.vue             |  9 +++++-
 .../college/components/EnrollmentMark.vue     |  2 +-
 .../college/components/EnrollmentPlan.vue     |  8 ++---
 src/pages-sub/home/college/index.vue          |  2 +-
 src/pages-sub/home/distinguish/index.vue      |  4 +--
 src/pages-sub/home/expand/index.vue           |  2 +-
 src/pages-sub/home/inputScore/index.vue       |  3 +-
 .../major/components/EmploymentProspects.vue  |  5 +++-
 .../home/major/components/MajorUniversity.vue | 10 ++++---
 .../home/styles/picker-view-btn.scss          |  4 +--
 .../components/ScrollListItemAction.vue       |  2 +-
 src/pages-sub/home/wishesList/index.vue       |  2 +-
 src/pages-sub/ucenter/star/myStar.vue         | 30 +++++++++----------
 src/pages-sub/ucenter/wishList/wishList.vue   | 20 +++++++++----
 .../evaluation/components/EvaluationItem.vue  |  2 +-
 src/pages/evaluation/index/index.vue          | 10 +++++--
 src/service/index/api.ts                      |  4 +--
 32 files changed, 114 insertions(+), 96 deletions(-)
 create mode 100644 src/pages-evaluation-sub/evaluate/hooks/useEvaluateBack.ts

diff --git a/src/aiService-sub/index/index.vue b/src/aiService-sub/index/index.vue
index b3806c7..c66691e 100644
--- a/src/aiService-sub/index/index.vue
+++ b/src/aiService-sub/index/index.vue
@@ -24,8 +24,9 @@ import { useUserStore } from '@/store'
 const userStore = useUserStore()
 
 //chat.ycymedu.com
+//chatv2.ycymedu.com
 const url = ref(
-  `https://chat.ycymedu.com?userId=${userStore.userInfo.estimatedAchievement.wxId}&subjectGroup=${userStore.userInfo.estimatedAchievement.subjectGroup}&expectedScore=${userStore.userInfo.estimatedAchievement.expectedScore}&provinceName=${userStore.userInfo.estimatedAchievement.provinceName}&token=${userStore.userInfo.token}`,
+  `https://chatv2.ycymedu.com?userId=${userStore.userInfo.estimatedAchievement.wxId}&subjectGroup=${userStore.userInfo.estimatedAchievement.subjectGroup}&expectedScore=${userStore.userInfo.estimatedAchievement.expectedScore}&provinceName=${userStore.userInfo.estimatedAchievement.provinceName}&token=${userStore.userInfo.token}`,
 )
 
 const handleChildMessage = (event) => {
diff --git a/src/pages-evaluation-sub/evaluate/academicReport/CapabilityReport.vue b/src/pages-evaluation-sub/evaluate/academicReport/CapabilityReport.vue
index bc86a59..f9a1043 100644
--- a/src/pages-evaluation-sub/evaluate/academicReport/CapabilityReport.vue
+++ b/src/pages-evaluation-sub/evaluate/academicReport/CapabilityReport.vue
@@ -43,16 +43,13 @@ import Navbar from '@/pages-evaluation-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 { handleBack } from '../hooks/useEvaluateBack'
 
 import { getAbilityDimension } from '@/service/index/api'
 
 const pageType = ref(0)
 const pageId = ref(0)
 
-const handleBack = () => {
-  uni.navigateBack()
-}
-
 const studyRecord = ref({
   description: '',
   title: '',
diff --git a/src/pages-evaluation-sub/evaluate/academicReport/CharacterReport.vue b/src/pages-evaluation-sub/evaluate/academicReport/CharacterReport.vue
index d0a90ee..fdd08f9 100644
--- a/src/pages-evaluation-sub/evaluate/academicReport/CharacterReport.vue
+++ b/src/pages-evaluation-sub/evaluate/academicReport/CharacterReport.vue
@@ -47,14 +47,11 @@ import CharacterChart from '../components/interestChart/CharacterChart.vue'
 import DependenciesChart from '../components/interestChart/DependenciesChart.vue'
 import AiFooter from '../components/AiFooter.vue'
 import { getMBTIDimension } from '@/service/index/api'
+import { handleBack } from '../hooks/useEvaluateBack'
 
 const pageType = ref(0)
 const pageId = ref(0)
 
-const handleBack = () => {
-  uni.navigateBack()
-}
-
 const studyRecord = ref({
   description: '',
   title: '',
diff --git a/src/pages-evaluation-sub/evaluate/academicReport/InterestReport.vue b/src/pages-evaluation-sub/evaluate/academicReport/InterestReport.vue
index 454e897..4c3968e 100644
--- a/src/pages-evaluation-sub/evaluate/academicReport/InterestReport.vue
+++ b/src/pages-evaluation-sub/evaluate/academicReport/InterestReport.vue
@@ -51,14 +51,11 @@ import IntroMajor from '../components/IntroMajor.vue'
 import { getHollandDimensionInfo } from '@/service/index/api'
 import InterestingThings from '../components/InterestingThings.vue'
 import AiFooter from '../components/AiFooter.vue'
+import { handleBack } from '../hooks/useEvaluateBack'
 
 const pageType = ref(0)
 const pageId = ref(0)
 
-const handleBack = () => {
-  uni.navigateBack()
-}
-
 const studyRecord = ref({ description: '', title: '', picCharts: {}, reportItems: [], hTag: '' })
 
 onLoad((options) => {
diff --git a/src/pages-evaluation-sub/evaluate/academicReport/opinionAboutReport.vue b/src/pages-evaluation-sub/evaluate/academicReport/opinionAboutReport.vue
index fd78c26..8f59c06 100644
--- a/src/pages-evaluation-sub/evaluate/academicReport/opinionAboutReport.vue
+++ b/src/pages-evaluation-sub/evaluate/academicReport/opinionAboutReport.vue
@@ -39,16 +39,13 @@ import Navbar from '@/pages-evaluation-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 { handleBack } from '../hooks/useEvaluateBack'
 
 import { getOpinionAbout } from '@/service/index/api'
 
 const pageType = ref(0)
 const pageId = ref(0)
 
-const handleBack = () => {
-  uni.navigateBack()
-}
-
 const studyRecord = ref({
   description: '',
   title: '',
diff --git a/src/pages-evaluation-sub/evaluate/components/studyChart/LearnStyleChart.vue b/src/pages-evaluation-sub/evaluate/components/studyChart/LearnStyleChart.vue
index 16d6bee..54b30b3 100644
--- a/src/pages-evaluation-sub/evaluate/components/studyChart/LearnStyleChart.vue
+++ b/src/pages-evaluation-sub/evaluate/components/studyChart/LearnStyleChart.vue
@@ -76,7 +76,7 @@ watch(
         const option = {
           radar: {
             center: ['50%', '50%'],
-            radius: '65%',
+            radius: '60%',
             indicator: newData.map((item: any) => ({
               name: `${item.type},${item.desc}`,
             })),
diff --git a/src/pages-evaluation-sub/evaluate/hooks/useEvaluateBack.ts b/src/pages-evaluation-sub/evaluate/hooks/useEvaluateBack.ts
new file mode 100644
index 0000000..eb72b71
--- /dev/null
+++ b/src/pages-evaluation-sub/evaluate/hooks/useEvaluateBack.ts
@@ -0,0 +1,11 @@
+export const handleBack = () => {
+  const pages = getCurrentPages()
+  if (
+    pages.length > 1 &&
+    pages[pages.length - 1].route === 'pages-sub/ucenter/evaluate/evaluateList'
+  ) {
+    uni.navigateBack()
+  } else {
+    uni.switchTab({ url: '/pages/evaluation/index/index' })
+  }
+}
diff --git a/src/pages-evaluation-sub/evaluate/psychologicalReport/mhtReport.vue b/src/pages-evaluation-sub/evaluate/psychologicalReport/mhtReport.vue
index 59d6c41..7058580 100644
--- a/src/pages-evaluation-sub/evaluate/psychologicalReport/mhtReport.vue
+++ b/src/pages-evaluation-sub/evaluate/psychologicalReport/mhtReport.vue
@@ -31,16 +31,13 @@
 <script setup lang="ts">
 import Navbar from '@/pages-evaluation-sub/components/navbar/Navbar.vue'
 import StatusCard from '../components/StatusCard.vue'
+import { handleBack } from '../hooks/useEvaluateBack'
 
 import { getCustomScaleExplains } from '@/service/index/api'
 
 const pageType = ref(0)
 const pageId = ref(0)
 
-const handleBack = () => {
-  uni.navigateBack()
-}
-
 const studyRecord = ref({
   description: '',
   title: '',
diff --git a/src/pages-evaluation-sub/evaluate/psychologicalReport/sasReport.vue b/src/pages-evaluation-sub/evaluate/psychologicalReport/sasReport.vue
index 001e7a8..822d992 100644
--- a/src/pages-evaluation-sub/evaluate/psychologicalReport/sasReport.vue
+++ b/src/pages-evaluation-sub/evaluate/psychologicalReport/sasReport.vue
@@ -47,6 +47,7 @@ import StatusCard from '../components/StatusCard.vue'
 import SuggestionCard from '../components/SuggestionCard.vue'
 import AiFooter from '../components/AiFooter.vue'
 import { getCustomScaleExplains } from '@/service/index/api'
+import { handleBack } from '../hooks/useEvaluateBack'
 
 const pageType = ref(0)
 const pageId = ref(0)
@@ -76,10 +77,6 @@ const anxietyRules = [
 const score = ref(0)
 const level = ref(0)
 
-const handleBack = () => {
-  uni.navigateBack()
-}
-
 const studyRecord = ref({
   description: '',
   title: '',
diff --git a/src/pages-evaluation-sub/evaluate/psychologicalReport/sdsReport.vue b/src/pages-evaluation-sub/evaluate/psychologicalReport/sdsReport.vue
index cf9330a..384462a 100644
--- a/src/pages-evaluation-sub/evaluate/psychologicalReport/sdsReport.vue
+++ b/src/pages-evaluation-sub/evaluate/psychologicalReport/sdsReport.vue
@@ -47,6 +47,8 @@ import StatusCard from '../components/StatusCard.vue'
 import SuggestionCard from '../components/SuggestionCard.vue'
 import { getCustomScaleExplains } from '@/service/index/api'
 import AiFooter from '../components/AiFooter.vue'
+import { handleBack } from '../hooks/useEvaluateBack'
+
 const pageType = ref(0)
 const pageId = ref(0)
 
@@ -74,10 +76,6 @@ const depressionRules = [
   },
 ]
 
-const handleBack = () => {
-  uni.navigateBack()
-}
-
 const studyRecord = ref({
   description: '',
   title: '',
diff --git a/src/pages-evaluation-sub/evaluate/studyReport/LearnSkillReport.vue b/src/pages-evaluation-sub/evaluate/studyReport/LearnSkillReport.vue
index e05a117..5cdf566 100644
--- a/src/pages-evaluation-sub/evaluate/studyReport/LearnSkillReport.vue
+++ b/src/pages-evaluation-sub/evaluate/studyReport/LearnSkillReport.vue
@@ -52,6 +52,7 @@ import StatusCard from '../components/StatusCard.vue'
 import LearnSkillSuggestion from '../components/LearnSkillSuggestion.vue'
 import AiFooter from '../components/AiFooter.vue'
 import { getCustomScaleExplains } from '@/service/index/api'
+import { handleBack } from '../hooks/useEvaluateBack'
 
 const pageType = ref(0)
 const pageId = ref(0)
@@ -86,10 +87,6 @@ const anxietyRules = [
 const score = ref(0)
 const level = ref(0)
 
-const handleBack = () => {
-  uni.navigateBack()
-}
-
 const studyRecord = ref({
   description: '',
   title: '',
diff --git a/src/pages-evaluation-sub/evaluate/studyReport/LearnStudyReport.vue b/src/pages-evaluation-sub/evaluate/studyReport/LearnStudyReport.vue
index 3b922b9..abbfcea 100644
--- a/src/pages-evaluation-sub/evaluate/studyReport/LearnStudyReport.vue
+++ b/src/pages-evaluation-sub/evaluate/studyReport/LearnStudyReport.vue
@@ -45,14 +45,11 @@ import LearnStyleChart from '../components/studyChart/LearnStyleChart.vue'
 import LearnStudySuggestion from '../components/LearnStudySuggestion.vue'
 import AiFooter from '../components/AiFooter.vue'
 import { getCustomScaleExplains } from '@/service/index/api'
+import { handleBack } from '../hooks/useEvaluateBack'
 
 const pageType = ref(0)
 const pageId = ref(0)
 
-const handleBack = () => {
-  uni.navigateBack()
-}
-
 const studyRecord = ref({
   description: '',
   title: '',
@@ -81,7 +78,6 @@ onLoad((options) => {
       chartData.value = JSON.parse(studyRecord.value.result)
       parsing.value = studyRecord.value.suggestions
       suggestions.value = JSON.parse(studyRecord.value.description)
-      console.log(suggestions.value)
     }
   })
 })
diff --git a/src/pages-evaluation-sub/evaluate/studyReport/anxietyReport.vue b/src/pages-evaluation-sub/evaluate/studyReport/anxietyReport.vue
index fd4836d..fab7dcd 100644
--- a/src/pages-evaluation-sub/evaluate/studyReport/anxietyReport.vue
+++ b/src/pages-evaluation-sub/evaluate/studyReport/anxietyReport.vue
@@ -52,6 +52,7 @@ import StatusCard from '../components/StatusCard.vue'
 import LearnSkillSuggestion from '../components/LearnSkillSuggestion.vue'
 import AiFooter from '../components/AiFooter.vue'
 import { getCustomScaleExplains } from '@/service/index/api'
+import { handleBack } from '../hooks/useEvaluateBack'
 
 const pageType = ref(0)
 const pageId = ref(0)
@@ -76,10 +77,6 @@ const anxietyRules = [
 const score = ref(0)
 const level = ref(0)
 
-const handleBack = () => {
-  uni.navigateBack()
-}
-
 const studyRecord = ref({
   description: '',
   title: '',
diff --git a/src/pages-evaluation-sub/rank/index.vue b/src/pages-evaluation-sub/rank/index.vue
index 4d86f26..a814e6b 100644
--- a/src/pages-evaluation-sub/rank/index.vue
+++ b/src/pages-evaluation-sub/rank/index.vue
@@ -82,14 +82,22 @@
     </view>
     <view class="">
       <LEchart ref="echart" class="h-[300rpx]" v-show="!noData"></LEchart>
-      <view class="flex items-center justify-center flex-col my-[80rpx] relative" v-show="noData">
+      <view class="flex flex-col items-center justify-center mt-[40%]" v-show="noData">
+        <image
+          src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJYAAACWCAMAAAAL34HQAAALeGlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNi4wLWMwMDIgNzkuMTY0NDg4LCAyMDIwLzA3LzEwLTIyOjA2OjUzICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0RXZ0PSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VFdmVudCMiIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczpwaG90b3Nob3A9Imh0dHA6Ly9ucy5hZG9iZS5jb20vcGhvdG9zaG9wLzEuMC8iIHhtbG5zOnRpZmY9Imh0dHA6Ly9ucy5hZG9iZS5jb20vdGlmZi8xLjAvIiB4bWxuczpleGlmPSJodHRwOi8vbnMuYWRvYmUuY29tL2V4aWYvMS4wLyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiIHhtcDpDcmVhdGVEYXRlPSIyMDIyLTAyLTIyVDIxOjIxOjQ1KzA4OjAwIiB4bXA6TWV0YWRhdGFEYXRlPSIyMDI0LTAxLTEzVDE5OjA5OjQwKzA4OjAwIiB4bXA6TW9kaWZ5RGF0ZT0iMjAyNC0wMS0xM1QxOTowOTo0MCswODowMCIgZGM6Zm9ybWF0PSJpbWFnZS9wbmciIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6ZWQwMWYzNWQtOWRjOC00MDBiLWEyMmQtNjM5OGZiNzVhNGRiIiB4bXBNTTpEb2N1bWVudElEPSJhZG9iZTpkb2NpZDpwaG90b3Nob3A6ZDhlMzQ3ZmEtMDY2My1jYTRiLTgzNTctNTk4YjBkNGIzOTU2IiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InhtcC5kaWQ6ZDA4MDI4MDItMzUyYS04NTRhLTkxYjctNmRlNmQ1MmViM2QwIiBwaG90b3Nob3A6Q29sb3JNb2RlPSIzIiBwaG90b3Nob3A6SUNDUHJvZmlsZT0ic1JHQiBJRUM2MTk2Ni0yLjEiIHRpZmY6T3JpZW50YXRpb249IjEiIHRpZmY6WFJlc29sdXRpb249IjMwMDAwMDAvMTAwMDAiIHRpZmY6WVJlc29sdXRpb249IjMwMDAwMDAvMTAwMDAiIHRpZmY6UmVzb2x1dGlvblVuaXQ9IjIiIGV4aWY6Q29sb3JTcGFjZT0iMSIgZXhpZjpQaXhlbFhEaW1lbnNpb249IjMwMCIgZXhpZjpQaXhlbFlEaW1lbnNpb249IjMwMCI+IDx4bXBNTTpIaXN0b3J5PiA8cmRmOlNlcT4gPHJkZjpsaSBzdEV2dDphY3Rpb249ImNyZWF0ZWQiIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6ZDA4MDI4MDItMzUyYS04NTRhLTkxYjctNmRlNmQ1MmViM2QwIiBzdEV2dDp3aGVuPSIyMDIyLTAyLTIyVDIxOjIxOjQ1KzA4OjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249InNhdmVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOjQwNjg2NzJkLWY5NDMtOTU0Mi1iMDBiLTVlMDExNmE1NmIzZSIgc3RFdnQ6d2hlbj0iMjAyNC0wMS0xM1QxMDoyNjoxNiswODowMCIgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTkgKFdpbmRvd3MpIiBzdEV2dDpjaGFuZ2VkPSIvIi8+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJzYXZlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDphYmJkZmUyZC0xY2Q2LTJiNDgtYjUyNS05YzlhZjdlNjA4NDMiIHN0RXZ0OndoZW49IjIwMjQtMDEtMTNUMTE6MjM6NDArMDg6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE5IChXaW5kb3dzKSIgc3RFdnQ6Y2hhbmdlZD0iLyIvPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0iY29udmVydGVkIiBzdEV2dDpwYXJhbWV0ZXJzPSJmcm9tIGFwcGxpY2F0aW9uL3ZuZC5hZG9iZS5waG90b3Nob3AgdG8gaW1hZ2UvcG5nIi8+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJkZXJpdmVkIiBzdEV2dDpwYXJhbWV0ZXJzPSJjb252ZXJ0ZWQgZnJvbSBhcHBsaWNhdGlvbi92bmQuYWRvYmUucGhvdG9zaG9wIHRvIGltYWdlL3BuZyIvPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0ic2F2ZWQiIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6YTQ5MjM5MDAtNDhiZC03YTQ1LWI4NGItYmVlZTVjOWUxYTM1IiBzdEV2dDp3aGVuPSIyMDI0LTAxLTEzVDExOjIzOjQwKzA4OjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiIHN0RXZ0OmNoYW5nZWQ9Ii8iLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249InNhdmVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOmVkMDFmMzVkLTlkYzgtNDAwYi1hMjJkLTYzOThmYjc1YTRkYiIgc3RFdnQ6d2hlbj0iMjAyNC0wMS0xM1QxOTowOTo0MCswODowMCIgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWRvYmUgUGhvdG9zaG9wIDIyLjAgKE1hY2ludG9zaCkiIHN0RXZ0OmNoYW5nZWQ9Ii8iLz4gPC9yZGY6U2VxPiA8L3htcE1NOkhpc3Rvcnk+IDx4bXBNTTpEZXJpdmVkRnJvbSBz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"
+          mode="scaleToFill"
+          class="w-[240rpx] h-[240rpx]"
+        />
+        <text>暂无数据</text>
+      </view>
+      <!-- <view class="flex items-center justify-center flex-col my-[80rpx] relative" v-show="noData">
         <image
           src="https://api.static.ycymedu.com/evaluation/sub/no-data.jpg"
           mode="scaleToFill"
           class="w-[300rpx] h-[300rpx]"
         />
         <text class="text-[24rpx] text-[#636363] absolute bottom-[60rpx]">暂无数据</text>
-      </view>
+      </view> -->
     </view>
 
     <view class="flex flex-col p-[24rpx] bg-[#FEF0F0] text-[#F56C6C] mx-[32rpx] border-class">
diff --git a/src/pages-sub/home/autoFill/index.vue b/src/pages-sub/home/autoFill/index.vue
index 4d2f633..0ae5891 100644
--- a/src/pages-sub/home/autoFill/index.vue
+++ b/src/pages-sub/home/autoFill/index.vue
@@ -69,11 +69,6 @@ const userStore = useUserStore()
 const show = ref(false)
 const badgeValue = ref(1)
 
-const close = () => {
-  filterMenuRef.value.clearForm()
-  show.value = false
-}
-
 const filterMenuRef = ref()
 
 const handleChange = (params) => {
@@ -117,6 +112,12 @@ const handleResult = () => {
     }
   })
 }
+
+const close = () => {
+  filterMenuRef.value.clearForm()
+  badgeValue.value = 1
+  show.value = false
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/pages-sub/home/city/index.vue b/src/pages-sub/home/city/index.vue
index 8e00182..079aab0 100644
--- a/src/pages-sub/home/city/index.vue
+++ b/src/pages-sub/home/city/index.vue
@@ -64,7 +64,14 @@ const getUserLocation = () => {
           cities.map((item) => {
             item.provinces.map((city) => {
               if (city.code === _locationCode) {
-                chooseCity(city)
+                userStore.setUserCity(city)
+                if (
+                  userStore.userInfo.estimatedAchievement.provinceCode &&
+                  userStore.userInfo.estimatedAchievement.provinceCode !== city.code
+                ) {
+                  userStore.clearUserEstimatedAchievement()
+                  // userStore.setEstimatedAchievement({ provinceName: city.provincename, provinceCode: city.code })
+                }
               }
             })
           })
diff --git a/src/pages-sub/home/college/components/EnrollmentMark.vue b/src/pages-sub/home/college/components/EnrollmentMark.vue
index 284c9f7..84691cc 100644
--- a/src/pages-sub/home/college/components/EnrollmentMark.vue
+++ b/src/pages-sub/home/college/components/EnrollmentMark.vue
@@ -33,7 +33,7 @@
       <view class="px-[32rpx]">
         <CustomPickerView :list="pickList" v-model:modelValue="pickValue" />
       </view>
-      <view class="flex items-center justify-between px-[32rpx]">
+      <view class="flex items-center justify-between px-[32rpx] gap-[20rpx]">
         <view class="cancel-btn" @click="show = false">取消</view>
         <view class="submit-btn" @click="handleConfirm">确认</view>
       </view>
diff --git a/src/pages-sub/home/college/components/EnrollmentPlan.vue b/src/pages-sub/home/college/components/EnrollmentPlan.vue
index 241a200..971d798 100644
--- a/src/pages-sub/home/college/components/EnrollmentPlan.vue
+++ b/src/pages-sub/home/college/components/EnrollmentPlan.vue
@@ -15,7 +15,7 @@
       <view
         @click="handleShow(2)"
         class="px-[24rpx] py-[8rpx] bg-[#f8f8f8] rounded-[8rpx] flex justify-between items-center text-[24rpx]"
-        v-show="batche"
+        v-show="batches.length > 0"
       >
         {{ batche }}
         <view class="i-carbon-chevron-down rotate-270"></view>
@@ -37,7 +37,7 @@
         <CustomPickerView :list="pickList" v-model:modelValue="pickValue" />
       </view>
       <template #footer>
-        <view class="flex items-center justify-between px-[32rpx] gap-[32rpx]">
+        <view class="flex items-center justify-between px-[32rpx] gap-[20rpx]">
           <view class="cancel-btn" @click="show = false">取消</view>
           <view class="submit-btn" @click="handleConfirm">确认</view>
         </view>
@@ -126,9 +126,9 @@ const getPlanProListData = async (newVal) => {
 
 const handleConfirm = () => {
   if (pickType === 1) {
-    year.value = pickValue.value
+    year.value = pickValue.value ? pickValue.value : yearList.value[0]
   } else if (pickType === 2) {
-    batche.value = pickValue.value
+    batche.value = pickValue.value ? pickValue.value : batches.value[0]
   }
   show.value = false
   getPlanProListData(props.id)
diff --git a/src/pages-sub/home/college/index.vue b/src/pages-sub/home/college/index.vue
index 2399c2c..69f7ffc 100644
--- a/src/pages-sub/home/college/index.vue
+++ b/src/pages-sub/home/college/index.vue
@@ -66,7 +66,7 @@
                 @change="handleUniTypeIdChange"
                 class="custom-check-group"
               />
-              <view class="flex items-center justify-between px-[16rpx] pb-[32rpx]">
+              <view class="flex items-center justify-between px-[32rpx] pb-[32rpx] gap-[20rpx]">
                 <view class="cancel-btn" @click="handleClear(index)">清空</view>
                 <view class="submit-btn" @click="handleCheck">查看</view>
               </view>
diff --git a/src/pages-sub/home/distinguish/index.vue b/src/pages-sub/home/distinguish/index.vue
index 1ee8265..df8281e 100644
--- a/src/pages-sub/home/distinguish/index.vue
+++ b/src/pages-sub/home/distinguish/index.vue
@@ -50,7 +50,7 @@
         <view
           class="flex items-center justify-between bg-[#F7F7F7] text-[24rpx] text-[#333] font-semibold border-header sticky top-0"
         >
-          <view class="flex items-center py-[16rpx] pl-[42rpx] w-[37%] border-right">
+          <view class="flex items-center py-[16rpx] pl-[22rpx] w-[37%] border-right">
             <text>院校名称</text>
           </view>
           <view class="flex items-center justify-center py-[16rpx] w-[35%] border-right">
@@ -67,7 +67,7 @@
             v-for="(item, index) in tableData"
             :key="index"
           >
-            <view class="flex items-center py-[16rpx] pl-[42rpx] w-[37%] border-right">
+            <view class="flex items-center py-[16rpx] pl-[22rpx] w-[37%] border-right">
               <text>{{ item.universityName }}</text>
             </view>
             <view class="flex items-center justify-center py-[16rpx] w-[35%] border-right h-full">
diff --git a/src/pages-sub/home/expand/index.vue b/src/pages-sub/home/expand/index.vue
index da1fc99..092c5bd 100644
--- a/src/pages-sub/home/expand/index.vue
+++ b/src/pages-sub/home/expand/index.vue
@@ -58,7 +58,7 @@
             class="custom-check-group"
             v-if="item.id === 3"
           />
-          <view class="flex items-center justify-between px-[16rpx] pb-[32rpx]">
+          <view class="flex items-center justify-between px-[32rpx] pb-[32rpx] gap-[20rpx]">
             <view class="cancel-btn" @click="handleClear(index)">清空</view>
             <view class="submit-btn" @click="handleCheck">查看</view>
           </view>
diff --git a/src/pages-sub/home/inputScore/index.vue b/src/pages-sub/home/inputScore/index.vue
index db14406..d8b8df3 100644
--- a/src/pages-sub/home/inputScore/index.vue
+++ b/src/pages-sub/home/inputScore/index.vue
@@ -109,7 +109,7 @@
           label-key="name"
         />
       </view>
-      <view class="flex items-center justify-between px-[32rpx]">
+      <view class="flex items-center justify-between px-[32rpx] gap-[20rpx]">
         <view class="cancel-btn" @click="show = false">取消</view>
         <view class="submit-btn" @click="handleConfirm">确认</view>
       </view>
@@ -191,6 +191,7 @@ const saveScore = () => {
   if (score.value === '') {
     uni.showToast({
       title: '请检查分数',
+      icon: 'none',
     })
     return
   }
diff --git a/src/pages-sub/home/major/components/EmploymentProspects.vue b/src/pages-sub/home/major/components/EmploymentProspects.vue
index 4b425b0..13bb7f7 100644
--- a/src/pages-sub/home/major/components/EmploymentProspects.vue
+++ b/src/pages-sub/home/major/components/EmploymentProspects.vue
@@ -45,7 +45,10 @@
   </view>
 
   <ActionSheet v-model:show="show" :title="title" :show-close="true">
-    <view class="mx-[32rpx] mt-[32rpx] text-[24rpx] text-[#636363]" v-show="showType !== 3">
+    <view
+      class="mx-[32rpx] mt-[32rpx] text-[24rpx] text-[#636363] line-height-[1.6]"
+      v-show="showType !== 3"
+    >
       {{ innerContent }}
     </view>
   </ActionSheet>
diff --git a/src/pages-sub/home/major/components/MajorUniversity.vue b/src/pages-sub/home/major/components/MajorUniversity.vue
index 205b40a..aad0d5e 100644
--- a/src/pages-sub/home/major/components/MajorUniversity.vue
+++ b/src/pages-sub/home/major/components/MajorUniversity.vue
@@ -38,7 +38,7 @@
           :key="item"
         >
           <image class="w-[112rpx] h-[112rpx]" :src="item.logo" mode="scaleToFill" />
-          <view class="flex flex-col">
+          <view class="flex flex-col flex-1">
             <text class="text-[32rpx] font-semibold">[{{ item.yxdm }}]{{ item.yxmc }}</text>
             <text class="text-[22rpx] text-[#505050]">{{ item.cityname }}·{{ item.ulevel }}</text>
             <text class="text-[#8F959E] text-[22rpx] my-[6rpx]">
@@ -58,7 +58,7 @@
           label-key="ssmc"
         />
       </view>
-      <view class="flex items-center justify-between px-[32rpx]">
+      <view class="flex items-center justify-between px-[32rpx] gap-[20rpx]">
         <view class="cancel-btn" @click="show = false">取消</view>
         <view class="submit-btn" @click="handleConfirm">确认</view>
       </view>
@@ -92,10 +92,9 @@ watch(
           ssdmList: { ssmc: string; code: string; count: number }[]
         }
         provinceList.value = result.ssdmList.filter((item) => {
+          provinceTotal.value += item.count
           if (item.code) {
             return item
-          } else {
-            provinceTotal.value = item.count
           }
         })
         universityList.value = result.schSpecList
@@ -120,6 +119,9 @@ const handleShow = () => {
 }
 const handleConfirm = () => {
   show.value = false
+  if (!provinceCode.value) {
+    provinceCode.value = provinceList.value[0].code
+  }
   subUniversityList.value = universityList.value.filter((item) => {
     return item.ssdm === provinceCode.value
   })
diff --git a/src/pages-sub/home/styles/picker-view-btn.scss b/src/pages-sub/home/styles/picker-view-btn.scss
index 7f9b16e..0a5aa06 100644
--- a/src/pages-sub/home/styles/picker-view-btn.scss
+++ b/src/pages-sub/home/styles/picker-view-btn.scss
@@ -1,5 +1,5 @@
 .submit-btn {
-  width: 332rpx;
+  width: 100%;
   height: 80rpx;
   background: #1580ff;
   border-radius: 8rpx;
@@ -13,7 +13,7 @@
 }
 
 .cancel-btn {
-  width: 332rpx;
+  width: 100%;
   height: 80rpx;
   background: #f5f5f5;
   border-radius: 8rpx;
diff --git a/src/pages-sub/home/wishesList/components/ScrollListItemAction.vue b/src/pages-sub/home/wishesList/components/ScrollListItemAction.vue
index daaf587..d5f2bab 100644
--- a/src/pages-sub/home/wishesList/components/ScrollListItemAction.vue
+++ b/src/pages-sub/home/wishesList/components/ScrollListItemAction.vue
@@ -21,7 +21,7 @@
     <CollegeMajor :college="college" v-bind="$attrs" v-if="college" />
 
     <template #footer>
-      <view class="flex items-center justify-between mx-[32rpx] gap-[22rpx] pt-[16rpx]">
+      <view class="flex items-center justify-between mx-[32rpx] gap-[20rpx] pt-[16rpx]">
         <view class="cancel-btn" @click="handleConfirm">取消</view>
         <view class="submit-btn" @click="handleConfirm">确认</view>
       </view>
diff --git a/src/pages-sub/home/wishesList/index.vue b/src/pages-sub/home/wishesList/index.vue
index 3327de5..19442d2 100644
--- a/src/pages-sub/home/wishesList/index.vue
+++ b/src/pages-sub/home/wishesList/index.vue
@@ -115,7 +115,7 @@
       @change="handleTypeModelChange"
     />
     <template #footer>
-      <view class="flex items-center justify-between mx-[32rpx] gap-[22rpx]">
+      <view class="flex items-center justify-between mx-[32rpx] gap-[20rpx]">
         <view class="cancel-btn" @click="show = false">取消</view>
         <view class="submit-btn" @click="handleConfirm">确认</view>
       </view>
diff --git a/src/pages-sub/ucenter/star/myStar.vue b/src/pages-sub/ucenter/star/myStar.vue
index 816cac5..6d7edf4 100644
--- a/src/pages-sub/ucenter/star/myStar.vue
+++ b/src/pages-sub/ucenter/star/myStar.vue
@@ -37,24 +37,22 @@
     >
       <view class="flex gap-[24rpx] py-[40rpx] border-bt" v-if="currentTab === 0">
         <image class="w-[112rpx] h-[112rpx]" :src="item.logo" mode="scaleToFill" />
-        <view class="flex justify-between items-center flex-1">
-          <view class="flex flex-col" hover-class="none">
-            <text class="text-[28rpx] text-[#333] font-semibold mb-[6rpx]">
-              {{ item.name }}
-            </text>
-            <view class="flex items-center gap-[8rpx] mb-[16rpx]">
-              <view
-                class="truncate max-w-[176rpx] bg-[#f8f8f8] rounded-[4rpx] text-[20rpx] px-[8rpx] py-[2rpx]"
-                v-for="(fea, fIndex) in item.features.slice(0, 5)"
-                :key="fIndex"
-              >
-                {{ fea }}
-              </view>
+        <view class="flex flex-col flex-1">
+          <text class="text-[28rpx] text-[#333] font-semibold mb-[6rpx]">
+            {{ item.name }}
+          </text>
+          <view class="flex items-center gap-[8rpx] mb-[16rpx]">
+            <view
+              class="truncate max-w-[136rpx] bg-[#f8f8f8] rounded-[4rpx] text-[20rpx] px-[8rpx] py-[2rpx]"
+              v-for="(fea, fIndex) in item.features.slice(0, 5)"
+              :key="fIndex"
+            >
+              {{ fea }}
             </view>
-            <text class="text-[22rpx] text-[#999] font-normal">
-              {{ item.cityName }}.{{ item.nature }}
-            </text>
           </view>
+          <text class="text-[22rpx] text-[#999] font-normal">
+            {{ item.cityName }}.{{ item.nature }}
+          </text>
         </view>
         <button class="collect-btn" plain @click.stop="handleStar(item)">
           <view class="i-carbon-star-filled text-[#FFB032]" v-if="item.isStar"></view>
diff --git a/src/pages-sub/ucenter/wishList/wishList.vue b/src/pages-sub/ucenter/wishList/wishList.vue
index 4ab10af..3ac0909 100644
--- a/src/pages-sub/ucenter/wishList/wishList.vue
+++ b/src/pages-sub/ucenter/wishList/wishList.vue
@@ -36,6 +36,14 @@
         </view>
       </view>
     </view>
+    <view class="flex flex-col items-center justify-center mt-[40%]" v-if="wishList.length === 0">
+      <image
+        src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJYAAACWCAMAAAAL34HQAAALeGlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNi4wLWMwMDIgNzkuMTY0NDg4LCAyMDIwLzA3LzEwLTIyOjA2OjUzICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0RXZ0PSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VFdmVudCMiIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczpwaG90b3Nob3A9Imh0dHA6Ly9ucy5hZG9iZS5jb20vcGhvdG9zaG9wLzEuMC8iIHhtbG5zOnRpZmY9Imh0dHA6Ly9ucy5hZG9iZS5jb20vdGlmZi8xLjAvIiB4bWxuczpleGlmPSJodHRwOi8vbnMuYWRvYmUuY29tL2V4aWYvMS4wLyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiIHhtcDpDcmVhdGVEYXRlPSIyMDIyLTAyLTIyVDIxOjIxOjQ1KzA4OjAwIiB4bXA6TWV0YWRhdGFEYXRlPSIyMDI0LTAxLTEzVDE5OjA5OjQwKzA4OjAwIiB4bXA6TW9kaWZ5RGF0ZT0iMjAyNC0wMS0xM1QxOTowOTo0MCswODowMCIgZGM6Zm9ybWF0PSJpbWFnZS9wbmciIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6ZWQwMWYzNWQtOWRjOC00MDBiLWEyMmQtNjM5OGZiNzVhNGRiIiB4bXBNTTpEb2N1bWVudElEPSJhZG9iZTpkb2NpZDpwaG90b3Nob3A6ZDhlMzQ3ZmEtMDY2My1jYTRiLTgzNTctNTk4YjBkNGIzOTU2IiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InhtcC5kaWQ6ZDA4MDI4MDItMzUyYS04NTRhLTkxYjctNmRlNmQ1MmViM2QwIiBwaG90b3Nob3A6Q29sb3JNb2RlPSIzIiBwaG90b3Nob3A6SUNDUHJvZmlsZT0ic1JHQiBJRUM2MTk2Ni0yLjEiIHRpZmY6T3JpZW50YXRpb249IjEiIHRpZmY6WFJlc29sdXRpb249IjMwMDAwMDAvMTAwMDAiIHRpZmY6WVJlc29sdXRpb249IjMwMDAwMDAvMTAwMDAiIHRpZmY6UmVzb2x1dGlvblVuaXQ9IjIiIGV4aWY6Q29sb3JTcGFjZT0iMSIgZXhpZjpQaXhlbFhEaW1lbnNpb249IjMwMCIgZXhpZjpQaXhlbFlEaW1lbnNpb249IjMwMCI+IDx4bXBNTTpIaXN0b3J5PiA8cmRmOlNlcT4gPHJkZjpsaSBzdEV2dDphY3Rpb249ImNyZWF0ZWQiIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6ZDA4MDI4MDItMzUyYS04NTRhLTkxYjctNmRlNmQ1MmViM2QwIiBzdEV2dDp3aGVuPSIyMDIyLTAyLTIyVDIxOjIxOjQ1KzA4OjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249InNhdmVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOjQwNjg2NzJkLWY5NDMtOTU0Mi1iMDBiLTVlMDExNmE1NmIzZSIgc3RFdnQ6d2hlbj0iMjAyNC0wMS0xM1QxMDoyNjoxNiswODowMCIgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTkgKFdpbmRvd3MpIiBzdEV2dDpjaGFuZ2VkPSIvIi8+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJzYXZlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDphYmJkZmUyZC0xY2Q2LTJiNDgtYjUyNS05YzlhZjdlNjA4NDMiIHN0RXZ0OndoZW49IjIwMjQtMDEtMTNUMTE6MjM6NDArMDg6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE5IChXaW5kb3dzKSIgc3RFdnQ6Y2hhbmdlZD0iLyIvPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0iY29udmVydGVkIiBzdEV2dDpwYXJhbWV0ZXJzPSJmcm9tIGFwcGxpY2F0aW9uL3ZuZC5hZG9iZS5waG90b3Nob3AgdG8gaW1hZ2UvcG5nIi8+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJkZXJpdmVkIiBzdEV2dDpwYXJhbWV0ZXJzPSJjb252ZXJ0ZWQgZnJvbSBhcHBsaWNhdGlvbi92bmQuYWRvYmUucGhvdG9zaG9wIHRvIGltYWdlL3BuZyIvPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0ic2F2ZWQiIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6YTQ5MjM5MDAtNDhiZC03YTQ1LWI4NGItYmVlZTVjOWUxYTM1IiBzdEV2dDp3aGVuPSIyMDI0LTAxLTEzVDExOjIzOjQwKzA4OjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiIHN0RXZ0OmNoYW5nZWQ9Ii8iLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249InNhdmVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOmVkMDFmMzVkLTlkYzgtNDAwYi1hMjJkLTYzOThmYjc1YTRkYiIgc3RFdnQ6d2hlbj0iMjAyNC0wMS0xM1QxOTowOTo0MCswODowMCIgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWRvYmUgUGhvdG9zaG9wIDIyLjAgKE1hY2ludG9zaCkiIHN0RXZ0OmNoYW5nZWQ9Ii8iLz4gPC9yZGY6U2VxPiA8L3htcE1NOkhpc3Rvcnk+IDx4bXBNTTpEZXJpdmVkRnJvbSBz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"
+        mode="scaleToFill"
+        class="w-[240rpx] h-[240rpx]"
+      />
+      <text>暂无数据</text>
+    </view>
   </scroll-view>
 </template>
 
@@ -49,11 +57,13 @@ const userStore = useUserStore()
 const wishList = ref([])
 
 onLoad(() => {
-  getWishList().then((res) => {
-    if (res.code === 200) {
-      wishList.value = res.result as any[]
-    }
-  })
+  getWishList({ locationCode: userStore.userInfo.estimatedAchievement.provinceCode }).then(
+    (res) => {
+      if (res.code === 200) {
+        wishList.value = res.result as any[]
+      }
+    },
+  )
 })
 
 const handleDelete = (item, index) => {
diff --git a/src/pages/evaluation/components/EvaluationItem.vue b/src/pages/evaluation/components/EvaluationItem.vue
index 248091a..43c56e9 100644
--- a/src/pages/evaluation/components/EvaluationItem.vue
+++ b/src/pages/evaluation/components/EvaluationItem.vue
@@ -71,7 +71,7 @@ const toAssessmentPage = () => {
 
 <style scoped lang="scss">
 .item-wrapper {
-  background: linear-gradient(90deg, #e5f2fa 0%, #dae8fa 100%);
+  background: linear-gradient(90deg, var(--start-color) 0%, var(--end-color) 100%);
   border-radius: 18rpx;
   padding: 32rpx;
 
diff --git a/src/pages/evaluation/index/index.vue b/src/pages/evaluation/index/index.vue
index 5875e35..67b9fbe 100644
--- a/src/pages/evaluation/index/index.vue
+++ b/src/pages/evaluation/index/index.vue
@@ -39,8 +39,8 @@
             v-for="item in learningList"
             :key="item.id"
             :item="item"
-            start-color="#E9EFFF"
-            end-color="#D8DFFD"
+            :start-color="item.startColor"
+            :end-color="item.endColor"
           ></EvaluationItem>
         </view>
       </swiper-item>
@@ -58,12 +58,18 @@ import { getEvaluationList } from '@/service/index/api'
 const tabs = [
   {
     title: '学职定位',
+    startColor: '#E5F2FA',
+    endColor: '#DAE8FA',
   },
   {
     title: '心理健康',
+    startColor: '#E6F4F2',
+    endColor: '#CAF4F0',
   },
   {
     title: '学习状态',
+    startColor: '#E9EFFF',
+    endColor: '#D8DFFD',
   },
 ]
 
diff --git a/src/service/index/api.ts b/src/service/index/api.ts
index dce61d8..2f5e72f 100644
--- a/src/service/index/api.ts
+++ b/src/service/index/api.ts
@@ -327,8 +327,8 @@ export const payTransaction = (params: { total: number; openId: string; descript
   return http.post('/api/sysWechatPay/payTransaction', params)
 }
 
-export const getWishList = () => {
-  return http.get('/api/volunTb/list')
+export const getWishList = (params: { locationCode: string }) => {
+  return http.get('/api/volunTb/v2/list', params)
 }
 
 export const deleteWishList = (params: { id: number }) => {