From 303284fd96c12fae802c3dbcb34e703b6645445d Mon Sep 17 00:00:00 2001
From: xjs <xjs@ycymedu.com>
Date: Mon, 7 Apr 2025 15:00:35 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=A1=B5=E9=9D=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../composable/rankAreaEchart.ts              |  2 +
 .../academicReport/CapabilityReport.vue       |  4 +-
 .../academicReport/CharacterReport.vue        |  4 +-
 .../academicReport/InterestReport.vue         |  4 +-
 .../academicReport/opinionAboutReport.vue     |  4 +-
 .../evaluate/components/IntroMajor.vue        |  2 +-
 .../evaluate/components/TypeDetail.vue        |  4 +-
 src/pages-evaluation-sub/rank/index.vue       |  6 ++
 src/pages-sub/components/ActionSheet.vue      |  2 +-
 src/pages-sub/components/table/Table.vue      | 26 ++++++--
 src/pages-sub/customerService/index/index.vue |  4 +-
 src/pages-sub/evaluation/assessmentPage.vue   | 13 +++-
 src/pages-sub/home/autoFill/index.vue         |  6 +-
 .../home/career/components/CareerInfo.vue     |  4 +-
 .../career/components/DevelopmentProspect.vue | 12 ++--
 .../career/components/KnowledgeBackground.vue |  8 +--
 .../home/career/components/LeftMenu.vue       |  8 +--
 .../career/components/VocationalSkill.vue     | 18 ++---
 src/pages-sub/home/career/index.vue           |  4 +-
 .../home/college/components/Profile.vue       |  2 +-
 src/pages-sub/home/college/info.vue           | 10 +--
 src/pages-sub/home/components/Phase.vue       |  4 +-
 src/pages-sub/home/distinguish/index.vue      | 17 +++--
 src/pages-sub/home/expand/index.vue           | 27 ++++----
 src/pages-sub/home/inputScore/useRules.ts     |  3 +-
 src/pages-sub/home/line/index.vue             |  8 +--
 src/pages-sub/home/major/index.vue            |  1 -
 .../home/styles/navbar-background.scss        |  2 +-
 .../wishesList/components/CollegeMajor.vue    |  2 +-
 .../home/wishesList/components/DataTable.vue  |  4 +-
 .../wishesList/components/ScrollListItem.vue  |  7 +-
 .../components/ScrollListItemAction.vue       |  3 +-
 src/pages-sub/home/wishesList/index.vue       | 16 ++++-
 src/pages-sub/ucenter/active/activePage.vue   | 13 ++--
 src/pages-sub/ucenter/star/myStar.vue         |  4 +-
 src/pages.json                                |  2 +-
 src/pages/expert/index/index.vue              | 65 +++++++++++--------
 src/pages/home/index/index.vue                |  4 ++
 src/pages/ucenter/index/index.vue             | 16 ++---
 39 files changed, 206 insertions(+), 139 deletions(-)

