From 5cff6fb92443b46cab6f8fc8982c309dda3f983a Mon Sep 17 00:00:00 2001
From: xjs <xjs@ycymedu.com>
Date: Sat, 18 Apr 2026 10:14:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=99=BA=E8=83=BD=E5=A1=AB=E6=8A=A5?=
 =?UTF-8?q?=E7=9A=84=E5=88=86=E6=95=B0=E8=8C=83=E5=9B=B4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages-sub/home/components/ProgressBar.vue | 16 +++++---------
 .../home/major/components/MajorUniversity.vue |  2 +-
 .../wishesList/composable/useWishesList.ts    | 12 ++++++++--
 src/pages-sub/home/wishesList/index.vue       | 22 ++-----------------
 4 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/src/pages-sub/home/components/ProgressBar.vue b/src/pages-sub/home/components/ProgressBar.vue
index 03f02b0..8f22bf0 100644
--- a/src/pages-sub/home/components/ProgressBar.vue
+++ b/src/pages-sub/home/components/ProgressBar.vue
@@ -4,17 +4,11 @@
   </view>
 </template>
 
-<script>
-import { defineComponent } from 'vue'
-
-export default defineComponent({
-  name: 'ProgressBar',
-  props: {
-    progress: {
-      type: Number | String,
-      required: true,
-      default: 0,
-    },
+<script lang="ts" setup>
+const props = defineProps({
+  progress: {
+    type: [Number, String],
+    default: 0,
   },
 })
 </script>
diff --git a/src/pages-sub/home/major/components/MajorUniversity.vue b/src/pages-sub/home/major/components/MajorUniversity.vue
index aad0d5e..088bc5d 100644
--- a/src/pages-sub/home/major/components/MajorUniversity.vue
+++ b/src/pages-sub/home/major/components/MajorUniversity.vue
@@ -92,8 +92,8 @@ watch(
           ssdmList: { ssmc: string; code: string; count: number }[]
         }
         provinceList.value = result.ssdmList.filter((item) => {
-          provinceTotal.value += item.count
           if (item.code) {
+            provinceTotal.value += item.count
             return item
           }
         })
diff --git a/src/pages-sub/home/wishesList/composable/useWishesList.ts b/src/pages-sub/home/wishesList/composable/useWishesList.ts
index fa8a160..849df24 100644
--- a/src/pages-sub/home/wishesList/composable/useWishesList.ts
+++ b/src/pages-sub/home/wishesList/composable/useWishesList.ts
@@ -66,10 +66,11 @@ export const countModel = (list: any[]) => {
   return { tModel }
 }
 
-export const useScore = (provinceCode, batchName, requireSubject) => {
+export const useScore = (provinceCode, batchName, requireSubject, expectedScore) => {
   const score = ref(0)
   const minScore = ref(0)
   const maxScore = ref(0)
+  const sliderValue = ref([0, 0])
   const _requireSubject = requireSubject.length > 0 ? requireSubject[0].name : ''
   getBatchDynamicData({ LocationCode: provinceCode, Course: _requireSubject }).then((resp) => {
     if (resp.code === 200) {
@@ -81,7 +82,14 @@ export const useScore = (provinceCode, batchName, requireSubject) => {
 
       minScore.value = _result.minScore
       maxScore.value = _result.maxScore
+      if (maxScore.value !== 0) {
+        sliderValue.value[0] =
+          expectedScore < minScore.value + 40 ? minScore.value : expectedScore - 40
+
+        sliderValue.value[1] =
+          expectedScore > maxScore.value - 40 ? maxScore.value : expectedScore + 40
+      }
     }
   })
-  return { score, minScore, maxScore }
+  return { score, minScore, maxScore, sliderValue }
 }
diff --git a/src/pages-sub/home/wishesList/index.vue b/src/pages-sub/home/wishesList/index.vue
index 73bdea4..379a103 100644
--- a/src/pages-sub/home/wishesList/index.vue
+++ b/src/pages-sub/home/wishesList/index.vue
@@ -293,34 +293,16 @@ const handleRegionName = (val: string[]) => {
   province.value = val
 }
 
-const sliderValue = ref([0, 0])
 const handleSliderChange = (val) => {
   collegeSearch.value.tModelValue = '-1'
   paging.value.reload()
 }
 
-const { score, minScore, maxScore } = useScore(
+const { score, minScore, maxScore, sliderValue } = useScore(
   userStore.userInfo.estimatedAchievement.provinceCode,
   userStore.userInfo.batchName,
   userStore.userInfo.estimatedAchievement.requireSubject,
-)
-
-watch(
-  () => maxScore.value,
-  () => {
-    if (maxScore.value !== 0) {
-      sliderValue.value[0] =
-        +userStore.userInfo.estimatedAchievement.expectedScore < minScore.value + 40
-          ? minScore.value
-          : +userStore.userInfo.estimatedAchievement.expectedScore - 40
-
-      sliderValue.value[1] =
-        +userStore.userInfo.estimatedAchievement.expectedScore > maxScore.value - 40
-          ? maxScore.value
-          : +userStore.userInfo.estimatedAchievement.expectedScore + 40
-    }
-  },
-  { immediate: true },
+  +userStore.userInfo.estimatedAchievement.expectedScore,
 )
 
 const isEdit = ref(false)