diff --git a/src/chart-sub/evaluate/academicReport/capabilityReport.vue b/src/chart-sub/evaluate/academicReport/capabilityReport.vue
index bd4cbd6..ac6a6eb 100644
--- a/src/chart-sub/evaluate/academicReport/capabilityReport.vue
+++ b/src/chart-sub/evaluate/academicReport/capabilityReport.vue
@@ -69,17 +69,17 @@ onLoad((options) => {
   pageType.value = +options.type
   pageId.value = options.id
 
-  // getAbilityDimension({ ScaleId: pageId.value }).then((resp) => {
-  //   if (resp.code === 200) {
-  //     studyRecord.value = resp.result as {
-  //       description: string
-  //       title: string
-  //       linChart: any[]
-  //       reportItems: any[]
-  //       hTag: string
-  //     }
-  //   }
-  // })
+  getAbilityDimension({ ScaleId: pageId.value }).then((resp) => {
+    if (resp.code === 200) {
+      studyRecord.value = resp.result as {
+        description: string
+        title: string
+        linChart: any[]
+        reportItems: any[]
+        hTag: string
+      }
+    }
+  })
 })
 </script>
 
diff --git a/src/chart-sub/evaluate/academicReport/characterReport.vue b/src/chart-sub/evaluate/academicReport/characterReport.vue
index e8b74d3..64b0cc1 100644
--- a/src/chart-sub/evaluate/academicReport/characterReport.vue
+++ b/src/chart-sub/evaluate/academicReport/characterReport.vue
@@ -85,17 +85,17 @@ onLoad((options) => {
   pageType.value = +options.type
   pageId.value = options.id
 
-  // getMBTIDimension({ ScaleId: pageId.value }).then((resp) => {
-  //   if (resp.code === 200) {
-  //     studyRecord.value = resp.result as {
-  //       description: string
-  //       title: string
-  //       linChart: any
-  //       reportItem: { mainDomain: string; major: string; occupation: string }
-  //       hTag: string
-  //     }
-  //   }
-  // })
+  getMBTIDimension({ ScaleId: pageId.value }).then((resp) => {
+    if (resp.code === 200) {
+      studyRecord.value = resp.result as {
+        description: string
+        title: string
+        linChart: any
+        reportItem: { mainDomain: string; major: string; occupation: string }
+        hTag: string
+      }
+    }
+  })
 })
 </script>
 
diff --git a/src/chart-sub/evaluate/academicReport/interestReport.vue b/src/chart-sub/evaluate/academicReport/interestReport.vue
index 558f452..8e93f53 100644
--- a/src/chart-sub/evaluate/academicReport/interestReport.vue
+++ b/src/chart-sub/evaluate/academicReport/interestReport.vue
@@ -2,7 +2,7 @@
   <view class="flex flex-col h-screen relative custom-bg">
     <Navbar safeAreaInsetTop :bordered="false" leftArrow @clickLeft="handleBack" bg-color="transparent">
       <template #title>
-        <text class="text-[#1F2329] text-[36rpx] font-medium text-[#fff]">性格测评报告</text>
+        <text class="text-[#1F2329] text-[36rpx] font-medium text-[#fff]">兴趣测评报告</text>
       </template>
     </Navbar>
     <view class="flex-1 overflow-auto relative mt-[40rpx]">
diff --git a/src/chart-sub/evaluate/academicReport/opinionAboutReport.vue b/src/chart-sub/evaluate/academicReport/opinionAboutReport.vue
index e78b7eb..f8d51ad 100644
--- a/src/chart-sub/evaluate/academicReport/opinionAboutReport.vue
+++ b/src/chart-sub/evaluate/academicReport/opinionAboutReport.vue
@@ -79,17 +79,17 @@ onLoad((options) => {
   pageType.value = +options.type
   pageId.value = options.id
 
-  // getOpinionAbout({ ScaleId: pageId.value }).then((resp) => {
-  //   if (resp.code === 200) {
-  //     studyRecord.value = resp.result as {
-  //       description: string
-  //       title: string
-  //       picCharts: { radars: any[]; indicator: any[] }
-  //       reportItems: any[]
-  //       tag: string
-  //     }
-  //   }
-  // })
+  getOpinionAbout({ ScaleId: pageId.value }).then((resp) => {
+    if (resp.code === 200) {
+      studyRecord.value = resp.result as {
+        description: string
+        title: string
+        picCharts: { radars: any[]; indicator: any[] }
+        reportItems: any[]
+        tag: string
+      }
+    }
+  })
 })
 </script>
 
diff --git a/src/chart-sub/evaluate/components/AiFooter.vue b/src/chart-sub/evaluate/components/AiFooter.vue
index 640e708..c28f998 100644
--- a/src/chart-sub/evaluate/components/AiFooter.vue
+++ b/src/chart-sub/evaluate/components/AiFooter.vue
@@ -6,7 +6,7 @@
     v-if="aiShow"
   >
     <view
-      class="rounded-[8rpx] border-[#1580FF] border-[2rpx] border-solid w-full py-[14rpx] flex items-center justify-center"
+      class="rounded-[8rpx] border-[#1580FF] border-[2rpx] border-solid w-full py-[14rpx] flex items-center justify-center mb-[16rpx]"
     >
       <view class="w-[52rpx] h-[52rpx] mr-[10rpx]">
         <image
diff --git a/src/http/http.ts b/src/http/http.ts
index 422199e..bdb37dc 100644
--- a/src/http/http.ts
+++ b/src/http/http.ts
@@ -93,12 +93,6 @@ export function http<T>(options: CustomRequestOptions) {
           return reject(res)
         }
 
