From 1b4b545b6506c3f52f9e995d155393b942490eae Mon Sep 17 00:00:00 2001
From: xjs <xjs@ycymedu.com>
Date: Thu, 24 Apr 2025 09:45:41 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=9A=90=E8=97=8FVIP?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../evaluate/studyReport/anxietyReport.vue    | 40 ++++++++++---------
 src/pages-evaluation-sub/rank/index.vue       |  8 ++--
 src/pages-sub/home/college/index.vue          |  4 +-
 .../home/components/CollegeFeature.vue        |  3 --
 src/pages-sub/home/components/UniType.vue     |  3 --
 src/pages-sub/home/expand/index.vue           |  6 +--
 src/pages/ucenter/index/index.vue             |  8 ++--
 src/service/index/api.ts                      |  2 +-
 8 files changed, 35 insertions(+), 39 deletions(-)

diff --git a/src/pages-evaluation-sub/evaluate/studyReport/anxietyReport.vue b/src/pages-evaluation-sub/evaluate/studyReport/anxietyReport.vue
index 404a753..b309dfb 100644
--- a/src/pages-evaluation-sub/evaluate/studyReport/anxietyReport.vue
+++ b/src/pages-evaluation-sub/evaluate/studyReport/anxietyReport.vue
@@ -20,25 +20,27 @@
       </template>
     </Navbar>
 
-    <view class="flex-1 overflow-auto relative">
-      <!-- 顶部卡片 -->
-      <view class="mt-[60rpx] mx-[24rpx]">
-        <StatusCard
-          :score="score"
-          :rules="anxietyRules"
-          tip="测评结果只做参考。"
-          :level="level"
-          :description="studyRecord.description"
-          :tagName="studyRecord.tagName"
-        />
-      </view>
-      <view class="mx-[24rpx]">
-        <LearnSkillSuggestion
-          v-for="(item, index) in suggestions"
-          :key="index"
-          :items="item.items"
-          :title="item.title"
-        ></LearnSkillSuggestion>
+    <view class="flex-1 overflow-auto relative flex flex-col">
+      <view class="flex-1 overflow-auto">
+        <!-- 顶部卡片 -->
+        <view class="mt-[60rpx] mx-[24rpx]">
+          <StatusCard
+            :score="score"
+            :rules="anxietyRules"
+            tip="测评结果只做参考。"
+            :level="level"
+            :description="studyRecord.description"
+            :tagName="studyRecord.tagName"
+          />
+        </view>
+        <view class="mx-[24rpx]">
+          <LearnSkillSuggestion
+            v-for="(item, index) in suggestions"
+            :key="index"
+            :items="item.items"
+            :title="item.title"
+          ></LearnSkillSuggestion>
+        </view>
       </view>
 
       <!-- 底部AI智能顾问 -->
diff --git a/src/pages-evaluation-sub/rank/index.vue b/src/pages-evaluation-sub/rank/index.vue
index a814e6b..dd5c090 100644
--- a/src/pages-evaluation-sub/rank/index.vue
+++ b/src/pages-evaluation-sub/rank/index.vue
@@ -68,15 +68,15 @@
       <view class="flex flex-col mt-[22rpx]">
         <view class="text-[24rpx] text-[#636363]">
           位次区间:
-          <text class="text-[#1580FF]">{{ betweenRanks.scoreRange }}</text>
+          <text class="text-[#1580FF]">{{ betweenRanks?.scoreRange }}</text>
         </view>
         <view class="text-[24rpx] text-[#636363]">
           建议位次:
-          <text class="text-[#1580FF]">{{ betweenRanks.ranges }}</text>
+          <text class="text-[#1580FF]">{{ betweenRanks?.ranges }}</text>
         </view>
         <view class="text-[24rpx] text-[#636363]">
           同分人数:
-          <text class="text-[#1580FF]">{{ betweenRanks.ranges }}</text>
+          <text class="text-[#1580FF]">{{ betweenRanks?.ranges }}</text>
         </view>
       </view>
     </view>