diff --git a/src/pages-evaluation-sub/composable/rankAreaEchart.ts b/src/pages-evaluation-sub/composable/rankAreaEchart.ts
index 60d9a3a..6ebbdae 100644
--- a/src/pages-evaluation-sub/composable/rankAreaEchart.ts
+++ b/src/pages-evaluation-sub/composable/rankAreaEchart.ts
@@ -26,6 +26,8 @@ export const initRankAreaEchart = ({
         show: false,
       },
       grid: {
+        left: '16',
+        right: '16',
         containLabel: false,
       },
       series: [
diff --git a/src/pages-evaluation-sub/evaluate/academicReport/CapabilityReport.vue b/src/pages-evaluation-sub/evaluate/academicReport/CapabilityReport.vue
index 405cf90..ca7b8ce 100644
--- a/src/pages-evaluation-sub/evaluate/academicReport/CapabilityReport.vue
+++ b/src/pages-evaluation-sub/evaluate/academicReport/CapabilityReport.vue
@@ -7,7 +7,7 @@
 </route>
 
 <template>
-  <scroll-view :scroll-y="true" class="flex flex-col h-screen relative custom-bg">
+  <view class="flex flex-col h-screen relative custom-bg">
     <Navbar
       safeAreaInsetTop
       :bordered="false"
@@ -39,7 +39,7 @@
             <text class="text-[#117CFC] text-[26rpx]">智能AI顾问</text>
           </view> -->
     </view>
-  </scroll-view>
+  </view>
 </template>
 <script setup lang="ts">
 import Navbar from '@/pages-evaluation-sub/components/navbar/Navbar.vue'
diff --git a/src/pages-evaluation-sub/evaluate/academicReport/CharacterReport.vue b/src/pages-evaluation-sub/evaluate/academicReport/CharacterReport.vue
index 5d744e6..a789434 100644
--- a/src/pages-evaluation-sub/evaluate/academicReport/CharacterReport.vue
+++ b/src/pages-evaluation-sub/evaluate/academicReport/CharacterReport.vue
@@ -7,7 +7,7 @@
 </route>
 
 <template>
-  <scroll-view :scroll-y="true" class="flex flex-col h-screen relative custom-bg">
+  <view class="flex flex-col h-screen relative custom-bg">
     <Navbar
       safeAreaInsetTop
       :bordered="false"
@@ -42,7 +42,7 @@
         <text class="text-[#117CFC] text-[26rpx]">智能AI顾问</text>
       </view> -->
     </view>
-  </scroll-view>
+  </view>
 </template>
 <script setup lang="ts">
 import Navbar from '@/pages-evaluation-sub/components/navbar/Navbar.vue'
diff --git a/src/pages-evaluation-sub/evaluate/academicReport/InterestReport.vue b/src/pages-evaluation-sub/evaluate/academicReport/InterestReport.vue
index d6f5076..3cc5c99 100644
--- a/src/pages-evaluation-sub/evaluate/academicReport/InterestReport.vue
+++ b/src/pages-evaluation-sub/evaluate/academicReport/InterestReport.vue
@@ -7,7 +7,7 @@
 </route>
 
 <template>
-  <scroll-view :scroll-y="true" class="flex flex-col h-screen relative custom-bg">
+  <view class="flex flex-col h-screen relative custom-bg">
     <Navbar
       safeAreaInsetTop
       :bordered="false"
@@ -43,7 +43,7 @@
         <text class="text-[#117CFC] text-[26rpx]">智能AI顾问</text>
       </view> -->
     </view>
-  </scroll-view>
+  </view>
 </template>
 <script setup lang="ts">
 import Navbar from '@/pages-evaluation-sub/components/navbar/Navbar.vue'
diff --git a/src/pages-evaluation-sub/evaluate/academicReport/opinionAboutReport.vue b/src/pages-evaluation-sub/evaluate/academicReport/opinionAboutReport.vue
index e3c7216..8ee01a1 100644
--- a/src/pages-evaluation-sub/evaluate/academicReport/opinionAboutReport.vue
+++ b/src/pages-evaluation-sub/evaluate/academicReport/opinionAboutReport.vue
@@ -7,7 +7,7 @@
 </route>
 
 <template>
-  <scroll-view :scroll-y="true" class="flex flex-col h-screen relative custom-bg">
+  <view :scroll-y="true" class="flex flex-col h-screen relative custom-bg">
     <Navbar
       safeAreaInsetTop
       :bordered="false"
@@ -35,7 +35,7 @@
                 <text class="text-[#117CFC] text-[26rpx]">智能AI顾问</text>
               </view> -->
     </view>
-  </scroll-view>
+  </view>
 </template>
 <script setup lang="ts">
 import Navbar from '@/pages-evaluation-sub/components/navbar/Navbar.vue'
diff --git a/src/pages-evaluation-sub/evaluate/components/IntroMajor.vue b/src/pages-evaluation-sub/evaluate/components/IntroMajor.vue
index b0b2c70..ddcbdaa 100644
--- a/src/pages-evaluation-sub/evaluate/components/IntroMajor.vue
+++ b/src/pages-evaluation-sub/evaluate/components/IntroMajor.vue
@@ -11,7 +11,7 @@
       </view>
 
       <view
-        :class="`flex py-[15rpx] px-[36rpx] ${index % 2 === 0 ? 'bg-[#fff]' : 'bg-[#F5FAFF]'}`"
+        :class="`flex py-[15rpx] text-[#333] text-[24rpx] px-[36rpx] ${index % 2 === 0 ? 'bg-[#fff]' : 'bg-[#F5FAFF]'}`"
         v-for="(major, index) in majorList"
         :key="index"
       >
diff --git a/src/pages-evaluation-sub/evaluate/components/TypeDetail.vue b/src/pages-evaluation-sub/evaluate/components/TypeDetail.vue
index 25a20a0..2b0d3a4 100644
--- a/src/pages-evaluation-sub/evaluate/components/TypeDetail.vue
+++ b/src/pages-evaluation-sub/evaluate/components/TypeDetail.vue
@@ -7,7 +7,9 @@
       <view class="py-[12rpx] text-center bg-color flex-1">性格特点</view>
     </view>
     <view class="flex gap-[10rpx] w-full" v-for="(item, index) in reportItems" :key="index">
-      <view class="w-[94rpx] py-[12rpx] bg-color text-center">
+      <view
+        class="w-[94rpx] py-[12rpx] bg-color text-center flex flex-col justify-center items-center"
+      >
         <view>{{ item.tag }}</view>
         <view>{{ item.title }}</view>
       </view>
diff --git a/src/pages-evaluation-sub/rank/index.vue b/src/pages-evaluation-sub/rank/index.vue
index fa8b001..31ceaf9 100644
--- a/src/pages-evaluation-sub/rank/index.vue
+++ b/src/pages-evaluation-sub/rank/index.vue
@@ -145,6 +145,12 @@ const searchParams = ref({
 })
 
 const handleConfirm = () => {
+  let maxSCore = betweenScores.value.split('到').map((item) => item.replace(/分/g, ''))
+  if (+searchParams.value.Score > +maxSCore[1]) {
+    searchParams.value.Score = maxSCore[1]
+  } else if (+searchParams.value.Score < +maxSCore[0]) {
+    searchParams.value.Score = maxSCore[0]
+  }
   getScoreSectionData()
 }
 
diff --git a/src/pages-sub/components/ActionSheet.vue b/src/pages-sub/components/ActionSheet.vue
index 52e7b67..3a8f7c2 100644
--- a/src/pages-sub/components/ActionSheet.vue
+++ b/src/pages-sub/components/ActionSheet.vue
@@ -96,7 +96,7 @@ const handleClose = () => {
   }
 
   &-content {
-    max-height: 75vh;
+    max-height: 55vh;
     min-height: 500rpx;
   }
 
diff --git a/src/pages-sub/components/table/Table.vue b/src/pages-sub/components/table/Table.vue
index 994c4a3..e8a905f 100644
--- a/src/pages-sub/components/table/Table.vue
+++ b/src/pages-sub/components/table/Table.vue
@@ -1,10 +1,10 @@
 <template>
-  <view class="table">
+  <view class="table-wrapper" :style="data.length === 0 ? 'height: 100%;' : ''">
     <view class="table-header">
       <view
         v-for="(column, index) in columns"
         :key="index"
-        :class="[`text-${column.align || 'center'}`, 'table-cell']"
+        :class="[`text-${column.align || 'center'}`, 'table-cell', 'text-[24rpx]', 'font-semibold']"
         :style="{ width: column.width }"
       >
         <text>{{ column.label }}</text>
@@ -20,7 +20,18 @@
         <text>{{ item[column.prop] }}</text>
       </view>
     </view>
-    <view class="text-center p-[32rpx]" v-show="data.length === 0">暂无数据</view>
+
+    <view
+      class="flex flex-col items-center justify-center text-[22rpx] text-[#333] border-body mt-auto flex-1"
+      v-if="data.length === 0"
+    >
+      <image
+        src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJYAAACWCAMAAAAL34HQAAALeGlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNi4wLWMwMDIgNzkuMTY0NDg4LCAyMDIwLzA3LzEwLTIyOjA2OjUzICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0RXZ0PSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VFdmVudCMiIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczpwaG90b3Nob3A9Imh0dHA6Ly9ucy5hZG9iZS5jb20vcGhvdG9zaG9wLzEuMC8iIHhtbG5zOnRpZmY9Imh0dHA6Ly9ucy5hZG9iZS5jb20vdGlmZi8xLjAvIiB4bWxuczpleGlmPSJodHRwOi8vbnMuYWRvYmUuY29tL2V4aWYvMS4wLyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiIHhtcDpDcmVhdGVEYXRlPSIyMDIyLTAyLTIyVDIxOjIxOjQ1KzA4OjAwIiB4bXA6TWV0YWRhdGFEYXRlPSIyMDI0LTAxLTEzVDE5OjA5OjQwKzA4OjAwIiB4bXA6TW9kaWZ5RGF0ZT0iMjAyNC0wMS0xM1QxOTowOTo0MCswODowMCIgZGM6Zm9ybWF0PSJpbWFnZS9wbmciIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6ZWQwMWYzNWQtOWRjOC00MDBiLWEyMmQtNjM5OGZiNzVhNGRiIiB4bXBNTTpEb2N1bWVudElEPSJhZG9iZTpkb2NpZDpwaG90b3Nob3A6ZDhlMzQ3ZmEtMDY2My1jYTRiLTgzNTctNTk4YjBkNGIzOTU2IiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InhtcC5kaWQ6ZDA4MDI4MDItMzUyYS04NTRhLTkxYjctNmRlNmQ1MmViM2QwIiBwaG90b3Nob3A6Q29sb3JNb2RlPSIzIiBwaG90b3Nob3A6SUNDUHJvZmlsZT0ic1JHQiBJRUM2MTk2Ni0yLjEiIHRpZmY6T3JpZW50YXRpb249IjEiIHRpZmY6WFJlc29sdXRpb249IjMwMDAwMDAvMTAwMDAiIHRpZmY6WVJlc29sdXRpb249IjMwMDAwMDAvMTAwMDAiIHRpZmY6UmVzb2x1dGlvblVuaXQ9IjIiIGV4aWY6Q29sb3JTcGFjZT0iMSIgZXhpZjpQaXhlbFhEaW1lbnNpb249IjMwMCIgZXhpZjpQaXhlbFlEaW1lbnNpb249IjMwMCI+IDx4bXBNTTpIaXN0b3J5PiA8cmRmOlNlcT4gPHJkZjpsaSBzdEV2dDphY3Rpb249ImNyZWF0ZWQiIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6ZDA4MDI4MDItMzUyYS04NTRhLTkxYjctNmRlNmQ1MmViM2QwIiBzdEV2dDp3aGVuPSIyMDIyLTAyLTIyVDIxOjIxOjQ1KzA4OjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249InNhdmVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOjQwNjg2NzJkLWY5NDMtOTU0Mi1iMDBiLTVlMDExNmE1NmIzZSIgc3RFdnQ6d2hlbj0iMjAyNC0wMS0xM1QxMDoyNjoxNiswODowMCIgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTkgKFdpbmRvd3MpIiBzdEV2dDpjaGFuZ2VkPSIvIi8+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJzYXZlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDphYmJkZmUyZC0xY2Q2LTJiNDgtYjUyNS05YzlhZjdlNjA4NDMiIHN0RXZ0OndoZW49IjIwMjQtMDEtMTNUMTE6MjM6NDArMDg6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE5IChXaW5kb3dzKSIgc3RFdnQ6Y2hhbmdlZD0iLyIvPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0iY29udmVydGVkIiBzdEV2dDpwYXJhbWV0ZXJzPSJmcm9tIGFwcGxpY2F0aW9uL3ZuZC5hZG9iZS5waG90b3Nob3AgdG8gaW1hZ2UvcG5nIi8+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJkZXJpdmVkIiBzdEV2dDpwYXJhbWV0ZXJzPSJjb252ZXJ0ZWQgZnJvbSBhcHBsaWNhdGlvbi92bmQuYWRvYmUucGhvdG9zaG9wIHRvIGltYWdlL3BuZyIvPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0ic2F2ZWQiIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6YTQ5MjM5MDAtNDhiZC03YTQ1LWI4NGItYmVlZTVjOWUxYTM1IiBzdEV2dDp3aGVuPSIyMDI0LTAxLTEzVDExOjIzOjQwKzA4OjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiIHN0RXZ0OmNoYW5nZWQ9Ii8iLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249InNhdmVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOmVkMDFmMzVkLTlkYzgtNDAwYi1hMjJkLTYzOThmYjc1YTRkYiIgc3RFdnQ6d2hlbj0iMjAyNC0wMS0xM1QxOTowOTo0MCswODowMCIgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWRvYmUgUGhvdG9zaG9wIDIyLjAgKE1hY2ludG9zaCkiIHN0RXZ0OmNoYW5nZWQ9Ii8iLz4gPC9yZGY6U2VxPiA8L3htcE1NOkhpc3Rvcnk+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOmFiYmRmZTJkLTFjZDYtMmI0OC1iNTI1LTljOWFmN2U2MDg0MyIgc3RSZWY6ZG9jdW1lbnRJRD0iYWRvYmU6ZG9jaWQ6cGhvdG9zaG9wOjM2ZGQ4NTQxLWQ0MWEtYmY0Yy1iZjA3LWNmNjZhNjZhMDg2MSIgc3RSZWY6b3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOmQwODAyODAyLTM1MmEtODU0YS05MWI3LTZkZTZkNTJlYjNkMCIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pm30U/gAAAAJcEhZcwAALiMAAC4jAXilP3YAAAA/UExURUdwTODg4O3t7e7u7unp6d7e3uTk5M/Pz8nJyePj4+jo6Pj4+MrKyszMzO7u7unp6fb29vLy8vr6+v7+/sHBweag3xAAAAAOdFJOUwAxia5pF0n+/vzX3KbULQ2DYQAACG1JREFUeNrtm4l2o7gShi20IWFrAd7/WUc7EosDWKZ976Hc7WTmdMKXv0qlqpLyeNx222233Xbbbbfddtv/mOHn8xexSNsiRH5PrbFtW4p+DetpsF4v8Gs+HA3WEwOAfwzriYxaLTVsP8X1QK0z+vqQCzewYogi60aL9SEX5oyxphYVCFTGjfSJCTmN1jBruN5KTGCUS8bhySQGHRaohmW4glwtldbOeYJYKlgvbyUuA8aFFEKc++aIM4hrRnyiMnIZKq1PrihcM3GNKboMF1Naa9X9+8T1KrxIlVbGjv3cAEHOYYMqqgUsVuJqqehV3+sjDwB+DTJp0lYtMCyZpxqjF4e+74+sRcQSFZO8UonUSEFzuUY+DKo59A2kZDatGCjzCauy/2AmhSyCq0WHEj0KTNJDmVeNhErMt1Q8W4xti4/FwMJ4jaxl05TKFiNtD3kBGrHnhiph9V0eXQc6DkyE2xX830AlKshFTErXeuCZXK/9m41wFsGSfZ4lcGeyZ98PrylJ7MWCojQZ3qSukL2QslgdngqJnTEPdTJhXvbNBoR/+7wabIxWduN/Ja5dWEivm4XSZ2uQckNzmRlHrn2lc6eiafvS4V2Hd12tesau8toZW0CtWoZYb9t+OqxdCYKYjVPF16pVbILIy/gR7MVaWMHYPCoa2VkzkX4Iry2rirXbumGyAjGC1h62YLw6ApsNKZph3fpIWHt08JovRWD62sejpXhTrhWrPpl6zZ6PW2oTG5ltlvgtF6weNYCWKeJJSfg4W6PNJlj3sVZgOXV4lc8n4RlkMTLEBDVoYc3nI09kpyzzfgWsjyzBZSNDKF2/wjh+sxYvn8Y1scxlfLF9T1RBO3wVHsnq8Fk4oGkEh/0KJPSa8T2CeWE5X9BPmgLsaRIGeNL2kshCsWoLBmdPJW5Wbz1ndAKUXjPwxXYAUpSV3fy5BJg1aa1tyVXHHMgVH31ewDVrleHr9XqC684SUF4mecR3+wW5SC2QNvxUizRv98mLDhPgYiMDb+v8g0OADxqxcnf9w01mZYJF0fUVP5LcdswbsMmy1DVs5PlE5NpNiTR8M8qAWZkOy6aN13VcoOF2/s3xn3Mes8Xza05tgR/BuNz69nlNzMR0fH45p+G4R9oxh2mKt9MF4J7K/lvWUojwF5nCgCpuRUptnZMQ3au0nSo2UsHgV3xpmeLYzGml3ZFBBzYGPCpOQRwXs1/GG1J74dlZc6JKUOtjBAz9XjVxucGWHbZVJDPJQGYDRl1Qmf1ovk2Sbghb6MQlnF7mBzM1bgOqJAPpoOQaVe+4Skcit3uqHMyG/Sh1rHNN0gAfM0nnPrmulfLVBSm20TSZSdWa0LJl2ukVyE4vTYCgP3uQkwv1TKtQWgxDzBSg80OQjCs4klKvuUzHLCfIbDKIE/S5VIGqD1iD2819pkAqTWdmeina+oZABi7X5B1MGoTJqJSchuk6JNHcgUPAcsVFk0+N0oDN68Vo7FQSmCXjx46OEtUk1lpY2ZFQGr/AcpqVato4wPUD+RhfAeyQI5sJ6l2sDwnKqNFSJvpiyJbFl3kTOjZ2ievwCR7hkUoWeV2vOLAXvB39AJoyqYa81A5cvaAidXYTFTycKDBcalVK5f3XS89kzLVl9txfL+K+p6NUnitz5KkKm7D3DrRPNq4bk7l20aFRppNilmuQI+uzTtj9wPBkTsVwM7HbJ5pwGgujyRyZDzQLNoiRFluRtQ+GzEguqRxUL+ZMFqulMzIfaP3ARj2k/txB8c+2HyjmDizCaVWtNoE5MvMlKs/4VQ7HUJZCrU6qCKcNJ2aSWUZhJZu4VI0LB4CHFdj77DRuGi28WKAxoRyZyzGVrmc0jmk1nP5QaxZo1puqq1YIAqgZb8e/rABZJWNCNxV7DSTpOO7Aail9J9nYHtua/4ouE/aS0X1qtXQzwGx+rnbi2vhF/TfZG52oc6DPo1WCi3RTDnRk7TEntoEp38gg+DjYs2opkR3JW5EpL9rU0XSK5/6LOTAVS+72x7pm60zSf5HMdldjhzJqw1FRcxXdS3ZNZp0s92FiyluUvBPoD9ynZNkBiu2NF11ofnlnQbZgKqvusj9R/f6DOzgVsahbNlXxlsxU8y7qrbTupitRyxFBKG6H3aEPUqj7YrzAymq41FXlZLlO4WLbvG2Kg4vYB+wPfWS2B5Rq8TW9ROpAZbiF6MmCTsx1NLLsx7NOoOiZup2CNbZ36xc96ErcxzuILGrmmFhimjtwKo/yTm7feTVwB61IzbnW4967Kt3cDDotGt8JKrTiUyO3Uy2PZZt9tapXEfXhWmTgcoB+JchFWsiCKvYnhmn/tKuJDbgly897FnFfkE1rQLKy810OU7xW3bEJHCD5gERtuTGuxoJqA6qI9TNMa6MbvZomsiubbPYx78YXDaaRqqsyqfSaLZdjYGHLu65rDgydXCWm1P5EvcQ828f9pcBapTILSMv1nZCAc0WzFIFsGfUi/kmAxc6cFqDSYuPSMIbs1OVrwITTQM9HVRFJ5JL56qcoFzzT1uVcd2v9jFw8BHlcWtmEI86hp5Dy/zOlK8cUp/rVseRUBqawz6kmAcPLM9l5m8h4V53Iz/2mFJaTCvF8JbsMvPjU/7crbUXart0v4WyE0LnDPcAX95Knj4VUE8HCdNdUP8BDcOXKdPl4uSWbh4LfOV0HDdfipOmu+eIRrDsNPkIT7np/8ZAzVdOd1u8wHIqeXt8VqtgiO50ePeNaGG+uO9rHiKdL71pnIun8jxEKXv2r2HYBzO/mz96vFKoMM5WLk7tQXS9U5kwCu5lk7n6++kdCFWRaTUzm0/5fClWGWTrM/AGhCrJO/ZBQhTPFLwmV7ebgcdttt91222233Xbbbf+H9h+2WEtdHVinLAAAAABJRU5ErkJggg=="
+        mode="scaleToFill"
+        class="w-[240rpx] h-[240rpx]"
+      />
+      <view class="text-[28rpx] mt-[10rpx] px-[20rpx]">没有数据哦~</view>
+    </view>
   </view>
 </template>
 
@@ -35,11 +46,15 @@ const { columns } = useTable()
 </script>
 
 <style scoped>
-.table {
+.table-wrapper {
   overflow: hidden;
   width: 100%;
+
   border: 2rpx solid #eee;
   box-sizing: border-box;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
 }
 
 .table-header {
@@ -47,6 +62,7 @@ const { columns } = useTable()
   background-color: #f5f5f5;
   font-weight: bold;
   min-height: 60rpx;
+  width: 100%;
 }
 
 .table-cell {
@@ -66,6 +82,8 @@ const { columns } = useTable()
 .table-row {
   display: flex;
   border-top: 1px solid #ddd;
+  font-size: 24rpx;
+  width: 100%;
 }
 
 .table-row .table-cell {
diff --git a/src/pages-sub/customerService/index/index.vue b/src/pages-sub/customerService/index/index.vue
index bee891f..d805d2e 100644
--- a/src/pages-sub/customerService/index/index.vue
+++ b/src/pages-sub/customerService/index/index.vue
@@ -15,10 +15,10 @@
     </Navbar>
 
     <view class="flex-1 bg-[#F8F8F8] px-[32rpx] pb-safe">
-      <view class="mt-[84rpx] h-[754rpx] radius-[16rpx] bg-[#fff]">
+      <view class="mt-[84rpx] h-[754rpx] rounded-[16rpx] bg-[#fff]">
         <view class="py-[48rpx] mx-[48rpx] avatar-border flex justify-center items-center">
           <image
-            class="w-[144rpx] h-[144rpx] rounded-full"
+            class="min-w-[144rpx] min-h-[144rpx] w-[144rpx] h-[144rpx] rounded-full"
             src="https://api.static.ycymedu.com/sub/images/customerService/avatar.jpg"
           ></image>
           <view class="flex flex-col text-[#000] ml-[32rpx]">
diff --git a/src/pages-sub/evaluation/assessmentPage.vue b/src/pages-sub/evaluation/assessmentPage.vue
index c3a1ec8..c7d7f1b 100644
--- a/src/pages-sub/evaluation/assessmentPage.vue
+++ b/src/pages-sub/evaluation/assessmentPage.vue
@@ -62,7 +62,7 @@
     </view>
   </view>
 
-  <MessageBox v-model:show="show" title="" :defaultPadding="false">
+  <MessageBox v-model:show="show" title="" :defaultPadding="false" defaultWidth="85%">
     <template>
       <view class="custom-background">
         <view class="px-[32rpx] pt-[48rpx]">
@@ -70,10 +70,12 @@
           <view
             class="bg-[rgba(21,128,255,0.1)] flex items-center gap-[10rpx] text-[24rpx] text-[#444] px-[24rpx] py-[6rpx] w-max rounded-[10rpx] mt-[10rpx]"
           >
-            <view class="i-carbon-time-filled text-[#1580FF]"></view>
+            <view class="i-carbon-time-filled text-[#1580FF] w-[24rpx] h-[24rpx]"></view>
             <view>{{ useTime }}</view>
           </view>
-          <view class="text-[30rpx] my-[40rpx]">{{ quesApplication }}</view>
+          <view class="text-[30rpx] my-[40rpx] text-[#333] text-[28rpx]">
+            {{ quesApplication }}
+          </view>
         </view>
         <view
           class="text-center py-[26rpx] text-[#1580FF] text-[36rpx] font-medium start-border"
@@ -317,4 +319,9 @@ const handleSubmit = () => {
   transform: translate3d(0, 0, 0);
   transition: all 0.3s ease;
 }
+
+wx-button[disabled]:not([type]) {
+  background-color: rgba(255, 255, 255, 0.4);
+  color: #fff;
+}
 </style>
diff --git a/src/pages-sub/home/autoFill/index.vue b/src/pages-sub/home/autoFill/index.vue
index bec35a1..fd872d6 100644
--- a/src/pages-sub/home/autoFill/index.vue
+++ b/src/pages-sub/home/autoFill/index.vue
@@ -21,7 +21,7 @@
       </Badge>
 
       <image
-        class="w-[286rpx] h-[286rpx] mt-[134rpx] mix-blend-multiply bg-[#f8f8f8]"
+        class="w-[286rpx] h-[286rpx] mt-[134rpx]"
         src="https://api.static.ycymedu.com/sub/images/autoFill/auto-fill.jpg"
         mode="widthFix"
         @click="show = true"
@@ -66,10 +66,6 @@ import { useUserStore } from '@/store/user'
 
 const userStore = useUserStore()
 
-const navigatorBack = () => {
-  uni.navigateBack()
-}
-
 const show = ref(false)
 const badgeValue = ref(1)
 
diff --git a/src/pages-sub/home/career/components/CareerInfo.vue b/src/pages-sub/home/career/components/CareerInfo.vue
index fc3fd70..9186399 100644
--- a/src/pages-sub/home/career/components/CareerInfo.vue
+++ b/src/pages-sub/home/career/components/CareerInfo.vue
@@ -2,14 +2,14 @@
   <view class="flex flex-col">
     <view class="flex flex-col px-[32rpx] mt-[40rpx]">
       <text class="text-[32rpx] text-[#333] font-semibold mb-[22rpx]">简介</text>
-      <text class="text-[22rpx] text-[#636363]">
+      <text class="text-[24rpx] text-[#636363]">
         {{ careerInfo.intro }}
       </text>
     </view>
     <view class="h-[16rpx] bg-[#f8f8f8] mt-[36rpx] mb-[40rpx]"></view>
     <view class="flex flex-col px-[32rpx] mt-[40rpx]">
       <text class="text-[32rpx] text-[#333] font-semibold mb-[22rpx]">职业定义</text>
-      <text class="text-[22rpx] text-[#636363]">
+      <text class="text-[24rpx] text-[#636363]">
         {{ careerInfo.definition }}
       </text>
     </view>
diff --git a/src/pages-sub/home/career/components/DevelopmentProspect.vue b/src/pages-sub/home/career/components/DevelopmentProspect.vue
index 5fc1d5e..21eb9a6 100644
--- a/src/pages-sub/home/career/components/DevelopmentProspect.vue
+++ b/src/pages-sub/home/career/components/DevelopmentProspect.vue
@@ -4,19 +4,19 @@
       <text class="text-[32rpx] text-[#333] font-semibold mb-[23rpx]">发展前景</text>
       <view class="mb-[36rpx]">
         <view class="text-[24rpx] text-[#333] font-semibold">行业发展前景</view>
-        <text class="text-[22rpx] text-[#636363]">
+        <text class="text-[24rpx] text-[#636363]">
           {{ prospect.industry }}
         </text>
       </view>
       <view class="mb-[36rpx]">
         <view class="text-[24rpx] text-[#333] font-semibold">个人发展路径</view>
-        <text class="text-[22rpx] text-[#636363]">
+        <text class="text-[24rpx] text-[#636363]">
           {{ prospect.person }}
         </text>
       </view>
       <view class="mb-[36rpx]">
         <view class="text-[24rpx] text-[#333] font-semibold">职业的就业趋势</view>
-        <text class="text-[22rpx] text-[#636363]">
+        <text class="text-[24rpx] text-[#636363]">
           {{ prospect.career }}
         </text>
       </view>
@@ -26,19 +26,19 @@
       <text class="text-[32rpx] text-[#333] font-semibold mb-[23rpx]">薪资待遇</text>
       <view class="mb-[36rpx]">
         <view class="text-[24rpx] text-[#333] font-semibold">薪资结构</view>
-        <text class="text-[22rpx] text-[#636363]">
+        <text class="text-[24rpx] text-[#636363]">
           {{ salary.structure }}
         </text>
       </view>
       <view class="mb-[36rpx]">
         <view class="text-[24rpx] text-[#333] font-semibold">满意度</view>
-        <text class="text-[22rpx] text-[#636363]">
+        <text class="text-[24rpx] text-[#636363]">
           {{ salary.satisfaction }}
         </text>
       </view>
       <view class="mb-[36rpx]">
         <view class="text-[24rpx] text-[#333] font-semibold">福利制度</view>
-        <text class="text-[22rpx] text-[#636363]">
+        <text class="text-[24rpx] text-[#636363]">
           {{ salary.welfare }}
         </text>
       </view>
diff --git a/src/pages-sub/home/career/components/KnowledgeBackground.vue b/src/pages-sub/home/career/components/KnowledgeBackground.vue
index a5d27d4..fe6d4dc 100644
--- a/src/pages-sub/home/career/components/KnowledgeBackground.vue
+++ b/src/pages-sub/home/career/components/KnowledgeBackground.vue
@@ -2,28 +2,28 @@
   <view class="flex flex-col">
     <view class="flex flex-col px-[32rpx] mt-[40rpx]">
       <text class="text-[32rpx] text-[#333] font-semibold mb-[22rpx]">学历要求</text>
-      <text class="text-[22rpx] text-[#636363]">
+      <text class="text-[24rpx] text-[#636363]">
         {{ knowledgeInfo.diplomas }}
       </text>
     </view>
     <view class="h-[16rpx] bg-[#f8f8f8] mt-[36rpx] mb-[40rpx]"></view>
     <view class="flex flex-col px-[32rpx] mt-[40rpx]">
       <text class="text-[32rpx] text-[#333] font-semibold mb-[22rpx]">行业知识</text>
-      <text class="text-[22rpx] text-[#636363]">
+      <text class="text-[24rpx] text-[#636363]">
         {{ knowledgeInfo.trade }}
       </text>
     </view>
     <view class="h-[16rpx] bg-[#f8f8f8] mt-[36rpx] mb-[40rpx]"></view>
     <view class="flex flex-col px-[32rpx] mt-[40rpx]">
       <text class="text-[32rpx] text-[#333] font-semibold mb-[22rpx]">专业知识</text>
-      <text class="text-[22rpx] text-[#636363]">
+      <text class="text-[24rpx] text-[#636363]">
         {{ knowledgeInfo.pro }}
       </text>
     </view>
     <view class="h-[16rpx] bg-[#f8f8f8] mt-[36rpx] mb-[40rpx]"></view>
     <view class="flex flex-col px-[32rpx] mt-[40rpx]">
       <text class="text-[32rpx] text-[#333] font-semibold mb-[22rpx]">大学课程</text>
-      <text class="text-[22rpx] text-[#636363]">
+      <text class="text-[24rpx] text-[#636363]">
         {{ jsonCurriculum.important }}
       </text>
     </view>
diff --git a/src/pages-sub/home/career/components/LeftMenu.vue b/src/pages-sub/home/career/components/LeftMenu.vue
index e39fcd1..64b1c58 100644
--- a/src/pages-sub/home/career/components/LeftMenu.vue
+++ b/src/pages-sub/home/career/components/LeftMenu.vue
@@ -1,11 +1,11 @@
 <template>
-  <view class="bg-white flex w-full flex-1">
-    <view class="w-[260rpx] bg-[#F7F8FA] flex flex-col items-center">
+  <view class="bg-white flex h-full">
+    <view class="w-[260rpx] bg-[#F7F8FA] flex flex-col items-center overflow-y-auto h-full">
       <view
         v-for="item in menus"
         :key="item._id"
         :class="[
-          'flex items-center view-block pl-[32rpx] h-[96rpx] text-[28rpx] font-semibold',
+          'flex items-center view-block pl-[32rpx] min-h-[96rpx]! text-[28rpx] text-[#666]',
           currentMenuObj?._id === item._id ? 'active' : '',
         ]"
         @click="changeMenu(item)"
@@ -13,7 +13,7 @@
         {{ item.rootName }}
       </view>
     </view>
-    <view class="flex-1 mt-[40rpx] flex flex-col">
+    <view class="flex-1 mt-[40rpx] flex flex-col overflow-y-auto h-full">
       <MajorTreeList v-if="currentMenuObj" :sub-major-list="currentMenuObj" />
     </view>
   </view>
diff --git a/src/pages-sub/home/career/components/VocationalSkill.vue b/src/pages-sub/home/career/components/VocationalSkill.vue
index 930a1f6..787cd4a 100644
--- a/src/pages-sub/home/career/components/VocationalSkill.vue
+++ b/src/pages-sub/home/career/components/VocationalSkill.vue
@@ -3,14 +3,14 @@
     <view class="flex flex-col px-[32rpx] mt-[40rpx]">
       <text class="text-[32rpx] text-[#333] font-semibold mb-[23rpx]">职业技能</text>
       <view class="mb-[36rpx]">
-        <view class="text-[24rpx] text-[#333] font-semibold">专业技能</view>
-        <text class="text-[22rpx] text-[#636363]">
+        <view class="text-[26rpx] text-[#333] font-semibold">专业技能</view>
+        <text class="text-[24rpx] text-[#636363]">
           {{ proSkill.skill_pro }}
         </text>
       </view>
       <view class="mb-[36rpx]">
-        <view class="text-[24rpx] text-[#333] font-semibold">通用技能</view>
-        <text class="text-[22rpx] text-[#636363]">
+        <view class="text-[26rpx] text-[#333] font-semibold">通用技能</view>
+        <text class="text-[24rpx] text-[#636363]">
           {{ proSkill.skill_general }}
         </text>
       </view>
@@ -19,14 +19,14 @@
     <view class="flex flex-col px-[32rpx] mt-[40rpx]">
       <text class="text-[32rpx] text-[#333] font-semibold mb-[23rpx]">从业资格</text>
       <view class="mb-[36rpx]">
-        <view class="text-[24rpx] text-[#333] font-semibold">必须项</view>
-        <text class="text-[22rpx] text-[#636363]">
+        <view class="text-[26rpx] text-[#333] font-semibold">必须项</view>
+        <text class="text-[24rpx] text-[#636363]">
           {{ qualification.necessary }}
         </text>
       </view>
       <view class="mb-[36rpx]">
-        <view class="text-[24rpx] text-[#333] font-semibold">附加项</view>
-        <text class="text-[22rpx] text-[#636363]">
+        <view class="text-[26rpx] text-[#333] font-semibold">附加项</view>
+        <text class="text-[24rpx] text-[#636363]">
           {{ qualification.addition }}
         </text>
       </view>
@@ -34,7 +34,7 @@
     <view class="h-[16rpx] bg-[#f8f8f8] mt-[36rpx] mb-[40rpx]"></view>
     <view class="flex flex-col px-[32rpx] mt-[40rpx]">
       <text class="text-[32rpx] text-[#333] font-semibold mb-[22rpx]">职业道德</text>
-      <text class="text-[22rpx] text-[#636363]">
+      <text class="text-[24rpx] text-[#636363]">
         {{ ethics }}
       </text>
     </view>
diff --git a/src/pages-sub/home/career/index.vue b/src/pages-sub/home/career/index.vue
index 8459f43..94b6129 100644
--- a/src/pages-sub/home/career/index.vue
+++ b/src/pages-sub/home/career/index.vue
@@ -21,8 +21,8 @@
       <view class="custom-background h-[200rpx] w-full absolute top-0 left-0 z-[-1]"></view>
     </view>
 
-    <view class="flex-1 h-[0] overflow-auto pb-safe">
-      <LeftMenu />
+    <view class="flex-1 pb-safe flex flex-col overflow-y-auto">
+      <LeftMenu class="h-full" />
     </view>
   </view>
 </template>
diff --git a/src/pages-sub/home/college/components/Profile.vue b/src/pages-sub/home/college/components/Profile.vue
index 3365ae1..b627179 100644
--- a/src/pages-sub/home/college/components/Profile.vue
+++ b/src/pages-sub/home/college/components/Profile.vue
@@ -36,7 +36,7 @@
     </button>
 
     <ActionSheet v-model:show="show" title="院校简介" :show-close="true">
-      <view class="text-[22rpx] text-[#636363] px-[32rpx] pt-[32rpx]">
+      <view class="text-[24rpx] text-[#636363] px-[32rpx] pt-[32rpx]">
         {{ universityResult?.detail }}
       </view>
     </ActionSheet>
diff --git a/src/pages-sub/home/college/info.vue b/src/pages-sub/home/college/info.vue
index 2712f58..2600f47 100644
--- a/src/pages-sub/home/college/info.vue
+++ b/src/pages-sub/home/college/info.vue
@@ -41,9 +41,9 @@
             {{ universityBaseInfo?.universityResult.features.slice(0, 4).join('/&nbsp;') }}
           </text>
         </view>
-        <button class="collect-btn" plain @click="handleStar">
-          <view class="i-carbon-star-filled" v-if="startFlag"></view>
-          <view class="i-carbon-star" v-else></view>
+        <button class="collect-btn whitespace-nowrap" plain @click="handleStar">
+          <view class="i-carbon-star-filled min-w-[24rpx] min-h-[24rxp]" v-if="startFlag"></view>
+          <view class="i-carbon-star min-w-[24rpx] min-h-[24rxp]" v-else></view>
           收藏
         </button>
       </view>
@@ -203,8 +203,7 @@ const handleStar = () => {
   border: 2rpx solid #eee !important;
   color: #636363 !important;
 
-  width: unset !important;
-  min-width: unset !important;
+  min-width: max-content !important;
   border-radius: 12rpx !important;
   margin-right: 0 !important;
   padding: 12rpx !important;
@@ -215,5 +214,6 @@ const handleStar = () => {
   align-items: center !important;
 
   font-size: 24rpx !important;
+  width: max-content !important;
 }
 </style>
diff --git a/src/pages-sub/home/components/Phase.vue b/src/pages-sub/home/components/Phase.vue
index b6a0ed1..4c182f9 100644
--- a/src/pages-sub/home/components/Phase.vue
+++ b/src/pages-sub/home/components/Phase.vue
@@ -21,6 +21,7 @@ import { getBatchDynamicData, getWxUserInfo } from '@/service/index/api'
 import RadioGroup from '@/pages-sub/components/radio-group/RadioGroup.vue'
 import Radio from '@/pages-sub/components/radio-group/Radio.vue'
 import { useUserStore } from '@/store/user'
+import { useRules } from '@/pages-sub/home/inputScore/useRules'
 
 const userStore = useUserStore()
 
@@ -52,7 +53,8 @@ const fetchBatchData = () => {
 }
 
 onLoad(() => {
-  fetchBatchData()
+  useRules(fetchBatchData)
+
   // if (userStore.userInfo.batchDataUrl) {
   //   fetchBatchData()
   // } else {
diff --git a/src/pages-sub/home/distinguish/index.vue b/src/pages-sub/home/distinguish/index.vue
index bf97eea..b614c19 100644
--- a/src/pages-sub/home/distinguish/index.vue
+++ b/src/pages-sub/home/distinguish/index.vue
@@ -45,10 +45,10 @@
     <view class="h-[16rpx] bg-[#F8F8F8] my-[40rpx]"></view>
 
     <scroll-view scroll-y class="flex flex-col flex-1 pb-safe px-[32rpx] w-auto" enable-flex>
-      <view>
+      <view class="h-full flex flex-col">
         <!-- 头部 -->
         <view
-          class="flex items-center justify-between bg-[#F7F7F7] text-[20rpx] text-[#333] border-header"
+          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">
             <text>院校名称</text>
@@ -61,9 +61,9 @@
           </view>
         </view>
 
-        <view>
+        <view class="flex-1 flex flex-col">
           <view
-            class="flex items-center justify-between text-[22rpx] text-[#333] border-body"
+            class="flex items-center justify-between text-[24rpx] text-[#333] border-body"
             v-for="(item, index) in tableData"
             :key="index"
           >
@@ -80,10 +80,15 @@
             </view>
           </view>
           <view
-            class="flex items-center justify-center text-[22rpx] text-[#333] border-body py-[16rpx]"
+            class="flex flex-col items-center justify-center text-[22rpx] text-[#333] border-body mt-auto flex-1"
             v-if="tableData.length === 0"
           >
-            暂无数据
+            <image
+              src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJYAAACWCAMAAAAL34HQAAALeGlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNi4wLWMwMDIgNzkuMTY0NDg4LCAyMDIwLzA3LzEwLTIyOjA2OjUzICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0RXZ0PSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VFdmVudCMiIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczpwaG90b3Nob3A9Imh0dHA6Ly9ucy5hZG9iZS5jb20vcGhvdG9zaG9wLzEuMC8iIHhtbG5zOnRpZmY9Imh0dHA6Ly9ucy5hZG9iZS5jb20vdGlmZi8xLjAvIiB4bWxuczpleGlmPSJodHRwOi8vbnMuYWRvYmUuY29tL2V4aWYvMS4wLyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiIHhtcDpDcmVhdGVEYXRlPSIyMDIyLTAyLTIyVDIxOjIxOjQ1KzA4OjAwIiB4bXA6TWV0YWRhdGFEYXRlPSIyMDI0LTAxLTEzVDE5OjA5OjQwKzA4OjAwIiB4bXA6TW9kaWZ5RGF0ZT0iMjAyNC0wMS0xM1QxOTowOTo0MCswODowMCIgZGM6Zm9ybWF0PSJpbWFnZS9wbmciIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6ZWQwMWYzNWQtOWRjOC00MDBiLWEyMmQtNjM5OGZiNzVhNGRiIiB4bXBNTTpEb2N1bWVudElEPSJhZG9iZTpkb2NpZDpwaG90b3Nob3A6ZDhlMzQ3ZmEtMDY2My1jYTRiLTgzNTctNTk4YjBkNGIzOTU2IiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InhtcC5kaWQ6ZDA4MDI4MDItMzUyYS04NTRhLTkxYjctNmRlNmQ1MmViM2QwIiBwaG90b3Nob3A6Q29sb3JNb2RlPSIzIiBwaG90b3Nob3A6SUNDUHJvZmlsZT0ic1JHQiBJRUM2MTk2Ni0yLjEiIHRpZmY6T3JpZW50YXRpb249IjEiIHRpZmY6WFJlc29sdXRpb249IjMwMDAwMDAvMTAwMDAiIHRpZmY6WVJlc29sdXRpb249IjMwMDAwMDAvMTAwMDAiIHRpZmY6UmVzb2x1dGlvblVuaXQ9IjIiIGV4aWY6Q29sb3JTcGFjZT0iMSIgZXhpZjpQaXhlbFhEaW1lbnNpb249IjMwMCIgZXhpZjpQaXhlbFlEaW1lbnNpb249IjMwMCI+IDx4bXBNTTpIaXN0b3J5PiA8cmRmOlNlcT4gPHJkZjpsaSBzdEV2dDphY3Rpb249ImNyZWF0ZWQiIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6ZDA4MDI4MDItMzUyYS04NTRhLTkxYjctNmRlNmQ1MmViM2QwIiBzdEV2dDp3aGVuPSIyMDIyLTAyLTIyVDIxOjIxOjQ1KzA4OjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249InNhdmVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOjQwNjg2NzJkLWY5NDMtOTU0Mi1iMDBiLTVlMDExNmE1NmIzZSIgc3RFdnQ6d2hlbj0iMjAyNC0wMS0xM1QxMDoyNjoxNiswODowMCIgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTkgKFdpbmRvd3MpIiBzdEV2dDpjaGFuZ2VkPSIvIi8+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJzYXZlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDphYmJkZmUyZC0xY2Q2LTJiNDgtYjUyNS05YzlhZjdlNjA4NDMiIHN0RXZ0OndoZW49IjIwMjQtMDEtMTNUMTE6MjM6NDArMDg6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE5IChXaW5kb3dzKSIgc3RFdnQ6Y2hhbmdlZD0iLyIvPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0iY29udmVydGVkIiBzdEV2dDpwYXJhbWV0ZXJzPSJmcm9tIGFwcGxpY2F0aW9uL3ZuZC5hZG9iZS5waG90b3Nob3AgdG8gaW1hZ2UvcG5nIi8+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJkZXJpdmVkIiBzdEV2dDpwYXJhbWV0ZXJzPSJjb252ZXJ0ZWQgZnJvbSBhcHBsaWNhdGlvbi92bmQuYWRvYmUucGhvdG9zaG9wIHRvIGltYWdlL3BuZyIvPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0ic2F2ZWQiIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6YTQ5MjM5MDAtNDhiZC03YTQ1LWI4NGItYmVlZTVjOWUxYTM1IiBzdEV2dDp3aGVuPSIyMDI0LTAxLTEzVDExOjIzOjQwKzA4OjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiIHN0RXZ0OmNoYW5nZWQ9Ii8iLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249InNhdmVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOmVkMDFmMzVkLTlkYzgtNDAwYi1hMjJkLTYzOThmYjc1YTRkYiIgc3RFdnQ6d2hlbj0iMjAyNC0wMS0xM1QxOTowOTo0MCswODowMCIgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWRvYmUgUGhvdG9zaG9wIDIyLjAgKE1hY2ludG9zaCkiIHN0RXZ0OmNoYW5nZWQ9Ii8iLz4gPC9yZGY6U2VxPiA8L3htcE1NOkhpc3Rvcnk+IDx4bXBNTTpEZXJpdmVkRnJvbSBz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"
+              mode="scaleToFill"
+              class="w-[240rpx] h-[240rpx]"
+            />
+            <view class="text-[28rpx] mt-[10rpx] px-[20rpx]">没有数据哦~</view>
           </view>
         </view>
       </view>
diff --git a/src/pages-sub/home/expand/index.vue b/src/pages-sub/home/expand/index.vue
index 68555a9..4319172 100644
--- a/src/pages-sub/home/expand/index.vue
+++ b/src/pages-sub/home/expand/index.vue
@@ -15,6 +15,7 @@
     @virtualListChange="virtualListChange"
     @query="queryList"
     :auto-show-system-loading="true"
+    :safe-area-inset-bottom="true"
   >
     <template #top>
       <view class="relative">
@@ -30,7 +31,7 @@
       </view>
       <drop-menu>
         <drop-menu-item :key="1" :title="'省份'" custom-class="flex items-center">
-          <view class="pl-[32rpx] pb-[32rpx]">
+          <view class="pl-[32rpx] pb-[32rpx] pt-[16rpx]">
             <Region
               :defaultValue="searchParams.locationCode"
               @changeName="handleRegionChange"
@@ -39,12 +40,12 @@
           </view>
         </drop-menu-item>
         <drop-menu-item :key="2" :title="'层次'" custom-class="flex items-center">
-          <view class="pl-[32rpx] pb-[32rpx]">
+          <view class="pl-[32rpx] pb-[32rpx] pt-[16rpx]">
             <Nature @changeName="handleNatureChange" />
           </view>
         </drop-menu-item>
         <drop-menu-item :key="3" title="类别" custom-class="flex items-center">
-          <view class="pl-[32rpx] pb-[32rpx]">
+          <view class="pl-[32rpx] pb-[32rpx] pt-[16rpx]">
             <UniType @change-name="handleUniTypeChange" />
           </view>
         </drop-menu-item>
@@ -68,10 +69,14 @@
       <view
         class="bg-[#F7F7F7] flex items-center justify-between text-[20rpx] text-[#333] px-[28rpx] py-[16rpx] sticky top-0"
       >
-        <view class="flex-auto">院校</view>
-        <view class="w-[80rpx] text-center px-[25rpx]">招生专业</view>
-        <view class="w-[86rpx] text-center px-[25rpx]">{{ tModel.year }}计划</view>
-        <view class="w-[66rpx] text-center pl-[25rpx]">较{{ tModel.year - 1 }}</view>
+        <view class="flex-auto text-[24rpx] font-semibold">院校</view>
+        <view class="w-[96rpx] text-center px-[16rpx] text-[24rpx] font-semibold">招生专业</view>
+        <view class="w-[116rpx] text-center px-[16rpx] text-[24rpx] font-semibold">
+          {{ tModel.year }}计划
+        </view>
+        <view class="w-[86rpx] text-center pl-[16rpx] text-[24rpx] font-semibold">
+          较{{ tModel.year - 1 }}
+        </view>
       </view>
 
       <view
@@ -84,7 +89,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">
+              <view class="text-[32rpx] font-semibold truncate max-w-[200rpx]">
                 {{ item.name }}
               </view>
               <view class="mt-[6rpx] text-[22rpx]">
@@ -93,9 +98,9 @@
               </view>
             </view>
           </view>
-          <view class="w-[80rpx] text-center px-[25rpx]">{{ item.planCount }}</view>
-          <view class="w-[86rpx] text-center px-[25rpx]">{{ item.newPlan }}人</view>
-          <view class="w-[66rpx] text-center pl-[25rpx] pr-[28rpx]">
+          <view class="w-[96rpx] text-center px-[16rpx] text-[24rpx]">{{ item.planCount }}</view>
+          <view class="w-[116rpx] text-center px-[16rpx] text-[24rpx]">{{ item.newPlan }}人</view>
+          <view class="w-[86rpx] text-center pl-[16rpx] pr-[28rpx] text-[24rpx]">
             <text v-if="item.newPlan - item.oldPlan === 0">相同</text>
             <view v-else class="flex items-center justify-center gap-[10rpx]">
               <text>{{ item.newPlan - item.oldPlan }}</text>
diff --git a/src/pages-sub/home/inputScore/useRules.ts b/src/pages-sub/home/inputScore/useRules.ts
index d5e099c..020f8c0 100644
--- a/src/pages-sub/home/inputScore/useRules.ts
+++ b/src/pages-sub/home/inputScore/useRules.ts
@@ -12,7 +12,7 @@ export const requireSubject = ref('')
 // 任意选择科目
 export const optionalSubject = ref([])
 
-export const useRules = () => {
+export const useRules = (callback?: any) => {
   getCountryRules().then((res) => {
     if (res.code === 200) {
       const results = res.result as RuleResult[]
@@ -26,6 +26,7 @@ export const useRules = () => {
         return
       }
       splitSubject(requireSubjectList.value, optionalSubjectList.value)
+      callback()
     }
   })
 }
diff --git a/src/pages-sub/home/line/index.vue b/src/pages-sub/home/line/index.vue
index a973b50..82e7cf0 100644
--- a/src/pages-sub/home/line/index.vue
+++ b/src/pages-sub/home/line/index.vue
@@ -21,7 +21,7 @@
     </view>
     <drop-menu>
       <drop-menu-item :key="1" :title="searchParams.locationName || '省份'">
-        <view class="pl-[32rpx] pb-[32rpx]">
+        <view class="pl-[32rpx] pb-[32rpx] pt-[16rpx]">
           <Region
             :defaultValue="searchParams.locationCode ? [searchParams.locationCode] : []"
             :max="1"
@@ -35,7 +35,7 @@
         :title="searchParams.year || '年份'"
         custom-class="flex items-center"
       >
-        <view class="pl-[32rpx] pb-[32rpx]">
+        <view class="pl-[32rpx] pb-[32rpx] pt-[16rpx]">
           <CheckGroup
             :list="checkYearList"
             :default-value="searchParams.year ? [searchParams.year] : []"
@@ -47,7 +47,7 @@
         </view>
       </drop-menu-item>
       <drop-menu-item :key="3" title="类别" custom-class="flex items-center">
-        <view class="pl-[32rpx] pb-[32rpx]">
+        <view class="pl-[32rpx] pb-[32rpx] pt-[16rpx]">
           <UniType
             @change="handleUniTypeChange"
             :max="1"
@@ -56,7 +56,7 @@
         </view>
       </drop-menu-item>
     </drop-menu>
-    <WXXTable :data="lineList" class="px-[32rpx] mt-[16rpx] pb-safe">
+    <WXXTable :data="lineList" class="px-[32rpx] mt-[16rpx] pb-safe flex-1">
       <WXXTableCol prop="province_name" label="地区" width="14%"></WXXTableCol>
       <WXXTableCol prop="year" label="年份" width="23%"></WXXTableCol>
       <WXXTableCol prop="subject_name" label="类别" width="23%"></WXXTableCol>
diff --git a/src/pages-sub/home/major/index.vue b/src/pages-sub/home/major/index.vue
index a113b29..2535d3c 100644
--- a/src/pages-sub/home/major/index.vue
+++ b/src/pages-sub/home/major/index.vue
@@ -13,7 +13,6 @@
       bg-color="transparent"
       :bordered="false"
       left-arrow
-      title="查职业"
       @click-left="navigatorBack"
       content-class="justify-start"
     >
diff --git a/src/pages-sub/home/styles/navbar-background.scss b/src/pages-sub/home/styles/navbar-background.scss
index 5c3dd30..ad677b9 100644
--- a/src/pages-sub/home/styles/navbar-background.scss
+++ b/src/pages-sub/home/styles/navbar-background.scss
@@ -1,7 +1,7 @@
 .custom-background {
   background-image: linear-gradient(
     173deg,
-    rgb(177, 221, 250) 0,
+    rgb(228, 241, 247) 0,
     rgb(177, 221, 250) 13%,
     rgba(255, 255, 255, 1) 80%,
     rgba(255, 255, 255, 1) 100%
diff --git a/src/pages-sub/home/wishesList/components/CollegeMajor.vue b/src/pages-sub/home/wishesList/components/CollegeMajor.vue
index e84e34f..31a67e0 100644
--- a/src/pages-sub/home/wishesList/components/CollegeMajor.vue
+++ b/src/pages-sub/home/wishesList/components/CollegeMajor.vue
@@ -2,7 +2,7 @@
   <view
     v-for="major in college.items"
     :key="major.planId"
-    class="pt-[32rpx] pl-[58rpx] pr-[32rpx] pb-[30rpx] custom-background flex gap-[58rpx]"
+    class="pt-[32rpx] px-[32rpx] pb-[30rpx] custom-background flex gap-[58rpx]"
     :style="`--background-color:${calcTypeName(major.type).style.backgroundColor}`"
   >
     <view class="flex flex-col gap-[16rpx]">
diff --git a/src/pages-sub/home/wishesList/components/DataTable.vue b/src/pages-sub/home/wishesList/components/DataTable.vue
index 8bfb076..5688294 100644
--- a/src/pages-sub/home/wishesList/components/DataTable.vue
+++ b/src/pages-sub/home/wishesList/components/DataTable.vue
@@ -6,7 +6,7 @@
       <view
         v-for="(headItem, index) in columns"
         :key="index"
-        class="text-[22rpx] text-[#505050]"
+        class="text-[24rpx] text-[#505050]"
         :style="{ width: headItem.width }"
       >
         {{ headItem.label }}
@@ -26,7 +26,7 @@
       >
         <view
           v-for="(col, colIndex) in columns"
-          class="text-[22rpx] text-[#505050]"
+          class="text-[24rpx] text-[#505050]"
           :style="{ width: col.width }"
           :key="colIndex"
         >
diff --git a/src/pages-sub/home/wishesList/components/ScrollListItem.vue b/src/pages-sub/home/wishesList/components/ScrollListItem.vue
index 5c753a1..ef0ab68 100644
--- a/src/pages-sub/home/wishesList/components/ScrollListItem.vue
+++ b/src/pages-sub/home/wishesList/components/ScrollListItem.vue
@@ -15,8 +15,7 @@
             college.items.reduce((a, b) => a + Number(b.percentAge.replace('%', '')), 0) /
               college.items.length,
           )
-        }}
-        %
+        }}%
       </text>
     </view>
     <view class="flex flex-col ml-[24rpx] justify-between flex-1">
@@ -40,9 +39,9 @@
           </view>
         </view>
 
-        <view class="flex flex-col gap-[8rpx] items-center">
+        <view class="flex flex-col gap-[8rpx] items-center whitespace-nowrap">
           <view
-            class="text-[24rpx] px-[16rpx] py-[12rpx] rounded-[8rpx] border-[2rpx] border-[#1580FF] border-solid"
+            class="text-[24rpx] px-[16rpx] py-[12rpx] rounded-[8rpx] border-[2rpx] border-[#1580FF] border-solid whitespace-nowrap"
             @click.stop="handleShow"
           >
             专业{{ college.items.length }}
diff --git a/src/pages-sub/home/wishesList/components/ScrollListItemAction.vue b/src/pages-sub/home/wishesList/components/ScrollListItemAction.vue
index 38b803c..ee67d6e 100644
--- a/src/pages-sub/home/wishesList/components/ScrollListItemAction.vue
+++ b/src/pages-sub/home/wishesList/components/ScrollListItemAction.vue
@@ -8,7 +8,7 @@
             {{ college?.city }}·{{ college?.educationCategory }}
           </text>
         </view>
-        <view class="flex flex-col items-end gap-[40rpx]">
+        <view class="flex flex-col items-end gap-[40rpx] whitespace-nowrap">
           <view class="i-carbon-close-large w-[40rpx] h-[40rpx]" @click.stop="handleConfirm"></view>
           <view class="text-[22rpx]">
             <text>已填</text>
@@ -18,7 +18,6 @@
         </view>
       </view>
     </template>
-
     <CollegeMajor :college="college" v-bind="$attrs" v-if="college" />
 
     <template #footer>
diff --git a/src/pages-sub/home/wishesList/index.vue b/src/pages-sub/home/wishesList/index.vue
index 9d948fc..44d49ef 100644
--- a/src/pages-sub/home/wishesList/index.vue
+++ b/src/pages-sub/home/wishesList/index.vue
@@ -1,7 +1,7 @@
 <route lang="json5" type="page">
 {
   style: {
-    navigationBarTitleText: '我的志愿表',
+    navigationStyle: 'custom',
   },
 }
 </route>
@@ -17,6 +17,14 @@
     :auto-show-system-loading="true"
   >
     <template #top>
+      <Navbar
+        safeAreaInsetTop
+        bg-color="transparent"
+        :bordered="false"
+        left-arrow
+        :title="`我的志愿表`"
+        @click-left="navigatorBack"
+      />
       <HeaderTip :user-info="userStore.userInfo" />
       <view class="flex justify-between items-center px-[32rpx] py-[16rpx]">
         <view class="flex items-center gap-[24rpx] text-[#303030]">
@@ -135,6 +143,8 @@ import ScrollListItemAction from './components/ScrollListItemAction.vue'
 import ScrollListItem from './components/ScrollListItem.vue'
 import HeaderTip from './components/HeaderTip.vue'
 
+import Navbar from '@/pages-sub/components/navbar/Navbar.vue'
+
 import { getPlanProListByFilter } from '@/service/index/api'
 
 import { useUserStore } from '@/store/user'
@@ -142,6 +152,10 @@ import { coverTypeModel, useScore } from './composable/useWishesList'
 
 const userStore = useUserStore()
 
+const navigatorBack = () => {
+  uni.navigateBack()
+}
+
 const schoolList = ref([])
 const paging = ref(null)
 const filterMenuRef = ref(null)
diff --git a/src/pages-sub/ucenter/active/activePage.vue b/src/pages-sub/ucenter/active/activePage.vue
index 321f6a4..ca4711b 100644
--- a/src/pages-sub/ucenter/active/activePage.vue
+++ b/src/pages-sub/ucenter/active/activePage.vue
@@ -7,7 +7,7 @@
 </route>
 
 <template>
-  <view class="h-screen flex flex-col">
+  <view class="h-screen flex flex-col bg-[#f8f8f8] relative z-[-1]">
     <view class="relative">
       <Navbar
         safeAreaInsetTop
@@ -18,7 +18,7 @@
         @click-left="navigatorBack"
         content-class="justify-between"
       ></Navbar>
-      <view class="bg-[#fff] rounded-[8rpx] px-[46rpx] pt-[40rpx] pb-[60rpx] mx-[30rpx] mt-[40rpx]">
+      <view class="bg-[#fff] rounded-[8rpx] px-[46rpx] pt-[40rpx] pb-[30rpx] mx-[30rpx] mt-[40rpx]">
         <view class="flex items-center gap-[12rpx]">
           <image
             :src="userStore.userInfo?.avatar"
@@ -71,17 +71,16 @@
         <button class="submit-button" @click="handleActive" :disabled="isVIP">
           {{ isVIP ? '已开通' : '立即兑换' }}
         </button>
-        <view
-          class="text-[#999] text-[24rpx] text-center mt-[20rpx] mb-[30rpx] text-center"
-          v-show="isVIP"
-        >
+        <view class="text-[#999] text-[24rpx] text-center mt-[20rpx] text-center" v-show="isVIP">
           到期时间:{{ endTime }}
         </view>
       </view>
       <view class="custom-background h-[780rpx] w-full absolute top-0 left-0 z-[-1]"></view>
     </view>
 
-    <view class="flex flex-col items-start justify-center text-[#999] text-[28rpx] px-[46rpx]">
+    <view
+      class="flex flex-col items-start justify-center text-[#999] text-[28rpx] px-[46rpx] mt-[60rpx]"
+    >
       <text class="text-[#333] text-[30rpx] font-semibold mb-[20rpx]">兑换规则</text>
       <text class="mb-[20rpx]">
         1.适用对象：普通类文理科考生、新高考选科类考生 （提前批次及艺术体育类考生暂不适用)
diff --git a/src/pages-sub/ucenter/star/myStar.vue b/src/pages-sub/ucenter/star/myStar.vue
index 76d6799..816cac5 100644
--- a/src/pages-sub/ucenter/star/myStar.vue
+++ b/src/pages-sub/ucenter/star/myStar.vue
@@ -16,7 +16,7 @@
     @query="queryList"
     :auto-show-system-loading="true"
   >
-    <template #top>
+    <!-- <template #top>
       <z-tabs
         :current="currentTab"
         :list="tabsList"
@@ -28,7 +28,7 @@
         @change="handleTabChange"
         v-bind="{} as any"
       />
-    </template>
+    </template> -->
     <view
       class="item-wrapper"
       :id="`zp-id-${item.zp_index}`"
diff --git a/src/pages.json b/src/pages.json
index 4ffedd7..1826c1a 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -248,7 +248,7 @@
           "path": "home/wishesList/index",
           "type": "page",
           "style": {
-            "navigationBarTitleText": "我的志愿表"
+            "navigationStyle": "custom"
           }
         },
         {
diff --git a/src/pages/expert/index/index.vue b/src/pages/expert/index/index.vue
index 0e6b593..0d44be3 100644
--- a/src/pages/expert/index/index.vue
+++ b/src/pages/expert/index/index.vue
@@ -7,7 +7,7 @@
 }
 </route>
 <template>
-  <view class="h-screen flex flex-col bg-[#F9F9F9]">
+  <view class="h-screen flex flex-col bg-[#F9F9F9] overflow-y-auto">
     <view class="flex-1 m-[32rpx] rounded-t-[32rpx] gap-[30rpx] flex flex-col">
       <view
         class="flex items-start gap-[24rpx] pl-[24rpx] pr-[38rpx] pt-[24rpx] pb-[12rpx] bg-[#fff]"
@@ -89,34 +89,43 @@ const handleAppointment = (
   item: { id: number; isAppointment: boolean; appointId: number },
   index: number,
 ) => {
-  if (item.isAppointment) {
-    deleteMyAppointment({ id: item.appointId }).then((res) => {
-      if (res.code === 200) {
-        list.value[index].isAppointment = !item.isAppointment
-        delete list.value[index].appointId
+  uni.showModal({
+    title: '预约',
+    content: item.isAppointment ? '是否取消预约' : '是否预约',
+    success: (res) => {
+      if (res.confirm) {
+        if (item.isAppointment) {
+          deleteMyAppointment({ id: item.appointId }).then((res) => {
+            if (res.code === 200) {
+              list.value[index].isAppointment = !item.isAppointment
+              delete list.value[index].appointId
+            }
+          })
+        } else {
+          addSpecial({
+            sId: item.id,
+            openId: userStore.userInfo?.estimatedAchievement.wxId.toString(),
+            appointmentTime: '2025-07-31',
+            isDelete: item.isAppointment,
+          }).then((res) => {
+            if (res.code === 200) {
+              list.value[index].isAppointment = !item.isAppointment
+              list.value[index].appointId = res.result
+              uni.showToast({
+                title: item.isAppointment ? '预约成功' : '取消预约成功',
+              })
+            } else {
+              uni.showToast({
+                title: res.message,
+                icon: 'none',
+              })
+            }
+          })
+        }
+      } else if (res.cancel) {
       }
-    })
-  } else {
-    addSpecial({
-      sId: item.id,
-      openId: userStore.userInfo?.estimatedAchievement.wxId.toString(),
-      appointmentTime: '2025-07-31',
-      isDelete: item.isAppointment,
-    }).then((res) => {
-      if (res.code === 200) {
-        list.value[index].isAppointment = !item.isAppointment
-        list.value[index].appointId = res.result
-        uni.showToast({
-          title: item.isAppointment ? '预约成功' : '取消预约成功',
-        })
-      } else {
-        uni.showToast({
-          title: res.message,
-          icon: 'none',
-        })
-      }
-    })
-  }
+    },
+  })
 }
 </script>
 
diff --git a/src/pages/home/index/index.vue b/src/pages/home/index/index.vue
index b3fb279..e6cd2e6 100644
--- a/src/pages/home/index/index.vue
+++ b/src/pages/home/index/index.vue
@@ -76,9 +76,13 @@ onShow(() => {
     getWxUserInfo().then((resp) => {
       const infoData = resp.result as unknown as {
         userExtend: { provinceCode: string }
+        batchName: string
+        batchDataUrl: string
       }
       if (userStore.userInfo.city.code === infoData.userExtend.provinceCode) {
         userStore.setEstimatedAchievement(infoData.userExtend)
+        userStore.setBatchName(infoData.batchName)
+        userStore.setBatchDataUrl(infoData.batchDataUrl)
         return
       }
     })
diff --git a/src/pages/ucenter/index/index.vue b/src/pages/ucenter/index/index.vue
index a2a8649..0a997fd 100644
--- a/src/pages/ucenter/index/index.vue
+++ b/src/pages/ucenter/index/index.vue
@@ -8,7 +8,7 @@
 </route>
 <template>
   <view class="bg-[#F8F8F8] h-screen flex flex-col gap-[32rpx]">
-    <view class="background">
+    <view class="background-wrapper">
       <Navbar safeAreaInsetTop bg-color="transparent" placeholder :bordered="false"></Navbar>
       <view class="flex px-[32rpx] gap-[24rpx] custom-user-info">
         <image
@@ -29,7 +29,6 @@
 
       <view
         class="absolute bottom-0 py-[16rpx] pl-[32rpx] pr-[24rpx] left-[50%] translate-x-[-50%] flex items-center w-max custom-vip-bg"
-        v-if="!userStore.userInfo.estimatedAchievement.isVIP"
       >
         <image
           src="https://api.static.ycymedu.com/src/images/ucenter/vip.png"
@@ -40,6 +39,7 @@
         <text class="text-white text-[24rpx]">诸多分析特权免费查看</text>
 
         <button
+          v-if="!userStore.userInfo.estimatedAchievement.isVIP"
           class="w-[136rpx]! h-[52rpx]! text-[#803D00]! text-[24rpx]! custom-button-bg font-normal flex! items-center! justify-center! rounded-[80rpx]! p-[0]! ml-[70rpx]!"
           @click="goVip"
         >
@@ -173,7 +173,7 @@ const toSetting = () => {
 </script>
 
 <style lang="scss" scoped>
-.background {
+.background-wrapper {
   position: relative;
   width: 100%;
   height: 420rpx;
@@ -182,12 +182,12 @@ const toSetting = () => {
 }
 
 /* 左下角大圆 */
-.background::before {
+.background-wrapper::before {
   content: '';
   position: absolute;
-  width: 400rpx;
-  height: 400rpx;
-  bottom: -200rpx;
+  width: 300rpx;
+  height: 300rpx;
+  bottom: -150rpx;
   left: -100rpx;
   border-radius: 50%;
   background-color: rgba(150, 230, 255, 0.4);
@@ -195,7 +195,7 @@ const toSetting = () => {
 }
 
 /* 左上角中等圆 */
-.background::after {
+.background-wrapper::after {
   content: '';
   position: absolute;
   width: 300rpx;