From ea65e642ad0bc4388c8394209630d526bb5359a8 Mon Sep 17 00:00:00 2001
From: xjs <xjs@ycymedu.com>
Date: Mon, 19 May 2025 10:34:41 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=99=BA=E8=83=BD=E5=A1=AB=E6=8A=A5?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/home/Banner.vue                       | 12 ++++++++++--
 .../components/pickerView/CustomPickerView.vue       |  1 +
 src/pages-sub/components/CustomPickerView.vue        |  1 +
 src/pages-sub/components/collapse/Collapse.vue       |  2 +-
 src/pages-sub/components/table/WXXTable.vue          |  4 +++-
 src/pages-sub/home/wishesList/index.vue              | 10 ++++++++++
 src/pages-sub/home/wishesList/wishesList.vue         |  2 ++
 src/pages-sub/ucenter/appointment/appointment.vue    |  2 +-
 src/pages-sub/ucenter/evaluate/evaluateList.vue      |  2 +-
 src/pages-sub/ucenter/wishList/wishList.vue          |  2 +-
 src/service/index/api.ts                             |  1 +
 11 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/src/components/home/Banner.vue b/src/components/home/Banner.vue
index f9d6222..d23cf0c 100644
--- a/src/components/home/Banner.vue
+++ b/src/components/home/Banner.vue
@@ -65,7 +65,11 @@ const handleChange = () => {
 }
 
 const navigatorTo = () => {
-  if (userStore.userInfo.estimatedAchievement.expectedScore === '') {
+  if (
+    Object.prototype.toString.call(userStore.userInfo.estimatedAchievement.expectedScore) ===
+      '[object Null]' ||
+    userStore.userInfo.estimatedAchievement.expectedScore === ''
+  ) {
     handleChange()
   } else {
     uni.navigateTo({
@@ -75,7 +79,11 @@ const navigatorTo = () => {
 }
 
 const navigatorToAi = () => {
-  if (userStore.userInfo.estimatedAchievement.expectedScore === '') {
+  if (
+    Object.prototype.toString.call(userStore.userInfo.estimatedAchievement.expectedScore) ===
+      '[object Null]' ||
+    userStore.userInfo.estimatedAchievement.expectedScore === ''
+  ) {
     handleChange()
   } else {
     uni.navigateTo({
diff --git a/src/pages-evaluation-sub/components/pickerView/CustomPickerView.vue b/src/pages-evaluation-sub/components/pickerView/CustomPickerView.vue
index 86dd6b4..6dc8381 100644
--- a/src/pages-evaluation-sub/components/pickerView/CustomPickerView.vue
+++ b/src/pages-evaluation-sub/components/pickerView/CustomPickerView.vue
@@ -2,6 +2,7 @@
   <view class="custom-picker">
     <view class="picker-mask" @touchmove.stop.prevent></view>
     <picker-view
+      :immediate-change="true"
       :value="currentIndex"
       :indicator-style="indicatorStyle"
       :style="{
diff --git a/src/pages-sub/components/CustomPickerView.vue b/src/pages-sub/components/CustomPickerView.vue
index 21533fa..226623d 100644
--- a/src/pages-sub/components/CustomPickerView.vue
+++ b/src/pages-sub/components/CustomPickerView.vue
@@ -3,6 +3,7 @@
     <view class="picker-mask" @touchmove.stop.prevent></view>
     <picker-view
       v-if="visible"
+      :immediate-change="true"
       :value="currentIndex"
       :indicator-style="indicatorStyle"
       :indicator-class="'picker-item-selected'"
diff --git a/src/pages-sub/components/collapse/Collapse.vue b/src/pages-sub/components/collapse/Collapse.vue
index 147fce7..d4b187b 100644
--- a/src/pages-sub/components/collapse/Collapse.vue
+++ b/src/pages-sub/components/collapse/Collapse.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script setup>
-import { ref, computed, watch, provide, reactive, onMounted, nextTick } from 'vue'
+import { ref, computed, watch, provide, onMounted, nextTick } from 'vue'
 
 const props = defineProps({
   value: {
diff --git a/src/pages-sub/components/table/WXXTable.vue b/src/pages-sub/components/table/WXXTable.vue
index 71917bf..f3008fb 100644
--- a/src/pages-sub/components/table/WXXTable.vue
+++ b/src/pages-sub/components/table/WXXTable.vue
@@ -28,7 +28,9 @@
         <slot class="w-full"></slot>
       </view>
     </view>
-    <view class="text-center p-[32rpx]" v-show="data.length === 0">暂无数据</view>
+    <view class="text-center p-[32rpx] text-[28rpx] text-[#aaa]" v-show="data.length === 0">
+      暂无数据
+    </view>
   </view>
 </template>
 
diff --git a/src/pages-sub/home/wishesList/index.vue b/src/pages-sub/home/wishesList/index.vue
index 19442d2..7b1de19 100644
--- a/src/pages-sub/home/wishesList/index.vue
+++ b/src/pages-sub/home/wishesList/index.vue
@@ -196,11 +196,18 @@ const queryList = (page: number, pageSize: number) => {
     majors: collegeSearch.value.majors,
     keyword: searchValue.value,
     type: collegeSearch.value.tModelValue === '-1' ? null : +collegeSearch.value.tModelValue,
+    utype: collegeSearch.value.utype,
   }).then((resp) => {
     if (resp.code === 200) {
       paging.value.complete((resp.result as { rows: any[] }).rows)
       total.value = (resp.result as { totalRows: number }).totalRows
       typeModelList.value = coverTypeModel((resp.result as { tModel: any }).tModel, total.value)
+      let _tem = typeModelList.value.filter(
+        (item) => item.value === collegeSearch.value.tModelValue,
+      )
+      if (_tem.length > 0) {
+        collegeSearch.value.tModel = _tem[0].name
+      }
     }
   })
 }
@@ -218,6 +225,7 @@ const collegeSearch = ref({
   feature: [],
   majors: [],
   tModel: '',
+  utype: [],
   tModelValue: '-1',
 })
 
@@ -231,6 +239,7 @@ const handleConfirm = () => {
     collegeSearch.value.feature = _cur.chooseCollegeFeature
     collegeSearch.value.nature = _cur.chooseNature
     collegeSearch.value.majors = _cur.chooseMajors
+    collegeSearch.value.utype = _cur.chooseUniType
   }
   paging.value.reload()
 }
@@ -262,6 +271,7 @@ const sliderValue = ref([
   +userStore.userInfo.estimatedAchievement.expectedScore,
 ])
 const handleSliderChange = (val) => {
+  collegeSearch.value.tModelValue = '-1'
   paging.value.reload()
 }
 
diff --git a/src/pages-sub/home/wishesList/wishesList.vue b/src/pages-sub/home/wishesList/wishesList.vue
index 7cdcfa1..45a070c 100644
--- a/src/pages-sub/home/wishesList/wishesList.vue
+++ b/src/pages-sub/home/wishesList/wishesList.vue
@@ -28,6 +28,7 @@ const editWishList = (_wishList: any[]) => {
       unCode: item.unCode,
       type: item.type,
       sort: index + 1,
+      percentAge: item.percentAge,
       vItems: item.vItems.map((vItem, vIndex) => {
         return {
           sort: vIndex + 1,
@@ -76,6 +77,7 @@ const addWishList = () => {
       unCode: item.unCode || item.collegeCode,
       type: item.type,
       sort: index + 1,
+      percentAge: item.percentAge,
       vItems: item.vItems.map((vItem, vIndex) => {
         return {
           sort: vIndex + 1,
diff --git a/src/pages-sub/ucenter/appointment/appointment.vue b/src/pages-sub/ucenter/appointment/appointment.vue
index a0eca0f..8f68694 100644
--- a/src/pages-sub/ucenter/appointment/appointment.vue
+++ b/src/pages-sub/ucenter/appointment/appointment.vue
@@ -37,7 +37,7 @@
         mode="scaleToFill"
         class="w-[240rpx] h-[240rpx]"
       />
-      <text>暂无数据</text>
+      <text class="text-[28rpx] text-[#aaa]">没有数据哦~</text>
     </view>
   </scroll-view>
 </template>
diff --git a/src/pages-sub/ucenter/evaluate/evaluateList.vue b/src/pages-sub/ucenter/evaluate/evaluateList.vue
index ef4dc9c..3e3a396 100644
--- a/src/pages-sub/ucenter/evaluate/evaluateList.vue
+++ b/src/pages-sub/ucenter/evaluate/evaluateList.vue
@@ -28,7 +28,7 @@
           mode="scaleToFill"
           class="w-[240rpx] h-[240rpx]"
         />
-        <text>暂无数据</text>
+        <text class="text-[28rpx] text-[#aaa]">没有数据哦~</text>
       </view>
     </view>
   </scroll-view>
diff --git a/src/pages-sub/ucenter/wishList/wishList.vue b/src/pages-sub/ucenter/wishList/wishList.vue
index cba236a..9c904ae 100644
--- a/src/pages-sub/ucenter/wishList/wishList.vue
+++ b/src/pages-sub/ucenter/wishList/wishList.vue
@@ -42,7 +42,7 @@
         mode="scaleToFill"
         class="w-[240rpx] h-[240rpx]"
       />
-      <text>暂无数据</text>
+      <text class="text-[28rpx] text-[#aaa]">没有数据哦~</text>
     </view>
   </scroll-view>
 </template>
diff --git a/src/service/index/api.ts b/src/service/index/api.ts
index a449e96..04c4fe4 100644
--- a/src/service/index/api.ts
+++ b/src/service/index/api.ts
@@ -253,6 +253,7 @@ export interface AutoFillParams {
   location?: null | string
   majors?: string[] | null
   nature?: string[] | null
+  utype?: string[] | null
   ownership?: string[] | null
   p?: number | null
   pageIndex?: number