@@ -137,7 +137,7 @@ const searchParams = ref({
   locationName: userStore.userInfo.estimatedAchievement.provinceName || '山东省',
   year: '',
   type: '',
-  Score: '500',
+  Score: userStore.userInfo.estimatedAchievement.expectedScore || '500',
 })
 
 const handleConfirm = () => {
diff --git a/src/pages-sub/home/college/index.vue b/src/pages-sub/home/college/index.vue
index 69f7ffc..9b2484c 100644
--- a/src/pages-sub/home/college/index.vue
+++ b/src/pages-sub/home/college/index.vue
@@ -180,9 +180,9 @@ const handleClear = (index: number) => {
   if (currentMenu.value === 1) {
     regionKeyInfo.value = []
   } else if (currentMenu.value === 2) {
-    uniTypeKeyInfo.value = []
-  } else if (currentMenu.value === 3) {
     natureKeyInfo.value = []
+  } else if (currentMenu.value === 3) {
+    uniTypeKeyInfo.value = []
   }
   subMenu.value[index].activation = false
   dropMenuRef.value.closeDropMenu()
diff --git a/src/pages-sub/home/components/CollegeFeature.vue b/src/pages-sub/home/components/CollegeFeature.vue
index 8553024..e11fcb2 100644
--- a/src/pages-sub/home/components/CollegeFeature.vue
+++ b/src/pages-sub/home/components/CollegeFeature.vue
@@ -2,7 +2,6 @@
   <CheckGroup
     :list="infoList"
     @change="handleChange"
-    :default-value="defaultInfo"
     value-key="id"
     label-key="name"
     v-bind="$attrs"
@@ -22,8 +21,6 @@ getUniversityFeature().then((res) => {
   }
 })
 
-const defaultInfo = ref<string[]>([])
-
 const emits = defineEmits(['changeName', 'changeObj'])
 
 const handleChange = (val: any) => {
diff --git a/src/pages-sub/home/components/UniType.vue b/src/pages-sub/home/components/UniType.vue
index d3300e1..4b99087 100644
--- a/src/pages-sub/home/components/UniType.vue
+++ b/src/pages-sub/home/components/UniType.vue
@@ -2,7 +2,6 @@
   <CheckGroup
     :list="infoList"
     @change="handleChange"
-    :default-value="defaultInfo"
     value-key="id"
     label-key="name"
     v-bind="$attrs"
@@ -21,8 +20,6 @@ getUniversityType().then((res) => {
   }
 })
 
-const defaultInfo = ref<string[]>([])
-
 const emits = defineEmits(['change', 'changeName', 'changeObj'])
 
 const handleChange = (val: any) => {
diff --git a/src/pages-sub/home/expand/index.vue b/src/pages-sub/home/expand/index.vue
index 092c5bd..29a14fe 100644
--- a/src/pages-sub/home/expand/index.vue
+++ b/src/pages-sub/home/expand/index.vue
@@ -103,7 +103,7 @@
           <view class="flex-1 flex items-center">
             <image :src="item.logo" mode="scaleToFill" class="w-[72rpx] h-[72rpx] mr-[6rpx]" />
             <view class="ml-[6rpx]">
-              <view class="text-[32rpx] font-semibold truncate max-w-[200rpx]">
+              <view class="text-[32rpx] font-semibold text-wrap max-w-[200rpx]">
                 {{ item.name }}
               </view>
               <view class="mt-[6rpx] text-[22rpx]">
@@ -232,9 +232,9 @@ const handleClear = (index: number) => {
   if (subMenu.value[index].id === 1) {
     regionKeyInfo.value = []
   } else if (subMenu.value[index].id === 2) {
-    uniTypeKeyInfo.value = []
-  } else if (subMenu.value[index].id === 3) {
     natureKeyInfo.value = []
+  } else if (subMenu.value[index].id === 3) {
+    uniTypeKeyInfo.value = []
   }
   subMenu.value[index].activation = false
   dropMenuRef.value.closeDropMenu()
diff --git a/src/pages/ucenter/index/index.vue b/src/pages/ucenter/index/index.vue
index ed7677e..c4c3366 100644
--- a/src/pages/ucenter/index/index.vue
+++ b/src/pages/ucenter/index/index.vue
@@ -27,7 +27,7 @@
         </view>
       </view>
 
-      <view
+      <!-- <view
         class="absolute bottom-0 py-[16rpx] pl-[32rpx] pr-[24rpx] left-[50%] translate-x-[-50%] flex items-center w-max custom-vip-bg"
       >
         <image
@@ -51,7 +51,7 @@
         >
           已开通
         </button>
-      </view>
+      </view> -->
       <view class="diagonal-lines"></view>
     </view>
     <view
@@ -91,10 +91,10 @@
         <text>我的预约</text>
         <view class="i-carbon-chevron-down rotate-270 text-[#BFBFBF]"></view>
       </view>
-      <view class="flex items-center justify-between mx-[32rpx] py-[28rpx]" @click="goActive">
+      <!-- <view class="flex items-center justify-between mx-[32rpx] py-[28rpx]" @click="goActive">
         <text>卡密兑换</text>
         <view class="i-carbon-chevron-down rotate-270 text-[#BFBFBF]"></view>
-      </view>
+      </view> -->
     </view>
 
     <view class="mx-[32rpx] bg-[#fff] rounded-[8rpx]">
diff --git a/src/service/index/api.ts b/src/service/index/api.ts
index 2f5e72f..a4169d8 100644
--- a/src/service/index/api.ts
+++ b/src/service/index/api.ts
@@ -195,7 +195,7 @@ export const getScoreSection = (params: {
   locationCode: string
   year: string
   type: string
-  Score: string
+  Score: string | number
 }) => {
   return http.get('/api/ScoreSection/scoreSection/V2', params)
 }