-        // 不存在的用户处理
-        if (responseData.code === 400) {
-          tokenStore.logout()
-          uni.navigateTo({ url: LOGIN_PAGE })
-        }
-
         // 处理其他成功状态（HTTP状态码200-299）
         if (res.statusCode >= 200 && res.statusCode < 300) {
           // 处理业务逻辑错误
diff --git a/src/pages-sub/about/userInfo.vue b/src/pages-sub/about/userInfo.vue
index c58beb7..093fd8e 100644
--- a/src/pages-sub/about/userInfo.vue
+++ b/src/pages-sub/about/userInfo.vue
@@ -174,19 +174,19 @@ onShow(() => {
         <MxRadio v-model:value="userInfo.sex" v-model:label="formData.genderLabel" v-if="activeType == 'gender'"
           :options="genderClassification" label-key="label" value-key="value"
           custom-root-cols-class="grid grid-cols-2 items-center gap-[16rpx]"
-          custom-root-class="px-[30rpx] pt-[22rpx] pb-[20rpx]" custom-item-class="py-[12rpx] text-center "
-          active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none" />
+          custom-root-class="pt-[22rpx] pb-[20rpx]" custom-item-class="py-[12rpx] text-center "
+          active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none"  @change="visible = false" />
 
         <MxRadio v-model:value="userInfo.userExtend.gradeId" v-model:label="userInfo.userExtend.gradeName"
           v-if="activeType == 'grade'" :options="gradeClassification" label-key="label" value-key="value"
           custom-root-cols-class="grid grid-cols-3 items-center gap-[16rpx]"
-          custom-root-class="px-[30rpx] pt-[22rpx] pb-[20rpx]" custom-item-class="py-[12rpx] text-center "
-          active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none" />
+          custom-root-class="pt-[22rpx] pb-[20rpx]" custom-item-class="py-[12rpx] text-center "
+          active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none"  @change="visible = false" />
 
         <MxRadio v-model:value="userInfo.userExtend.area" v-if="activeType == 'area'" :options="areaList"
           label-key="label" value-key="value" custom-root-cols-class="grid grid-cols-3 items-center gap-[16rpx]"
-          custom-root-class="px-[30rpx] pt-[22rpx] pb-[20rpx]" custom-item-class="py-[12rpx] text-center "
-          active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none" />
+          custom-root-class="pt-[22rpx] pb-[20rpx]" custom-item-class="py-[12rpx] text-center "
+          active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none"  @change="visible = false" />
 
       </view>
     </sar-popup>
diff --git a/src/pages-sub/information/highSchool.vue b/src/pages-sub/information/highSchool.vue
index 5991cc2..c13753f 100644
--- a/src/pages-sub/information/highSchool.vue
+++ b/src/pages-sub/information/highSchool.vue
@@ -119,7 +119,7 @@ const handleComplete = () => {
           <sar-dropdown-item :title="searchParams.region || '区域'" v-model:visible="visibleFlag1">
             <mx-radio-group v-model:value="searchParams.region" :options="regions" label-key="label" value-key="value"
               custom-root-class="px-[32rpx] pt-[30rpx] pb-[40rpx]"
-              active-item-class="bg-[#e7f2ff] text-[#1580FF] border-[#1580FF]"
+              active-item-class="bg-white text-[#1580FF] border-1 border-solid border-[#1580FF]!"
               default-item-class="bg-[#F3F4F8] border-[#F3F4F8]"
               custom-item-class="w-full py-[16rpx] text-center border-[1rpx] border-solid" @change="handleComplete"/>
           </sar-dropdown-item>
@@ -127,7 +127,7 @@ const handleComplete = () => {
             <mx-radio-group v-model:value="searchParams.nature" v-model:label="searchParams.natureLabel"
               :options="natureList" label-key="label" value-key="value"
               custom-root-class="px-[32rpx] pt-[30rpx] pb-[40rpx]"
-              active-item-class="bg-[#e7f2ff] text-[#1580FF] border-[#1580FF]"
+              active-item-class="bg-white text-[#1580FF] border-1 border-solid border-[#1580FF]!"
               default-item-class="bg-[#F3F4F8] border-[#F3F4F8]"
               custom-item-class="w-full py-[16rpx] text-center border-[1rpx] border-solid" @change="handleComplete" />
           </sar-dropdown-item>
@@ -136,7 +136,7 @@ const handleComplete = () => {
               :options="schoolTypeList" label-key="label" value-key="value"
               custom-root-class="px-[32rpx] pt-[30rpx] pb-[40rpx]"
               custom-item-class="w-full py-[16rpx] text-center border-[1rpx] border-solid"
-              active-item-class="bg-[#e7f2ff] text-[#1580FF] border-[#1580FF]"
+              active-item-class="bg-white text-[#1580FF] border-1 border-solid border-[#1580FF]!"
               default-item-class="bg-[#F3F4F8] border-[#F3F4F8]" @change="handleComplete" />
           </sar-dropdown-item>
         </sar-dropdown>
diff --git a/src/pages-sub/information/overTheYear.vue b/src/pages-sub/information/overTheYear.vue
index 1546938..bf56d72 100644
--- a/src/pages-sub/information/overTheYear.vue
+++ b/src/pages-sub/information/overTheYear.vue
@@ -113,8 +113,8 @@ onShow(() => {
     }
   })
   getHistoryYearList().then(resp => {
-    if(resp.code ===200){
-      yearList.value = [{ value: '', label: '不限' },...resp.result]
+    if (resp.code === 200) {
+      yearList.value = [{ value: '', label: '不限' }, ...resp.result]
     }
   })
   handleChange()
@@ -126,28 +126,28 @@ onShow(() => {
     <sar-navbar title="历年分数" :show-back="true" @back="handleBack"
       :root-style="{ '--sar-navbar-bg': `rgba(255, 255, 255, 0)`, 'padding-top': `${safeAreaInsets?.top}px`, '--sar-navbar-item-color': 'black' }">
     </sar-navbar>
-    <mx-search v-model:searchText="searchParams.keyword" rootStyle="margin: 16rpx 30rpx 0;" @complete="handleChange"/>
+    <mx-search v-model:searchText="searchParams.keyword" rootStyle="margin: 16rpx 30rpx 0;" @complete="handleChange" />
     <sar-dropdown
       root-style="--sar-dropdown-placeholder-color:#666;--sar-dropdown-value-font-size:28rpx;--sar-dropdown-option-active-color:#1580FF;--sar-dropdown-box-shadow:0rpx 6rpx 8rpx 0rpx rgba(0,0,0,0.04);">
-      <sar-dropdown-item v-model:visible="visibleFlag1" :title="searchParams.region || '区域'" >
+      <sar-dropdown-item v-model:visible="visibleFlag1" :title="searchParams.region || '区域'">
         <mx-radio-group v-model:value="searchParams.region" :options="areaList" label-key="label" value-key="value"
           custom-root-class="px-[32rpx] pt-[30rpx] pb-[40rpx]"
-          active-item-class="bg-[#e7f2ff] text-[#1580FF] border-[#1580FF]"
+          active-item-class="bg-white text-[#1580FF] border-1 border-solid border-[#1580FF]!"
           default-item-class="bg-[#F3F4F8] border-[#F3F4F8]"
-          custom-item-class="w-full py-[16rpx] text-center border-[1rpx] border-solid" @change="handleChange"/>
+          custom-item-class="w-full py-[16rpx] text-center border-[1rpx] border-solid" @change="handleChange" />
       </sar-dropdown-item>
-      <sar-dropdown-item v-model:visible="visibleFlag2" :title="searchParams.natureLabel || '办学性质'" >
+      <sar-dropdown-item v-model:visible="visibleFlag2" :title="searchParams.natureLabel || '办学性质'">
         <mx-radio-group v-model:value="searchParams.nature" v-model:label="searchParams.natureLabel"
           :options="natureList" label-key="label" value-key="value" custom-root-class="px-[32rpx] pt-[30rpx] pb-[40rpx]"
-          active-item-class="bg-[#e7f2ff] text-[#1580FF] border-[#1580FF]"
+          active-item-class="bg-white text-[#1580FF] border-1 border-solid border-[#1580FF]!"
           default-item-class="bg-[#F3F4F8] border-[#F3F4F8]"
-          custom-item-class="w-full py-[16rpx] text-center border-[1rpx] border-solid" @change="handleChange"/>
+          custom-item-class="w-full py-[16rpx] text-center border-[1rpx] border-solid" @change="handleChange" />
       </sar-dropdown-item>
       <sar-dropdown-item v-model:visible="visibleFlag3" v-model="searchParams.year" :title="searchParams.year || '年份'">
         <mx-radio-group v-model:value="searchParams.year" :options="yearList" label-key="label" value-key="value"
           custom-root-class="px-[32rpx] pt-[30rpx] pb-[40rpx]"
           custom-item-class="w-full py-[16rpx] text-center border-[1rpx] border-solid"
-          active-item-class="bg-[#e7f2ff] text-[#1580FF] border-[#1580FF]"
+          active-item-class="bg-white text-[#1580FF] border-1 border-solid border-[#1580FF]!"
           default-item-class="bg-[#F3F4F8] border-[#F3F4F8]" @change="handleChange" />
       </sar-dropdown-item>
     </sar-dropdown>
@@ -168,6 +168,11 @@ onShow(() => {
                 :style="{ 'text-align': item.align }">{{ record[item.prop] }}</view>
             </sar-table-cell>
           </sar-table-row>
+          <sar-table-row v-if="partialData.length === 0">
+            <sar-table-cell :colspan="partialColumns.length">
+              <view class="text-center text-[24rpx] text-[#999] py-[20rpx]">暂无数据</view>
+            </sar-table-cell>
+          </sar-table-row>
         </sar-table>
       </view>
     </scroll-view>
diff --git a/src/pages-sub/information/quota.vue b/src/pages-sub/information/quota.vue
index 141e18d..7cd7713 100644
--- a/src/pages-sub/information/quota.vue
+++ b/src/pages-sub/information/quota.vue
@@ -53,7 +53,7 @@ const handleChange = () => {
 onLoad(() => {
   getAreaList().then(resp => {
     if (resp.code === 200) {
-      regions.value = [{label:'不限',value:''},...resp.result]
+      regions.value = [{ label: '不限', value: '' }, ...resp.result]
     }
   })
   handleChange()
@@ -71,8 +71,7 @@ onLoad(() => {
         <text class="text-[#666] text-[30rpx]">{{ searchParams.regionLabel === '' || searchParams.regionLabel === '不限' ?
           '区域' : searchParams.regionLabel }}</text>
         <view class="w-[24rpx] h-[24rpx] ml-[10rpx] flex items-center">
-          <image src="https://lwzk.ycymedu.com/img/qt/qt_quyu.png" mode="scaleToFill"
-            class="w-[24rpx] h-[24rpx]" />
+          <image src="https://lwzk.ycymedu.com/img/qt/qt_quyu.png" mode="scaleToFill" class="w-[24rpx] h-[24rpx]" />
         </view>
       </view>
       <view class="flex-1 ml-[30rpx]">
@@ -94,26 +93,23 @@ onLoad(() => {
       <view class="pb-safe"></view>
     </scroll-view>
 
-    <sar-popout :show-close="false" :show-footer="false" v-model:visible="regionVisible" @leave="handleChange"
-      root-style="--sar-popout-header-loose-padding-x:30rpx;">
-      <template #title>
-        <view class="flex items-center justify-between w-full">
-          <view class="text-[34rpx] font-500">请选择中考所在地</view>
+    <sar-popup :visible="regionVisible" effect="slide-bottom" root-class="min-h-[560rpx]" @leave="handleChange">
+      <view class="bg-white rounded-[24rpx_24rpx_0_0] px-[30rpx] pb-safe pt-[30rpx] min-h-[492rpx]">
+        <view class="text-[34rpx] font-500 flex items-center justify-between mb-[30rpx]">
+          <view>请选择中考所在地</view>
           <view class="w-[36rpx] h-[36rpx] flex items-center" @click="regionVisible = false">
             <image src="https://lwzk.ycymedu.com/img/tianbao/tb_guanbi.png" mode="scaleToFill"
               class="w-[36rpx] h-[36rpx]" />
           </view>
-
         </view>
-      </template>
-      <view class="px-[32rpx]">
         <MxRadioGroup v-model:value="searchParams.region" v-model:label="searchParams.regionLabel" :options="regions"
           label-key="label" value-key="value" custom-root-class=""
           custom-item-class="w-full py-[16rpx] text-center border-[1rpx] border-solid"
-          active-item-class="bg-[#e7f2ff] text-[#1580FF] border-[#1580FF]"
-          default-item-class="bg-[#F3F4F8] border-[#F3F4F8]" @change="regionVisible = false"/>
+          active-item-class="bg-white text-[#1580FF] border-1 border-solid border-[#1580FF]!"
+          default-item-class="bg-[#F3F4F8] border-[#F3F4F8]" @change="regionVisible = false" />
       </view>
-    </sar-popout>
+
+    </sar-popup>
   </view>
 </template>
 
diff --git a/src/pages-sub/me/evaluation.vue b/src/pages-sub/me/evaluation.vue
index 8bc3fe8..e7b8e4e 100644
--- a/src/pages-sub/me/evaluation.vue
+++ b/src/pages-sub/me/evaluation.vue
@@ -23,9 +23,9 @@ onShow(() => {
 
 <template>
     <view class="bg-[#F8F8F8] h-screen px-[30rpx] overflow-hidden">
-        <view v-for="(val, index) in list" :key="index" class="flex first:mt-[30rpx]" v-if="list.length > 0" @click="useRouterDetail(val)">
+        <view v-for="(val, index) in list" :key="index" class="flex first:mt-[30rpx] not-last:mb-[20rpx]" v-if="list.length > 0" @click="useRouterDetail(val)">
             <view
-                class="text-[30rpx] text-[#333] grid gap-[8rpx] bg-white px-[30rpx] py-[20rpx] not-last:mb-[30rpx] rounded-[16rpx] w-full flex items-center justify-between">
+                class="text-[30rpx] grid gap-[8rpx] bg-white px-[30rpx] py-[20rpx] rounded-[16rpx] w-full flex items-center justify-between">
                 
                 <view class="">
                     <view class="text-[32rpx] font-600">{{ val.title }}</view>
@@ -33,7 +33,7 @@ onShow(() => {
                        {{ val.createTime }}
                     </view>
                 </view>
-                <view class="flex items-center border-[2rpx] border-[#ccc] border-solid rounded-[8rpx] px-[12rpx] py-[6rpx]">
+                <view class="flex items-center border-[2rpx] border-[#ccc] border-solid rounded-[8rpx] px-[12rpx] py-[4rpx]">
                     <view class="w-[32rpx] h-[32rpx] flex items-center">
                         <image src="https://lwzk.ycymedu.com/img/qt/wd_shanchu.png"
                             class="w-[32rpx] h-[32rpx]" />
diff --git a/src/pages-sub/me/starSchool.vue b/src/pages-sub/me/starSchool.vue
index ceb13d1..f44ae68 100644
--- a/src/pages-sub/me/starSchool.vue
+++ b/src/pages-sub/me/starSchool.vue
@@ -42,9 +42,9 @@ onLoad(() => {
 
 <template>
     <view class="bg-[#F8F8F8] h-screen px-[30rpx] overflow-hidden">
-        <view v-for="(val, index) in schools" :key="index" class="flex items-center mb-[18rpx] px-[30rpx] py-[20rpx] bg-white first:mt-[30rpx]"
+        <view v-for="(val, index) in schools" :key="index" class="flex items-center not-last:mb-[20rpx] px-[30rpx] py-[20rpx] bg-white first:mt-[30rpx]"
             v-if="schools.length > 0" @click.stop="navigateToDetail(val.id)">
-            <view class="text-[30rpx] text-[#333] grid gap-[8rpx] not-last:mb-[30rpx] rounded-[16rpx] flex-1">
+            <view class="text-[30rpx] grid gap-[8rpx] rounded-[16rpx] flex-1">
                 <view class="text-[32rpx] font-600">{{ val.schoolName }}</view>
                 <view class="flex items-center text-[24rpx] gap-[14rpx]">
                     <view class="text-[#666] bg-[#F8F8F8] rounded-[8rpx] px-[10rpx] py-[4rpx]">{{ val.schoolType }}</view>
@@ -53,7 +53,7 @@ onLoad(() => {
                     {{ val.region }}·{{ val.schoolNature }}
                 </view>
             </view>
-            <view class="rounded-[8rpx] border-[2rpx] border-solid border-[#75b5ff] p-[12rpx] flex items-center"  @click.stop="starSchool(val.id,index)">
+            <view class="rounded-[8rpx] border-[2rpx] border-solid border-[#75b5ff] px-[12rpx] py-[6rpx] flex items-center"  @click.stop="starSchool(val.id,index)">
                 <view class="w-[24rpx] h-[24rpx] flex items-center">
                     <image src="https://lwzk.ycymedu.com/img/qt/xq_shoucang2.png" mode="scaleToFill"
                         class="w-[24rpx] h-[24rpx]" />
diff --git a/src/pages-sub/me/wishlist.vue b/src/pages-sub/me/wishlist.vue
index d13fb28..6356f33 100644
--- a/src/pages-sub/me/wishlist.vue
+++ b/src/pages-sub/me/wishlist.vue
@@ -37,6 +37,10 @@ const navigateToDetail = (val) => {
     uni.navigateTo({url:"/pages-sub/me/wishlistInfo"})
 }
 
+const navigateToWish = () => {
+    uni.navigateTo({url:"/pages-sub/wishlist/create/first"})
+}
+
 onShow(() => {
     getWishlist().then(resp => {
         if (resp.code === 200) {
@@ -48,9 +52,9 @@ onShow(() => {
 
 <template>
     <view class="bg-[#F8F8F8] h-screen px-[30rpx] overflow-hidden">
-        <view v-for="(val, index) in wishlist" :key="index" class="flex first:mt-[30rpx]" v-if="wishlist.length > 0" @click="navigateToDetail(val)">
+        <view v-for="(val, index) in wishlist" :key="index" class="flex first:mt-[30rpx] not-last:mb-[20rpx]" v-if="wishlist.length > 0" @click="navigateToDetail(val)">
             <view
-                class="text-[30rpx] text-[#333] grid gap-[8rpx] bg-white px-[30rpx] py-[20rpx] not-last:mb-[30rpx] rounded-[16rpx] w-full">
+                class="text-[30rpx] grid gap-[8rpx] bg-white px-[30rpx] py-[20rpx]  rounded-[16rpx] w-full">
                 <view class="text-[32rpx] font-600">{{ val.title }}</view>
                 <view
                     class="text-[24rpx] text-[#333] bg-[url(https://lwzk.ycymedu.com/img/qt/wd_jianbian.png)] bg-no-repeat bg-origin-border bg-left px-[12rpx]">
@@ -86,7 +90,7 @@ onShow(() => {
 
             <view class="w-full mt-[70rpx]">
                 <view class="pb-safe px-[94rpx] py-[16rpx]">
-                    <button class="rounded-full bg-[#1580FF] text-[#fff] ">创建志愿表</button>
+                    <button class="rounded-full bg-[#1580FF] text-[#fff]" @click="navigateToWish">创建志愿表</button>
                 </view>
             </view>
         </view>
diff --git a/src/pages-sub/talented/create/artFirst.vue b/src/pages-sub/talented/create/artFirst.vue
index d601328..310dcb7 100644
--- a/src/pages-sub/talented/create/artFirst.vue
+++ b/src/pages-sub/talented/create/artFirst.vue
@@ -235,19 +235,19 @@ onLoad(() => {
           :options="genderClassification" label-key="label" value-key="value"
           custom-root-cols-class="grid grid-cols-2 items-center gap-[16rpx]"
           custom-root-class="pb-[20rpx]" custom-item-class="py-[12rpx] text-center "
-          active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none" />
+          active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none"  @change="visible = false" />
 
         <MxRadio v-model:value="userInfo.userExtend.gradeId" v-model:label="userInfo.userExtend.gradeName"
           v-if="activeType == 'grade'" :options="gradeClassification" label-key="label" value-key="value"
           custom-root-cols-class="grid grid-cols-3 items-center gap-[16rpx]"
           custom-root-class="pb-[20rpx]" custom-item-class="py-[12rpx] text-center "
-          active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none" />
+          active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none"  @change="visible = false" />
 
         <MxRadio v-model:value="userInfo.talentExtend.specialtyDirection" v-if="activeType == 'artDirection'"
           :options="artList" label-key="label" value-key="value"
           custom-root-cols-class="grid grid-cols-3 items-center gap-[16rpx]"
           custom-root-class="pb-[20rpx]" custom-item-class="py-[12rpx] text-center "
-          active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none" />
+          active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none"  @change="visible = false" />
 
       </view>
     </sar-popup>
diff --git a/src/pages-sub/talented/create/artSecond.vue b/src/pages-sub/talented/create/artSecond.vue
index 2e1e0d4..a199023 100644
--- a/src/pages-sub/talented/create/artSecond.vue
+++ b/src/pages-sub/talented/create/artSecond.vue
@@ -204,7 +204,7 @@ onLoad(() => {
                     :options="yearClassification" label-key="label" value-key="label"
                     custom-root-cols-class="grid grid-cols-3 items-center gap-[16rpx]"
                     custom-root-class="pb-[20rpx]" custom-item-class="py-[12rpx] text-center "
-                    active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none" />
+                    active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none"  @change="visible = false"/>
 
             </view>
         </sar-popup>
diff --git a/src/pages-sub/talented/create/sportsFirst.vue b/src/pages-sub/talented/create/sportsFirst.vue
index 53b1b94..c2e72e6 100644
--- a/src/pages-sub/talented/create/sportsFirst.vue
+++ b/src/pages-sub/talented/create/sportsFirst.vue
@@ -34,7 +34,7 @@ const handleBack = () => {
     uni.navigateBack({ delta: 1 })
 }
 
-const genderClassification = [{ label: '男', value: 1 }, { label: '女', value: 2 }]
+const genderClassification = [{ label: '男', value: "1" }, { label: '女', value: "2" }]
 const gradeClassification = ref([])
 const areaList = ref([])
 
@@ -251,19 +251,19 @@ onShow(() => {
                     :options="genderClassification" label-key="label" value-key="value"
                     custom-root-cols-class="grid grid-cols-2 items-center gap-[16rpx]"
                     custom-root-class="pb-[20rpx]" custom-item-class="py-[12rpx] text-center "
-                    active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none" />
+                    active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none"  @change="visible = false" />
 
                 <MxRadio v-model:value="userInfo.userExtend.gradeId" v-model:label="userInfo.userExtend.gradeName"
                     v-if="activeType == 'grade'" :options="gradeClassification" label-key="label" value-key="value"
                     custom-root-cols-class="grid grid-cols-3 items-center gap-[16rpx]"
                     custom-root-class=" pb-[20rpx]" custom-item-class="py-[12rpx] text-center "
-                    active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none" />
+                    active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none"  @change="visible = false" />
 
                 <MxRadio v-model:value="userInfo.userExtend.area" v-if="activeType == 'examinationArea'"
                     :options="areaList" label-key="label" value-key="value"
                     custom-root-cols-class="grid grid-cols-3 items-center gap-[16rpx]"
                     custom-root-class="pb-[20rpx]" custom-item-class="py-[12rpx] text-center "
-                    active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none" />
+                    active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none"  @change="visible = false" />
 
             </view>
         </sar-popup>
diff --git a/src/pages-sub/talented/create/sportsSecond.vue b/src/pages-sub/talented/create/sportsSecond.vue
index 24914ff..3796de8 100644
--- a/src/pages-sub/talented/create/sportsSecond.vue
+++ b/src/pages-sub/talented/create/sportsSecond.vue
@@ -252,13 +252,13 @@ onLoad(() => {
                     :options="projectClassification" label-key="label" value-key="value"
                     custom-root-cols-class="grid grid-cols-3 items-center gap-[16rpx]" :label-string="true"
                     custom-root-class="pb-[20rpx]" custom-item-class="py-[12rpx] text-center "
-                    active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none" />
+                    active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none"  @change="visible = false"/>
 
                 <MxRadio v-model:value="userInfo.talentExtend.ageLimit" v-if="activeType == 'year'"
                     :options="yearClassification" label-key="label" value-key="label"
                     custom-root-cols-class="grid grid-cols-3 items-center gap-[16rpx]"
                     custom-root-class="pb-[20rpx]" custom-item-class="py-[12rpx] text-center "
-                    active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none" />
+                    active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none"  @change="visible = false"/>
 
             </view>
         </sar-popup>
diff --git a/src/pages-sub/wishlist/create/components/FirstBatchSchool.vue b/src/pages-sub/wishlist/create/components/FirstBatchSchool.vue
index 652fc78..c1cae76 100644
--- a/src/pages-sub/wishlist/create/components/FirstBatchSchool.vue
+++ b/src/pages-sub/wishlist/create/components/FirstBatchSchool.vue
@@ -17,12 +17,12 @@ const chooseData = ref([])
 const wishlistStore = useWishlistStore()
 const handleChoose = (val) => {
   chooseData.value.splice(0, 1, val.schoolId)
-  if(wishlistStore.getSchool()){
+  if (wishlistStore.getSchool()) {
     const exitsSchool = JSON.parse(wishlistStore.getSchool())
-    const willSchool = exitsSchool.schools.filter((item)=>{item.type !== '指标生'})
-    wishlistStore.setSchool(JSON.stringify({schools:[{...val,type:'firstBatch'},...willSchool]}))
-  }else{
-    wishlistStore.setSchool(JSON.stringify({schools:[{...val,type:'firstBatch'}]})) 
+    const willSchool = exitsSchool.schools.filter((item) => { item.type !== '指标生' })
+    wishlistStore.setSchool(JSON.stringify({ schools: [{ ...val, type: 'firstBatch' }, ...willSchool] }))
+  } else {
+    wishlistStore.setSchool(JSON.stringify({ schools: [{ ...val, type: 'firstBatch' }] }))
   }
 }
 
@@ -65,7 +65,7 @@ const handleChangeSchool = () => {
       }
     })
     console.log(cwbs.value);
-    
+
     totalCount.value = Number(resp.result.chongCount) + Number(resp.result.wenCount) + Number(resp.result.baoCount)
   })
 }
@@ -102,8 +102,7 @@ onLoad(() => {
         @click="handleOpenPop('school')">
         <view class="mr-[10rpx]">全部({{ totalCount }})</view>
         <view class="w-[18rpx] h-[18rpx] flex items-center">
-          <image src="https://lwzk.ycymedu.com/img/qt/qt_quyu.png" mode="scaleToFill"
-            class="w-[18rpx] h-[18rpx]" />
+          <image src="https://lwzk.ycymedu.com/img/qt/qt_quyu.png" mode="scaleToFill" class="w-[18rpx] h-[18rpx]" />
         </view>
       </view>
 
@@ -111,8 +110,7 @@ onLoad(() => {
         @click="handleOpenPop('nature')">
         <view class="mr-[10rpx]">办学性质</view>
         <view class="w-[18rpx] h-[18rpx] flex items-center">
-          <image src="https://lwzk.ycymedu.com/img/qt/qt_quyu.png" mode="scaleToFill"
-            class="w-[18rpx] h-[18rpx]" />
+          <image src="https://lwzk.ycymedu.com/img/qt/qt_quyu.png" mode="scaleToFill" class="w-[18rpx] h-[18rpx]" />
         </view>
       </view>
 
@@ -120,13 +118,13 @@ onLoad(() => {
         @click="handleOpenPop('region')">
         <view class="mr-[10rpx]">所在地区</view>
         <view class="w-[18rpx] h-[18rpx] flex items-center">
-          <image src="https://lwzk.ycymedu.com/img/qt/qt_quyu.png" mode="scaleToFill"
-            class="w-[18rpx] h-[18rpx]" />
+          <image src="https://lwzk.ycymedu.com/img/qt/qt_quyu.png" mode="scaleToFill" class="w-[18rpx] h-[18rpx]" />
         </view>
       </view>
 
-      <MxSearch v-model:searchText="searchParams.keyword" root-class="py-[14rpx]! px-[20rpx]! w-[166rpx] rounded-[12rpx]!" :clear-icon="false"
-        placeholder="请输入" @complete="handleChangeSchool"/>
+      <MxSearch v-model:searchText="searchParams.keyword"
+        root-class="py-[14rpx]! px-[20rpx]! w-[166rpx] rounded-[12rpx]!" :clear-icon="false" placeholder="请输入"
+        @complete="handleChangeSchool" />
     </view>
     <view v-if="tableData.length === 0"
       class="flex flex-col items-center justify-center bg-[#F7F7F7] min-h-[240rpx] rounded-[16rpx]">
@@ -170,44 +168,41 @@ onLoad(() => {
       </sar-table>
     </view>
 
-    <sar-popout :show-close="false" :show-footer="false" v-model:visible="popVisible"
-      root-style="--sar-popout-header-loose-padding-x:30rpx;" root-class="min-h-[560rpx]" @leave="handleChangeSchool">
-      <template #title>
-        <view class="flex items-center justify-between w-full">
-          <view class="text-[34rpx] font-500">{{ popType === 'school' ? '全部学校' : (popType ===
+    <sar-popup :visible="popVisible" effect="slide-bottom" root-class="min-h-[560rpx]" @leave="handleChangeSchool">
+      <view class="bg-white rounded-[24rpx_24rpx_0_0] px-[30rpx] pb-safe pt-[30rpx] min-h-[492rpx]">
+        <view class="text-[34rpx] font-500 flex items-center justify-between mb-[30rpx]">
+          <view>{{ popType === 'school' ? '全部学校' : (popType ===
             'nature' ? '请选择办学性质' : '请选择所在区(可多选)') }}</view>
           <view class="w-[36rpx] h-[36rpx] flex items-center" @click="popVisible = false">
             <image src="https://lwzk.ycymedu.com/img/tianbao/tb_guanbi.png" mode="scaleToFill"
               class="w-[36rpx] h-[36rpx]" />
           </view>
         </view>
-      </template>
-      <view>
-        <view class="px-[30rpx]">
-          <MxRadio v-model:value="searchParams.cwb" v-model:label="searchParams.cwbLabel" :options="cwbs" 
-            label-key="label" value-key="value" custom-root-cols-class="grid grid-cols-3 items-center gap-[16rpx]"
-            custom-root-class="pt-[30rpx] pb-[16rpx]"
-            custom-item-class="py-[12rpx] text-center border-1 border-solid border-[#F3F4F8]"
-            active-item-class="bg-white text-[#1580FF] border-1 border-solid border-[#1580FF]!"
-            v-if="popType === 'school'" @change="popVisible = false"/>
-          <MxRadio v-model:value="searchParams.nature" v-model:label="searchParams.natureLabel" :options="natureList" 
-            label-key="label" value-key="value" custom-root-cols-class="grid grid-cols-2 items-center gap-[16rpx]"
-            custom-root-class="pt-[30rpx] pb-[16rpx]"
-            custom-item-class="py-[12rpx] text-center border-1 border-solid border-[#F3F4F8]"
-            active-item-class="bg-white text-[#1580FF] border-1 border-solid border-[#1580FF]!"
-            v-if="popType === 'nature'" @change="popVisible = false"/>
-          <MxCheckbox v-model:value="searchParams.region" :options="regions" label-key="label" value-key="value" 
-            custom-root-class="pt-[30rpx] pb-[16rpx]" custom-item-class="w-full py-[16rpx] text-center"
-            v-if="popType === 'region'" />
-        </view>
+        <MxRadio v-model:value="searchParams.cwb" v-model:label="searchParams.cwbLabel" :options="cwbs"
+          label-key="label" value-key="value" custom-root-cols-class="grid grid-cols-3 items-center gap-[16rpx]"
+          custom-root-class="pb-[16rpx]"
+          custom-item-class="py-[16rpx] text-center border-1 border-solid border-[#F3F4F8]"
+          active-item-class="bg-white text-[#1580FF] border-1 border-solid border-[#1580FF]!"
+          v-if="popType === 'school'" @change="popVisible = false" />
+        <MxRadio v-model:value="searchParams.nature" v-model:label="searchParams.natureLabel" :options="natureList"
+          label-key="label" value-key="value" custom-root-cols-class="grid grid-cols-2 items-center gap-[16rpx]"
+          custom-root-class="pb-[16rpx]"
+          custom-item-class="py-[16rpx] text-center border-1 border-solid border-[#F3F4F8]"
+          active-item-class="bg-white text-[#1580FF] border-1 border-solid border-[#1580FF]!"
+          v-if="popType === 'nature'" @change="popVisible = false" />
+        <MxCheckbox v-model:value="searchParams.region" :options="regions" label-key="label" value-key="value"
+          custom-root-class="pb-[16rpx]" custom-item-class="w-full py-[16rpx] text-center"
+          v-if="popType === 'region'" />
         <view class="grid grid-cols-2 gap-[20rpx] border-t-[1rpx] border-t-solid border-t-[#eee] pt-[16rpx] px-[30rpx]"
           v-if="popType === 'region'">
-          <view class="text-[34rpx] font-500 text-[#333] bg-[#F5F5F5] rounded-[12rpx] py-[20rpx] text-center" @click="handleCancel">
+          <view class="text-[34rpx] font-500 text-[#333] bg-[#F5F5F5] rounded-[12rpx] py-[20rpx] text-center"
+            @click="handleCancel">
             取消</view>
-          <view class="text-[34rpx] font-500 text-white bg-[#1580FF] rounded-[12rpx] py-[20rpx] text-center" @click="handleChangeSchool">确定</view>
+          <view class="text-[34rpx] font-500 text-white bg-[#1580FF] rounded-[12rpx] py-[20rpx] text-center"
+            @click="handleChangeSchool">确定</view>
         </view>
       </view>
-    </sar-popout>
+    </sar-popup>
   </view>
 </template>
 
diff --git a/src/pages-sub/wishlist/create/components/SecondBatchSchool.vue b/src/pages-sub/wishlist/create/components/SecondBatchSchool.vue
index c54ff1b..b0fc204 100644
--- a/src/pages-sub/wishlist/create/components/SecondBatchSchool.vue
+++ b/src/pages-sub/wishlist/create/components/SecondBatchSchool.vue
@@ -63,8 +63,8 @@ const handleOpenPop = (type: string) => {
 }
 
 const handleCancel = () => {
-  searchParams.value.region = []
-  popVisible.value = false;
+    searchParams.value.region = []
+    popVisible.value = false;
 }
 
 
@@ -192,49 +192,44 @@ onLoad(() => {
             </sar-table>
         </view>
 
-        <sar-popout :show-close="false" :show-footer="false" v-model:visible="popVisible"
-            root-style="--sar-popout-header-loose-padding-x:30rpx;" root-class="min-h-[560rpx]" @leave="handleChangeSchool">
-            <template #title>
-                <view class="flex items-center justify-between w-full">
-                    <view class="text-[34rpx] font-500">{{ popType === 'school' ? '全部学校' : (popType === 'nature' ?
+        <sar-popup :visible="popVisible" effect="slide-bottom" root-class="min-h-[560rpx]" @leave="handleChangeSchool">
+            <view class="bg-white rounded-[24rpx_24rpx_0_0] px-[30rpx] pb-safe pt-[30rpx] min-h-[492rpx]">
+                <view class="text-[34rpx] font-500 flex items-center justify-between mb-[30rpx]">
+                    <view>{{ popType === 'school' ? '全部学校' : (popType === 'nature' ?
                         '请选择办学性质' : '请选择所在区(可多选)') }}</view>
                     <view class="w-[36rpx] h-[36rpx] flex items-center" @click="popVisible = false">
                         <image src="https://lwzk.ycymedu.com/img/tianbao/tb_guanbi.png" mode="scaleToFill"
                             class="w-[36rpx] h-[36rpx]" />
                     </view>
+                </view>
+                <MxRadio v-model:value="searchParams.cwb" v-model:label="searchParams.cwbLabel" :options="cwbs"
+                    label-key="label" value-key="value"
+                    custom-root-cols-class="grid grid-cols-3 items-center gap-[16rpx]" custom-root-class=" pb-[16rpx]"
+                    custom-item-class="py-[16rpx] text-center border-1 border-solid border-[#F3F4F8]"
+                    active-item-class="bg-white text-[#1580FF] border-1 border-solid border-[#1580FF]!"
+                    v-if="popType === 'school'" @change="popVisible = false" />
+                <MxRadio v-model:value="searchParams.nature" v-model:label="searchParams.natureLabel"
+                    :options="natureList" label-key="label" value-key="value"
+                    custom-root-cols-class="grid grid-cols-2 items-center gap-[16rpx]" custom-root-class=" pb-[16rpx]"
+                    custom-item-class="py-[16rpx] text-center border-1 border-solid border-[#F3F4F8]"
+                    active-item-class="bg-white text-[#1580FF] border-1 border-solid border-[#1580FF]!"
+                    v-if="popType === 'nature'" @change="popVisible = false" />
+                <MxCheckbox v-model:value="searchParams.region" :options="regions" label-key="label" value-key="value"
+                    custom-root-class=" pb-[16rpx]" custom-item-class="w-full py-[16rpx] text-center"
+                    v-if="popType === 'region'" />
 
-                </view>
-            </template>
-            <view>
-                <view class="px-[30rpx]">
-                    <MxRadio v-model:value="searchParams.cwb" v-model:label="searchParams.cwbLabel" :options="cwbs"
-                        label-key="label" value-key="value"
-                        custom-root-cols-class="grid grid-cols-3 items-center gap-[16rpx]"
-                        custom-root-class="pt-[30rpx] pb-[16rpx]"
-                        custom-item-class="py-[12rpx] text-center border-1 border-solid border-[#F3F4F8]"
-                        active-item-class="bg-white text-[#1580FF] border-1 border-solid border-[#1580FF]!"
-                        v-if="popType === 'school'"  @change="popVisible = false"/>
-                    <MxRadio v-model:value="searchParams.nature" v-model:label="searchParams.natureLabel"
-                        :options="natureList" label-key="label" value-key="value"
-                        custom-root-cols-class="grid grid-cols-2 items-center gap-[16rpx]"
-                        custom-root-class="pt-[30rpx] pb-[16rpx]"
-                        custom-item-class="py-[12rpx] text-center border-1 border-solid border-[#F3F4F8]"
-                        active-item-class="bg-white text-[#1580FF] border-1 border-solid border-[#1580FF]!"
-                        v-if="popType === 'nature'"  @change="popVisible = false"/>
-                    <MxCheckbox v-model:value="searchParams.region" :options="regions" label-key="label"
-                        value-key="value" custom-root-class="pt-[30rpx] pb-[16rpx]"
-                        custom-item-class="w-full py-[16rpx] text-center" v-if="popType === 'region'" />
-                </view>
                 <view
                     class="grid grid-cols-2 gap-[20rpx] border-t-[1rpx] border-t-solid border-t-[#eee] pt-[16rpx] px-[30rpx]"
                     v-if="popType === 'region'">
-                    <view class="text-[34rpx] font-500 text-[#333] bg-[#F5F5F5] rounded-[12rpx] py-[20rpx] text-center"  @click="handleCancel">
+                    <view class="text-[34rpx] font-500 text-[#333] bg-[#F5F5F5] rounded-[12rpx] py-[20rpx] text-center"
+                        @click="handleCancel">
                         取消</view>
-                    <view class="text-[34rpx] font-500 text-white bg-[#1580FF] rounded-[12rpx] py-[20rpx] text-center"  @click="handleChangeSchool">
+                    <view class="text-[34rpx] font-500 text-white bg-[#1580FF] rounded-[12rpx] py-[20rpx] text-center"
+                        @click="handleChangeSchool">
                         确定</view>
                 </view>
             </view>
-        </sar-popout>
+        </sar-popup>
     </view>
 </template>
 
diff --git a/src/pages-sub/wishlist/create/components/ThirdBatchSchool.vue b/src/pages-sub/wishlist/create/components/ThirdBatchSchool.vue
index 5d8958b..f51af88 100644
--- a/src/pages-sub/wishlist/create/components/ThirdBatchSchool.vue
+++ b/src/pages-sub/wishlist/create/components/ThirdBatchSchool.vue
@@ -34,11 +34,11 @@ const handleChoose = (val) => {
         chooseDataMap.set(val.schoolId, val)
     }
     let tempSchool = []
-    chooseDataMap.forEach((val,key)=>{
-        tempSchool.push({...val,type:"thirdBatch"})
+    chooseDataMap.forEach((val, key) => {
+        tempSchool.push({ ...val, type: "thirdBatch" })
     })
 
-    wishlistStore.setSchool(JSON.stringify({schools:tempSchool}))
+    wishlistStore.setSchool(JSON.stringify({ schools: tempSchool }))
 }
 
 const popVisible = ref(false)
@@ -80,13 +80,13 @@ const handleChangeSchool = () => {
             }
         })
         console.log(cwbs.value);
-        
+
         totalCount.value = Number(resp.result.chongCount) + Number(resp.result.wenCount) + Number(resp.result.baoCount)
     })
 }
 const handleCancel = () => {
-  searchParams.value.region = []
-  popVisible.value = false;
+    searchParams.value.region = []
+    popVisible.value = false;
 }
 
 
@@ -115,7 +115,7 @@ onLoad(() => {
             <view
                 class="text-[24rpx] text-[#303030] flex items-center py-[12rpx] px-[20rpx] bg-[#F3F4F8] rounded-[12rpx]"
                 @click="handleOpenPop('school')">
-                <view class="mr-[10rpx]">全部({{ totalCount  }})</view>
+                <view class="mr-[10rpx]">全部({{ totalCount }})</view>
                 <view class="w-[18rpx] h-[18rpx] flex items-center">
                     <image src="https://lwzk.ycymedu.com/img/qt/qt_quyu.png" mode="scaleToFill"
                         class="w-[18rpx] h-[18rpx]" />
@@ -179,9 +179,10 @@ onLoad(() => {
 
                     <sar-table-cell width="15%">
                         <view class="flex items-center justify-center" @click="handleChoose(record)">
-                            <view class="w-[36rpx] h-[36rpx] flex items-center" v-if="chooseData.includes(record.schoolId)">
-                                <image src="https://lwzk.ycymedu.com/img/tianbao/tb_duoxuan.png"
-                                    mode="scaleToFill" class="w-[36rpx] h-[36rpx]" />
+                            <view class="w-[36rpx] h-[36rpx] flex items-center"
+                                v-if="chooseData.includes(record.schoolId)">
+                                <image src="https://lwzk.ycymedu.com/img/tianbao/tb_duoxuan.png" mode="scaleToFill"
+                                    class="w-[36rpx] h-[36rpx]" />
                             </view>
                             <sar-icon name="square" size="36rpx" color="#CCC" v-else></sar-icon>
                         </view>
@@ -190,49 +191,44 @@ onLoad(() => {
             </sar-table>
         </view>
 
-        <sar-popout :show-close="false" :show-footer="false" v-model:visible="popVisible"
-            root-style="--sar-popout-header-loose-padding-x:30rpx;" root-class="min-h-[560rpx]" @leave="handleChangeSchool">
-            <template #title>
-                <view class="flex items-center justify-between w-full">
-                    <view class="text-[34rpx] font-500">{{ popType === 'school' ? '全部学校' : (popType === 'nature' ?
+        <sar-popup :visible="popVisible" effect="slide-bottom" root-class="min-h-[560rpx]" @leave="handleChangeSchool">
+            <view class="bg-white rounded-[24rpx_24rpx_0_0] px-[30rpx] pb-safe pt-[30rpx] min-h-[492rpx]">
+                <view class="text-[34rpx] font-500 flex items-center justify-between mb-[30rpx]">
+                    <view>{{ popType === 'school' ? '全部学校' : (popType === 'nature' ?
                         '请选择办学性质' : '请选择所在区(可多选)') }}</view>
                     <view class="w-[36rpx] h-[36rpx] flex items-center" @click="popVisible = false">
-                        <image src="https://lwzk.ycymedu.com/img/tianbao/tb_guanbi.png"
-                            mode="scaleToFill" class="w-[36rpx] h-[36rpx]" />
+                        <image src="https://lwzk.ycymedu.com/img/tianbao/tb_guanbi.png" mode="scaleToFill"
+                            class="w-[36rpx] h-[36rpx]" />
                     </view>
+                </view>
+                <MxRadio v-model:value="searchParams.cwb" v-model:label="searchParams.cwbLabel" :options="cwbs"
+                    label-key="label" value-key="value"
+                    custom-root-cols-class="grid grid-cols-3 items-center gap-[16rpx]" custom-root-class=" pb-[16rpx]"
+                    custom-item-class="py-[12rpx] text-center border-1 border-solid border-[#F3F4F8]"
+                    active-item-class="bg-white text-[#1580FF] border-1 border-solid border-[#1580FF]!"
+                    v-if="popType === 'school'" @change="popVisible = false" />
+                <MxRadio v-model:value="searchParams.nature" v-model:label="searchParams.natureLabel"
+                    :options="natureList" label-key="label" value-key="value"
+                    custom-root-cols-class="grid grid-cols-2 items-center gap-[16rpx]" custom-root-class=" pb-[16rpx]"
+                    custom-item-class="py-[12rpx] text-center border-1 border-solid border-[#F3F4F8]"
+                    active-item-class="bg-white text-[#1580FF] border-1 border-solid border-[#1580FF]!"
+                    v-if="popType === 'nature'" @change="popVisible = false" />
+                <MxCheckbox v-model:value="searchParams.region" :options="regions" label-key="label" value-key="value"
+                    custom-root-class=" pb-[16rpx]" custom-item-class="w-full py-[16rpx] text-center"
+                    v-if="popType === 'region'" />
 
-                </view>
-            </template>
-            <view>
-                <view class="px-[30rpx]">
-                    <MxRadio v-model:value="searchParams.cwb" v-model:label="searchParams.cwbLabel" :options="cwbs"
-                        label-key="label" value-key="value"
-                        custom-root-cols-class="grid grid-cols-3 items-center gap-[16rpx]"
-                        custom-root-class="pt-[30rpx] pb-[16rpx]"
-                        custom-item-class="py-[12rpx] text-center border-1 border-solid border-[#F3F4F8]"
-                        active-item-class="bg-white text-[#1580FF] border-1 border-solid border-[#1580FF]!"
-                        v-if="popType === 'school'"  @change="popVisible = false"/>
-                    <MxRadio v-model:value="searchParams.nature" v-model:label="searchParams.natureLabel"
-                        :options="natureList" label-key="label" value-key="value"
-                        custom-root-cols-class="grid grid-cols-2 items-center gap-[16rpx]"
-                        custom-root-class="pt-[30rpx] pb-[16rpx]"
-                        custom-item-class="py-[12rpx] text-center border-1 border-solid border-[#F3F4F8]"
-                        active-item-class="bg-white text-[#1580FF] border-1 border-solid border-[#1580FF]!"
-                        v-if="popType === 'nature'"  @change="popVisible = false"/>
-                    <MxCheckbox v-model:value="searchParams.region" :options="regions" label-key="label"
-                        value-key="value" custom-root-class="pt-[30rpx] pb-[16rpx]"
-                        custom-item-class="w-full py-[16rpx] text-center" v-if="popType === 'region'" />
-                </view>
                 <view
                     class="grid grid-cols-2 gap-[20rpx] border-t-[1rpx] border-t-solid border-t-[#eee] pt-[16rpx] px-[30rpx]"
                     v-if="popType === 'region'">
-                    <view class="text-[34rpx] font-500 text-[#333] bg-[#F5F5F5] rounded-[12rpx] py-[20rpx] text-center" @click="handleCancel">
+                    <view class="text-[34rpx] font-500 text-[#333] bg-[#F5F5F5] rounded-[12rpx] py-[20rpx] text-center"
+                        @click="handleCancel">
                         取消</view>
-                    <view class="text-[34rpx] font-500 text-white bg-[#1580FF] rounded-[12rpx] py-[20rpx] text-center" @click="handleChangeSchool">
+                    <view class="text-[34rpx] font-500 text-white bg-[#1580FF] rounded-[12rpx] py-[20rpx] text-center"
+                        @click="handleChangeSchool">
                         确定</view>
                 </view>
             </view>
-        </sar-popout>
+        </sar-popup>
     </view>
 </template>
 
diff --git a/src/pages-sub/wishlist/create/saveFirstBatchWishList.vue b/src/pages-sub/wishlist/create/saveFirstBatchWishList.vue
index c9280f7..303fffb 100644
--- a/src/pages-sub/wishlist/create/saveFirstBatchWishList.vue
+++ b/src/pages-sub/wishlist/create/saveFirstBatchWishList.vue
@@ -6,7 +6,7 @@ import { storeToRefs } from "pinia"
 
 const wishlistStore = useWishlistStore()
 
-const {extendWishlist} = storeToRefs(wishlistStore)
+const { extendWishlist } = storeToRefs(wishlistStore)
 
 definePage({
     style: {
@@ -19,18 +19,18 @@ const show = ref(false)
 const handleSave = () => {
     show.value = true
 }
-const handleSubmit = () =>{
-    saveWishlist({data:{title:wishListName.value,contents:extendWishlist.value.contents,batchName:'第一批次',TotalScore:totalScore.value}}).then(resp => {
-        if(resp.code === 200){
+const handleSubmit = () => {
+    saveWishlist({ data: { title: wishListName.value, contents: extendWishlist.value.contents, batchName: '第一批次', TotalScore: totalScore.value } }).then(resp => {
+        if (resp.code === 200) {
             show.value = false
             wishlistStore.clearExtendWishlist();
-            uni.switchTab({url:"/pages/index/index"})
+            uni.switchTab({ url: "/pages/index/index" })
         }
     })
 }
 const navigateToHome = () => {
     wishlistStore.clearExtendWishlist();
-    uni.switchTab({url:"/pages/index/index"})
+    uni.switchTab({ url: "/pages/index/index" })
 }
 
 
@@ -41,9 +41,9 @@ const totalScore = ref(0)
 
 onShow(() => {
     getMyScore().then(resp => {
-      if (resp.code === 200 && resp.result) {
-        totalScore.value = resp.result.totalScore
-      }
+        if (resp.code === 200 && resp.result) {
+            totalScore.value = resp.result.totalScore
+        }
     })
 })
 
@@ -61,7 +61,8 @@ onBackPress(() => {
                     <view
                         class="text-[30rpx] text-[#333] grid gap-[8rpx] bg-white px-[30rpx] py-[20rpx] not-last:mb-[30rpx] rounded-[16rpx] w-full">
                         <view class="text-[32rpx] font-600">{{ val.schoolName }}</view>
-                        <view class="text-[24rpx] text-[#333]">{{new Date().getFullYear()}}计划招生：{{val.planCount}}人</view>
+                        <view class="text-[24rpx] text-[#333]">{{ new Date().getFullYear() }}计划招生：{{ val.planCount }}人
+                        </view>
                         <!-- <view class="flex items-center text-[24rpx] gap-[14rpx]">
                             <view class="text-[#666] bg-[#F8F8F8] rounded-[8rpx] px-[10rpx] py-[4rpx]"
                                 v-for="value in 2" :key="value">重点高中</view>
@@ -71,14 +72,14 @@ onBackPress(() => {
                         </view>
                     </view>
                     <view class="w-[86rpx] h-[56rpx] ml-[-76rpx] mt-[26rpx]" v-if="val.type === '指标生'">
-                        <image src="https://lwzk.ycymedu.com/img/tianbao/tb_zhibiao.png"
-                            mode="scaleToFill" class="w-[86rpx] h-[56rpx]" />
+                        <image src="https://lwzk.ycymedu.com/img/tianbao/tb_zhibiao.png" mode="scaleToFill"
+                            class="w-[86rpx] h-[56rpx]" />
                     </view>
                 </view>
                 <view class=" bg-[#FEF6F6] rounded-[16rpx] mt-[30rpx]">
                     <view class="h-[52rpx] w-[178rpx] flex items-center m-[-8rpx] ml-[20rpx]">
-                        <image src="https://lwzk.ycymedu.com/img/tianbao/tb_shuoming.png"
-                            mode="scaleToFill" class="h-[52rpx] w-[178rpx]" />
+                        <image src="https://lwzk.ycymedu.com/img/tianbao/tb_shuoming.png" mode="scaleToFill"
+                            class="h-[52rpx] w-[178rpx]" />
                     </view>
 
                     <view class="flex flex-col text-[#E03C33] py-[20rpx] pl-[26rpx] pr-[34rpx]">
@@ -95,7 +96,8 @@ onBackPress(() => {
                 </view>
             </view>
             <view class="grid grid-cols-2 gap-[20rpx] px-[28rpx] py-[16rpx]">
-                <view class="rounded-[16rpx] bg-[#f5f5f5] text-[#333] text-[36rpx] py-[18rpx] text-center" @click="navigateToHome">重新测评</view>
+                <view class="rounded-[16rpx] bg-[#f5f5f5] text-[#333] text-[36rpx] py-[18rpx] text-center"
+                    @click="navigateToHome">重新测评</view>
                 <view class="rounded-[16rpx] bg-[#1580FF] text-white text-[36rpx] py-[18rpx] text-center"
                     @click="handleSave">保存志愿表</view>
             </view>
@@ -106,16 +108,15 @@ onBackPress(() => {
                 <view class="rounded-[40rpx] bg-white p-[40rpx] custom-background"
                     style="--status-bar-height:56rpx; --start-color:#ebf1ff">
                     <view class="text-[40rpx] font-500 text-center">志愿表名称</view>
-                    <view class="rounded-full py-[20rpx] px-[30rpx] bg-[#F3F4F8] border-[#E5E5E5] border-solid border-[1rpx] flex items-center justify-between my-[60rpx]">
-                        <input type="text" v-model="wishListName" placeholder="请输入名字" confirm-type="done"
+                    <view
+                        class="rounded-full py-[20rpx] px-[30rpx] bg-[#F3F4F8] border-[#E5E5E5] border-solid border-[1rpx] flex items-center justify-between my-[60rpx]">
+                        <input type="text" v-model="wishListName" placeholder="请输入志愿表名称" confirm-type="done"
                             placeholder-style="color:#C5C8D1;font-size:30rpx;text-align:left;" class="text-left flex-1">
-                            <view class="w-[40rpx] h-[40rpx] flex items-center" v-if="wishListName"  @click="wishListName = ''">
-                                <image
-                                    src="https://lwzk.ycymedu.com/img/tianbao/tb_shanchu.png"
-                                    mode="scaleToFill"
-                                    class="w-[40rpx] h-[40rpx]"
-                                />
-                            </view>
+                        <view class="w-[40rpx] h-[40rpx] flex items-center" v-if="wishListName"
+                            @click="wishListName = ''">
+                            <image src="https://lwzk.ycymedu.com/img/tianbao/tb_shanchu.png" mode="scaleToFill"
+                                class="w-[40rpx] h-[40rpx]" />
+                        </view>
                     </view>
                     <view class="grid grid-cols-2 items-center mx-[40rpx] gap-[24rpx]">
 
@@ -133,12 +134,10 @@ onBackPress(() => {
 
 <style lang="scss" scoped>
 .custom-background {
-    background: linear-gradient(180deg, #ecf2ff 0%,#f6f8ff 40rpx, #fff 128rpx);
+    background: linear-gradient(180deg, #ecf2ff 0%, #f6f8ff 40rpx, #fff 128rpx);
     background-position: 50% 50%;
     background-origin: padding-box;
     background-clip: border-box;
     background-size: auto auto;
 }
-
-
 </style>
diff --git a/src/pages-sub/wishlist/create/saveSecondBatchWishList.vue b/src/pages-sub/wishlist/create/saveSecondBatchWishList.vue
index b98c0a3..6af8dce 100644
--- a/src/pages-sub/wishlist/create/saveSecondBatchWishList.vue
+++ b/src/pages-sub/wishlist/create/saveSecondBatchWishList.vue
@@ -102,7 +102,7 @@ onBackPress(() => {
                     style="--status-bar-height:56rpx; --start-color:#ebf1ff">
                     <view class="text-[40rpx] font-500 text-center">志愿表名称</view>
                     <view class="rounded-full py-[20rpx] px-[30rpx] bg-[#F3F4F8] border-[#E5E5E5] border-solid border-[1rpx] flex items-center justify-between my-[60rpx]">
-                        <input type="text" v-model="wishListName" placeholder="请输入姓名" confirm-type="done"
+                        <input type="text" v-model="wishListName" placeholder="请输入志愿表名称" confirm-type="done"
                             placeholder-style="color:#C5C8D1;font-size:30rpx;text-align:left;" class="text-left flex-1">
                             <view class="w-[40rpx] h-[40rpx] flex items-center" v-if="wishListName" @click="wishListName = ''">
                                 <image
diff --git a/src/pages-sub/wishlist/create/saveThirdBatchWishList.vue b/src/pages-sub/wishlist/create/saveThirdBatchWishList.vue
index 57bac36..66f613d 100644
--- a/src/pages-sub/wishlist/create/saveThirdBatchWishList.vue
+++ b/src/pages-sub/wishlist/create/saveThirdBatchWishList.vue
@@ -84,7 +84,7 @@ onBackPress(() => {
                     <view class="text-[40rpx] font-500 text-center">志愿表名称</view>
                     <view
                         class="rounded-full py-[20rpx] px-[30rpx] bg-[#F3F4F8] border-[#E5E5E5] border-solid border-[1rpx] flex items-center justify-between my-[60rpx]">
-                        <input type="text" v-model="wishListName" placeholder="请输入姓名" confirm-type="done"
+                        <input type="text" v-model="wishListName" placeholder="请输入志愿表名称" confirm-type="done"
                             placeholder-style="color:#C5C8D1;font-size:30rpx;text-align:left;" class="text-left flex-1">
                         <view class="w-[40rpx] h-[40rpx] flex items-center" v-if="wishListName"  @click="wishListName = ''">
                             <image src="https://lwzk.ycymedu.com/img/tianbao/tb_shanchu.png"
diff --git a/src/service/requestApi.ts b/src/service/requestApi.ts
index e730366..ff81bcb 100644
--- a/src/service/requestApi.ts
+++ b/src/service/requestApi.ts
@@ -1,24 +1,38 @@
 import request from '@/http/vue-query';
-import { CustomRequestOptions } from '@/http/types';
 import * as API from './types';
 
-export const getAbilityDimension = () => { }
+export const getAbilityDimension = (options: any) => {
+    return request<API.Response>("/api/busscale/GetAbilityDimension", { method: "GET", ...options })
+}
 
-export const getMBTIDimension = () => { }
+export const getMBTIDimension = (options: any) => {
+return request<API.Response>("/api/busScale/GetMBTIDimension", { method: "GET", ...options })
+}
 
 export const getHollandDimensionInfo = (options: any) => {
     return request<API.Response>("/api/busScale/GetHollandDimension", { method: "GET", ...options })
 }
 
-export const getOpinionAbout = () => { }
+export const getOpinionAbout = (options: any) => { 
+   return request<API.Response>("/api/busScale/GetOpinionAbout", { method: "GET", ...options }) 
+}
 
-export const getCustomScaleExplains = () => { }
+export const getCustomScaleExplains = (options: any) => {
+    return request<API.Response>("/api/busScale/GetCustomScaleExplains", { method: "GET", ...options })
+ }
 
-export const getTagMapPro = () => { }
+export const getTagMapPro = (options: any) => {
+    return request<API.Response>("/api/busScale/getTagMapPro", { method: "GET", ...options })
+}
 
-export const sysDictType = () => { }
+export const sysDictType = (options: any) => {
+    return request<API.Response>("/api/sysDictData/dicStatus", { method: "GET", ...options })
+}
 
-export const getTagMapPerson = () => { }
+
+export const getTagMapPerson = (options: any) => {
+    return request<API.Response>("/api/busScale/getTagMapPerso", { method: "GET", ...options })
+}
 
 export const getMyBusReports = (options: any) => {
     return request<API.Response>('/api/busScale/GetBusCustomReports/v2', { method: "GET", ...options });