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

---
 .../evaluate/components/AiFooter.vue          |  4 +-
 .../components/LearnSkillSuggestion.vue       |  2 +-
 .../styles/grid-checkbox.scss                 |  4 +-
 src/pages-sub/components/ActionSheet.vue      |  8 +-
 src/pages-sub/components/CustomPickerView.vue |  3 +-
 .../components/check-group/CheckGroup.vue     | 14 +++-
 src/pages-sub/components/table/Table.vue      |  2 +-
 .../home/career/components/CareerInfo.vue     |  6 +-
 .../career/components/DevelopmentProspect.vue |  4 +-
 .../home/college/components/Situation.vue     | 74 ++++++-------------
 src/pages-sub/home/college/index.vue          | 18 +++--
 src/pages-sub/home/components/FilterMenu.vue  | 21 +++---
 src/pages-sub/home/components/Region.vue      |  5 --
 src/pages-sub/home/distinguish/index.vue      | 30 +++-----
 src/pages-sub/home/expand/index.vue           | 20 ++---
 src/pages-sub/home/line/index.vue             |  3 +
 .../home/major/components/MajorBaseInfo.vue   |  1 +
 src/pages-sub/home/styles/grid-checkbox.scss  |  4 +-
 .../components/ScrollListItemAction.vue       |  2 +-
 src/pages-sub/home/wishesList/index.vue       | 20 ++---
 src/pages-sub/ucenter/active/activePage.vue   |  2 +-
 21 files changed, 113 insertions(+), 134 deletions(-)

diff --git a/src/pages-evaluation-sub/evaluate/components/AiFooter.vue b/src/pages-evaluation-sub/evaluate/components/AiFooter.vue
index f76a7c1..451c6b6 100644
--- a/src/pages-evaluation-sub/evaluate/components/AiFooter.vue
+++ b/src/pages-evaluation-sub/evaluate/components/AiFooter.vue
@@ -1,11 +1,11 @@
 <template>
   <!-- 底部AI智能顾问 -->
   <view
-    class="pt-[16rpx] px-[32rpx] mt-[20rpx] flex items-center justify-center bg-[#fff] pb-safe"
+    class="pt-[16rpx] px-[32rpx] mt-[20rpx] flex items-center justify-center bg-[#fff] pb-safe sticky bottom-0 z-999"
     @click="toAiAssistant"
   >
     <view
-      class="rounded-[8rpx] border-[#1580FF] border-[2rpx] border-solid w-full pt-[22rpx] pb-[20rpx] flex items-center justify-center"
+      class="rounded-[8rpx] border-[#1580FF] border-[2rpx] border-solid w-full py-[14rpx] flex items-center justify-center"
     >
       <image
         src="https://api.static.ycymedu.com/images/btn-bottom.png"
diff --git a/src/pages-evaluation-sub/evaluate/components/LearnSkillSuggestion.vue b/src/pages-evaluation-sub/evaluate/components/LearnSkillSuggestion.vue
index 0bfb1c2..8684d98 100644
--- a/src/pages-evaluation-sub/evaluate/components/LearnSkillSuggestion.vue
+++ b/src/pages-evaluation-sub/evaluate/components/LearnSkillSuggestion.vue
@@ -3,7 +3,7 @@
     <TitleBar :title="title" />
 
     <view v-for="(item, index) in items" :key="index" class="suggestion-item">
-      <view class="text-[32rpx] font-500">{{ item.title }}</view>
+      <view class="text-[32rpx] font-700">{{ item.title }}</view>
       <view class="text-[26rpx] font-400 mt-[10rpx] text-[#666]">
         {{ item.description instanceof Array ? item.description.join(',') : item.description }}
       </view>
diff --git a/src/pages-evaluation-sub/styles/grid-checkbox.scss b/src/pages-evaluation-sub/styles/grid-checkbox.scss
index 3e41604..f0f577b 100644
--- a/src/pages-evaluation-sub/styles/grid-checkbox.scss
+++ b/src/pages-evaluation-sub/styles/grid-checkbox.scss
@@ -1,9 +1,9 @@
 .custom-check-group {
   :deep(.checkbox-group) {
     display: grid;
-    grid-template-columns: 1fr 1fr 1fr 1fr;
+    grid-template-columns: repeat(4, 1fr);
     gap: 16rpx;
-    padding: 32rpx 16rpx 16rpx;
+    padding: 24rpx 24rpx 36rpx;
   }
 
   :deep(.custom-checkbox) {
diff --git a/src/pages-sub/components/ActionSheet.vue b/src/pages-sub/components/ActionSheet.vue
index 9804c15..b321e0a 100644
--- a/src/pages-sub/components/ActionSheet.vue
+++ b/src/pages-sub/components/ActionSheet.vue
@@ -82,7 +82,7 @@ const handleClose = () => {
   }
 
   &-header {
-    padding: 24rpx 32rpx;
+    padding: 24rpx 32rpx 30rpx;
     text-align: center;
     position: relative;
     border-bottom: 1rpx solid #f5f5f5;
@@ -92,9 +92,9 @@ const handleClose = () => {
   }
 
   &-title {
-    font-size: 32rpx;
-    font-weight: 500;
-    color: #333;
+    font-size: 36rpx;
+    font-weight: 600;
+    color: #303030;
   }
 
   &-content {
diff --git a/src/pages-sub/components/CustomPickerView.vue b/src/pages-sub/components/CustomPickerView.vue
index 17b943f..21533fa 100644
--- a/src/pages-sub/components/CustomPickerView.vue
+++ b/src/pages-sub/components/CustomPickerView.vue
@@ -5,6 +5,7 @@
       v-if="visible"
       :value="currentIndex"
       :indicator-style="indicatorStyle"
+      :indicator-class="'picker-item-selected'"
       :style="{
         border: 'none',
         'border-top': 'none',
@@ -162,7 +163,7 @@ const handleChange = (e: any) => {
 .picker-item {
   text-align: center;
   font-size: 34rpx;
-  color: #7c7c7c;
+  color: #333;
   transition: all 0.2s;
 
   display: flex;
diff --git a/src/pages-sub/components/check-group/CheckGroup.vue b/src/pages-sub/components/check-group/CheckGroup.vue
index 5fe429f..e2620f3 100644
--- a/src/pages-sub/components/check-group/CheckGroup.vue
+++ b/src/pages-sub/components/check-group/CheckGroup.vue
@@ -1,5 +1,11 @@
 <template>
-  <CheckboxGroup v-model="defValue" checked-color="#1580FF" @change="handleChange" v-bind="$attrs">
+  <CheckboxGroup
+    v-model="defValue"
+    checked-color="#1580FF"
+    @change="handleChange"
+    v-bind="$attrs"
+    :style="{ '--default-cols': defaultCols }"
+  >
     <Checkbox
       v-for="item in list"
       :key="item[valueKey]"
@@ -42,6 +48,10 @@ const props = defineProps({
     type: [String, Number],
     default: '60rpx',
   },
+  defaultCols: {
+    type: Number,
+    default: 3,
+  },
 })
 defineOptions({
   options: {
@@ -108,7 +118,7 @@ const checkboxStyle = computed(() => {
 
 :deep(.checkbox-group) {
   display: grid;
-  grid-template-columns: repeat(3, 1fr);
+  grid-template-columns: repeat(var(--default-cols), 1fr);
   gap: 16rpx;
 }
 
diff --git a/src/pages-sub/components/table/Table.vue b/src/pages-sub/components/table/Table.vue
index 76762b5..c139957 100644
--- a/src/pages-sub/components/table/Table.vue
+++ b/src/pages-sub/components/table/Table.vue
@@ -30,7 +30,7 @@
         mode="scaleToFill"
         class="w-[240rpx] h-[240rpx]"
       />
-      <view class="text-[28rpx] mt-[10rpx] px-[20rpx]">没有数据哦~</view>
+      <view class="text-[28rpx] mt-[30rpx] px-[20rpx] text-[#666]">没有数据哦~</view>
     </view>
   </view>
 </template>
diff --git a/src/pages-sub/home/career/components/CareerInfo.vue b/src/pages-sub/home/career/components/CareerInfo.vue
index 9186399..a3e1475 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-[24rpx] text-[#636363]">
+      <text class="text-[24rpx] text-[#636363] line-height-[1.6]">
         {{ careerInfo.intro }}
       </text>
     </view>
     <view class="h-[16rpx] bg-[#f8f8f8] mt-[36rpx] mb-[40rpx]"></view>
-    <view class="flex flex-col px-[32rpx] mt-[40rpx]">
+    <view class="flex flex-col px-[32rpx] mt-[32rpx]">
       <text class="text-[32rpx] text-[#333] font-semibold mb-[22rpx]">职业定义</text>
-      <text class="text-[24rpx] text-[#636363]">
+      <text class="text-[24rpx] text-[#636363] line-height-[1.6]">
         {{ 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 21eb9a6..8f66dc6 100644
--- a/src/pages-sub/home/career/components/DevelopmentProspect.vue
+++ b/src/pages-sub/home/career/components/DevelopmentProspect.vue
@@ -1,6 +1,6 @@
 <template>
   <view class="flex flex-col">
-    <view class="flex flex-col px-[32rpx] mt-[40rpx]">
+    <view class="flex flex-col px-[32rpx] mt-[32rpx]">
       <text class="text-[32rpx] text-[#333] font-semibold mb-[23rpx]">发展前景</text>
       <view class="mb-[36rpx]">
         <view class="text-[24rpx] text-[#333] font-semibold">行业发展前景</view>
@@ -22,7 +22,7 @@
       </view>
     </view>
     <view class="h-[16rpx] bg-[#f8f8f8] mt-[36rpx] mb-[40rpx]"></view>
-    <view class="flex flex-col px-[32rpx] mt-[40rpx]">
+    <view class="flex flex-col px-[32rpx] mt-[32rpx]">
       <text class="text-[32rpx] text-[#333] font-semibold mb-[23rpx]">薪资待遇</text>
       <view class="mb-[36rpx]">
         <view class="text-[24rpx] text-[#333] font-semibold">薪资结构</view>
diff --git a/src/pages-sub/home/college/components/Situation.vue b/src/pages-sub/home/college/components/Situation.vue
index cc5c477..da665d8 100644
--- a/src/pages-sub/home/college/components/Situation.vue
+++ b/src/pages-sub/home/college/components/Situation.vue
@@ -2,7 +2,7 @@
   <view class="flex flex-col pt-[32rpx] px-[32rpx] bg-[#fff] h-full">
     <view class="flex flex-wrap justify-between items-center">
       <view
-        @click="handleShow(2)"
+        @click="handleShow"
         class="px-[24rpx] py-[8rpx] bg-[#f8f8f8] rounded-[8rpx] flex justify-between items-center text-[24rpx]"
       >
         {{ provinceName || '请选择省份' }}
@@ -44,50 +44,31 @@
           mode="scaleToFill"
           class="w-[240rpx] h-[240rpx]"
         />
-        <view class="text-[28rpx] mt-[10rpx] px-[20rpx]">没有数据哦~</view>
+        <view class="text-[28rpx] mt-[30rpx] px-[20rpx] text-[#666]">没有数据哦~</view>
       </view>
     </view>
-
-    <ActionSheet v-model:show="show" title="">
-      <template #title>
-        <view class="text-[#303030] text-[36rpx] font-bold text-center pt-[32rpx]">省份</view>
-      </template>
-      <template>
-        <view class="flex h-full flex-col">
-          <view class="px-[32rpx]">
-            <CustomPickerView
-              :list="pickList"
-              v-model:modelValue="pickValue"
-              v-if="pickType === 1"
-            />
-          </view>
-          <view class="py-[32rpx] flex flex-col items-center justify-center">
-            <Region
-              v-show="pickType === 2"
-              @change="handleRegionChange"
-              @change-name="handleRegionChangeName"
-              :defaultValue="provinceCode"
-              :max="1"
-              class="justify-center"
-            />
-          </view>
-        </view>
-      </template>
-      <template #footer>
-        <view class="flex items-center justify-between px-[32rpx] gap-[16rpx]">
-          <view class="cancel-btn" @click="show = false">取消</view>
-          <view class="submit-btn" @click="handleConfirm">确认</view>
-        </view>
-      </template>
-    </ActionSheet>
   </view>
+  <ActionSheet v-model:show="show" title="省份">
+    <template>
+      <view class="px-[24rpx] pt-[24rpx] pb-[32rpx]">
+        <Region
+          @change="handleRegionChange"
+          @change-name="handleRegionChangeName"
+          :defaultValue="provinceCode"
+          :max="1"
+          class="custom-check-group w-full"
+          :defaultCols="4"
+        />
+      </view>
+    </template>
+  </ActionSheet>
 </template>
 
 <script lang="ts" setup>
 import { getAdmissionTrendsByCollege } from '@/service/index/api'
 import { useUserStore } from '@/store'
 import Region from '@/pages-sub/home/components/Region.vue'
-import CustomPickerView from '@/pages-sub/components/CustomPickerView.vue'
+
 import ActionSheet from '@/pages-sub/components/ActionSheet.vue'
 
 const props = defineProps({
@@ -105,8 +86,6 @@ const provinceCode = ref([userStore.userInfo.city.code])
 const year = ref(0)
 
 const pickList = ref([])
-const pickValue = ref('')
-let pickType = 1
 
 const tableData = ref([])
 
@@ -118,13 +97,10 @@ watch(
 )
 
 const show = ref(false)
-const handleShow = (type: number) => {
+const handleShow = () => {
   show.value = true
-  pickType = type
 
-  if (type === 2) {
-    pickList.value = []
-  }
+  pickList.value = []
 }
 
 const getPlanProListData = async (newVal) => {
@@ -148,15 +124,10 @@ const getPlanProListData = async (newVal) => {
   })
 }
 
-const handleConfirm = () => {
-  if (pickType === 1) {
-  } else if (pickType === 2) {
-  }
-  show.value = false
-  getPlanProListData(props.id)
-}
-
 const handleRegionChange = (val) => {
+  if (val.length > 0) {
+    show.value = false
+  }
   provinceCode.value = val
   getPlanProListData(props.id)
 }
@@ -167,6 +138,7 @@ const handleRegionChangeName = (val) => {
 </script>
 <style lang="scss" scoped>
 @import '@/pages-sub/home/styles/picker-view-btn.scss';
+@import '@/pages-sub/home/styles/grid-checkbox.scss';
 
 .th-border {
   border: 2rpx solid #eeeeee;
diff --git a/src/pages-sub/home/college/index.vue b/src/pages-sub/home/college/index.vue
index cd9af50..2399c2c 100644
--- a/src/pages-sub/home/college/index.vue
+++ b/src/pages-sub/home/college/index.vue
@@ -67,7 +67,7 @@
                 class="custom-check-group"
               />
               <view class="flex items-center justify-between px-[16rpx] pb-[32rpx]">
-                <view class="cancel-btn" @click="handleClear">清空</view>
+                <view class="cancel-btn" @click="handleClear(index)">清空</view>
                 <view class="submit-btn" @click="handleCheck">查看</view>
               </view>
             </drop-menu-item>
@@ -176,13 +176,15 @@ const itemClick = (item, index) => {
   uni.navigateTo({ url: `/pages-sub/home/college/info?collegeId=${item._id}` })
 }
 
-const handleClear = () => {
-  regionKeyInfo.value = []
-  uniTypeKeyInfo.value = []
-  natureKeyInfo.value = []
-  subMenu.value.forEach((item) => {
-    item.activation = false
-  })
+const handleClear = (index: number) => {
+  if (currentMenu.value === 1) {
+    regionKeyInfo.value = []
+  } else if (currentMenu.value === 2) {
+    uniTypeKeyInfo.value = []
+  } else if (currentMenu.value === 3) {
+    natureKeyInfo.value = []
+  }
+  subMenu.value[index].activation = false
   dropMenuRef.value.closeDropMenu()
 }
 
diff --git a/src/pages-sub/home/components/FilterMenu.vue b/src/pages-sub/home/components/FilterMenu.vue
index b246e86..466639e 100644
--- a/src/pages-sub/home/components/FilterMenu.vue
+++ b/src/pages-sub/home/components/FilterMenu.vue
@@ -29,7 +29,6 @@
           <Region
             width="240rpx"
             height="60rpx"
-            class="custom-pl"
             v-show="currentMenu === 2"
             :defaultValue="defaultRegion"
             @change-obj="handleRegionChangeObj"
@@ -54,7 +53,7 @@
       </scroll-view>
     </view>
     <scroll-view class="box-shadow" :scroll-x="true">
-      <view class="flex items-center gap-[24rpx] w-max px-[32rpx] pt-[32rpx] pb-[40rpx]">
+      <view class="flex items-center gap-[24rpx] w-max px-[32rpx] pt-[32rpx] pb-[40rpx] h-[58rpx]">
         <view
           class="px-[20rpx] py-[12rpx] bg-[#f8f8f8] rounded-[8rpx]"
           v-for="(item, index) in filterParams"
@@ -123,8 +122,6 @@ const chooseCollegeFeature = ref([])
 const choosePhase = ref('')
 
 const handleRegionChangeObj = (val: any[]) => {
-  console.log(val)
-
   defaultRegion.value = val.map((item) => item.code)
   chooseRegion.value = val.map((item) => item.name)
 
@@ -173,13 +170,15 @@ const handleCollegeFeatureChangeObj = (val: any[]) => {
 }
 
 const handlePhaseChange = (val: any) => {
-  choosePhase.value = val.batch
-  filterParams.value = filterParams.value.filter((item) => item.type !== 'phase')
+  if (props.menuBit & 1) {
+    choosePhase.value = val.batch
+    filterParams.value = filterParams.value.filter((item) => item.type !== 'phase')
 
-  filterParams.value.push({
-    type: 'phase',
-    value: { ...val, name: val.batch },
-  })
+    filterParams.value.push({
+      type: 'phase',
+      value: { ...val, name: val.batch },
+    })
+  }
 }
 
 const handleRemove = (removeItem: { type: string; value: any }, index: number) => {
@@ -230,7 +229,7 @@ const clearForm = () => {
   defaultUniType.value = []
   defaultNature.value = []
   defaultRegion.value = []
-  defaultPhase.value = ''
+  filterParams.value = filterParams.value.filter((item) => item.type === 'phase')
 }
 
 defineExpose({
diff --git a/src/pages-sub/home/components/Region.vue b/src/pages-sub/home/components/Region.vue
index 10a2bba..3f58f62 100644
--- a/src/pages-sub/home/components/Region.vue
+++ b/src/pages-sub/home/components/Region.vue
@@ -11,11 +11,6 @@
 <script lang="ts" setup>
 import { getRegionInfo } from '@/service/index/api'
 import CheckGroup from '@/pages-sub/components/check-group/CheckGroup.vue'
-defineOptions({
-  options: {
-    styleIsolation: 'shared',
-  },
-})
 
 interface Region {
   code: string
diff --git a/src/pages-sub/home/distinguish/index.vue b/src/pages-sub/home/distinguish/index.vue
index 90abf87..1ee8265 100644
--- a/src/pages-sub/home/distinguish/index.vue
+++ b/src/pages-sub/home/distinguish/index.vue
@@ -88,30 +88,21 @@
               mode="scaleToFill"
               class="w-[240rpx] h-[240rpx]"
             />
-            <view class="text-[28rpx] mt-[10rpx] px-[20rpx]">没有数据哦~</view>
+            <view class="text-[28rpx] mt-[30rpx] px-[20rpx] text-[#666]">没有数据哦~</view>
           </view>
         </view>
       </view>
     </scroll-view>
 
-    <ActionSheet v-model:show="show" title="">
+    <ActionSheet v-model:show="show" title="省份">
       <template>
-        <view class="pt-[32rpx] flex flex-col items-center justify-center">
-          <text class="text-[#303030] text-[36rpx] font-bold">省份</text>
-          <Region
-            @change="handleRegionChangeCode"
-            @change-name="handleRegionChangeName"
-            :defaultValue="searchParams.locationCode ? [searchParams.locationCode] : []"
-            :max="1"
-            class="custom-check-group w-full"
-          />
-        </view>
-      </template>
-      <template #footer>
-        <view class="flex items-center justify-between gap-[22rpx]">
-          <view class="cancel-btn" @click="show = false">取消</view>
-          <view class="submit-btn" @click="handleConfirm">确认</view>
-        </view>
+        <Region
+          @change="handleRegionChangeCode"
+          @change-name="handleRegionChangeName"
+          :defaultValue="searchParams.locationCode ? [searchParams.locationCode] : []"
+          :max="1"
+          class="custom-check-group w-full"
+        />
       </template>
     </ActionSheet>
   </view>
@@ -138,6 +129,9 @@ const handleRegionChangeName = (val) => {
   searchParams.value.locationName = val.join(',')
 }
 const handleRegionChangeCode = (val) => {
+  if (val.length > 0) {
+    show.value = false
+  }
   searchParams.value.locationCode = val.length > 0 ? val[0] : ''
   getUniversityList()
 }
diff --git a/src/pages-sub/home/expand/index.vue b/src/pages-sub/home/expand/index.vue
index 7eb2dea..da1fc99 100644
--- a/src/pages-sub/home/expand/index.vue
+++ b/src/pages-sub/home/expand/index.vue
@@ -34,7 +34,7 @@
           :key="item.id"
           :title="item.title"
           custom-class="flex items-center"
-          v-for="item in subMenu"
+          v-for="(item, index) in subMenu"
           :activation="item.activation"
         >
           <Region
@@ -59,7 +59,7 @@
             v-if="item.id === 3"
           />
           <view class="flex items-center justify-between px-[16rpx] pb-[32rpx]">
-            <view class="cancel-btn" @click="handleClear">清空</view>
+            <view class="cancel-btn" @click="handleClear(index)">清空</view>
             <view class="submit-btn" @click="handleCheck">查看</view>
           </view>
         </drop-menu-item>
@@ -228,13 +228,15 @@ const regionKeyInfo = ref([]) // 省份信息
 const uniTypeKeyInfo = ref([]) // 层次信息
 const natureKeyInfo = ref([]) // 类型信息
 
-const handleClear = () => {
-  regionKeyInfo.value = []
-  uniTypeKeyInfo.value = []
-  natureKeyInfo.value = []
-  subMenu.value.forEach((item) => {
-    item.activation = false
-  })
+const handleClear = (index: number) => {
+  if (subMenu.value[index].id === 1) {
+    regionKeyInfo.value = []
+  } else if (subMenu.value[index].id === 2) {
+    uniTypeKeyInfo.value = []
+  } else if (subMenu.value[index].id === 3) {
+    natureKeyInfo.value = []
+  }
+  subMenu.value[index].activation = false
   dropMenuRef.value.closeDropMenu()
 }
 
diff --git a/src/pages-sub/home/line/index.vue b/src/pages-sub/home/line/index.vue
index c643c42..e680b74 100644
--- a/src/pages-sub/home/line/index.vue
+++ b/src/pages-sub/home/line/index.vue
@@ -111,6 +111,9 @@ const handleYearChange = (val) => {
     _yearList = val
   }
   searchParams.value.year = _yearList.join(',')
+  if (val.length !== 0) {
+    dropMenuRef.value.closeDropMenu()
+  }
 
   getBatchListData()
 }
diff --git a/src/pages-sub/home/major/components/MajorBaseInfo.vue b/src/pages-sub/home/major/components/MajorBaseInfo.vue
index ae9bc85..53371b0 100644
--- a/src/pages-sub/home/major/components/MajorBaseInfo.vue
+++ b/src/pages-sub/home/major/components/MajorBaseInfo.vue
@@ -47,6 +47,7 @@
       block
       class="mt-[24rpx] rounded-[8rpx]! bg-[#f8f8f8]! w-full text-[#303030]! text-[28rpx]! flex! items-center! justify-center! gap-[16rpx]"
       @click="handleFullFun(3)"
+      v-show="courseInfo.length > 4"
     >
       查看全部
       <view class="i-carbon-chevron-down rotate-270"></view>
diff --git a/src/pages-sub/home/styles/grid-checkbox.scss b/src/pages-sub/home/styles/grid-checkbox.scss
index 3e41604..f0f577b 100644
--- a/src/pages-sub/home/styles/grid-checkbox.scss
+++ b/src/pages-sub/home/styles/grid-checkbox.scss
@@ -1,9 +1,9 @@
 .custom-check-group {
   :deep(.checkbox-group) {
     display: grid;
-    grid-template-columns: 1fr 1fr 1fr 1fr;
+    grid-template-columns: repeat(4, 1fr);
     gap: 16rpx;
-    padding: 32rpx 16rpx 16rpx;
+    padding: 24rpx 24rpx 36rpx;
   }
 
   :deep(.custom-checkbox) {
diff --git a/src/pages-sub/home/wishesList/components/ScrollListItemAction.vue b/src/pages-sub/home/wishesList/components/ScrollListItemAction.vue
index ee67d6e..daaf587 100644
--- a/src/pages-sub/home/wishesList/components/ScrollListItemAction.vue
+++ b/src/pages-sub/home/wishesList/components/ScrollListItemAction.vue
@@ -21,7 +21,7 @@
     <CollegeMajor :college="college" v-bind="$attrs" v-if="college" />
 
     <template #footer>
-      <view class="flex items-center justify-between gap-[30rpx]">
+      <view class="flex items-center justify-between mx-[32rpx] gap-[22rpx] pt-[16rpx]">
         <view class="cancel-btn" @click="handleConfirm">取消</view>
         <view class="submit-btn" @click="handleConfirm">确认</view>
       </view>
diff --git a/src/pages-sub/home/wishesList/index.vue b/src/pages-sub/home/wishesList/index.vue
index 44d49ef..3327de5 100644
--- a/src/pages-sub/home/wishesList/index.vue
+++ b/src/pages-sub/home/wishesList/index.vue
@@ -97,15 +97,14 @@
     </template>
   </z-paging>
   <ActionSheet v-model:show="show" :title="actionTitle">
-    <view class="px-[36rpx]">
-      <Region
-        v-if="actionType === 2"
-        width="210rpx"
-        height="60rpx"
-        class="px-[32rpx]"
-        @change-name="handleRegionName"
-      />
-    </view>
+    <Region
+      v-if="actionType === 2"
+      width="210rpx"
+      height="60rpx"
+      class="custom-check-group"
+      @change-name="handleRegionName"
+    />
+
     <FilterMenu v-if="actionType === 1" :show-phase="false" ref="filterMenuRef" :menuBit="28" />
     <CustomPickerView
       v-if="actionType === 3"
@@ -116,7 +115,7 @@
       @change="handleTypeModelChange"
     />
     <template #footer>
-      <view class="flex items-center justify-between gap-[30rpx]">
+      <view class="flex items-center justify-between mx-[32rpx] gap-[22rpx]">
         <view class="cancel-btn" @click="show = false">取消</view>
         <view class="submit-btn" @click="handleConfirm">确认</view>
       </view>
@@ -282,6 +281,7 @@ const handlePreview = () => {
 
 <style lang="scss" scoped>
 @import '@/pages-sub/home/styles/picker-view-btn.scss';
+@import '@/pages-sub/home/styles/grid-checkbox.scss';
 
 .custom-slider {
   flex: 1 1 auto;
diff --git a/src/pages-sub/ucenter/active/activePage.vue b/src/pages-sub/ucenter/active/activePage.vue
index a1d716c..cad4b47 100644
--- a/src/pages-sub/ucenter/active/activePage.vue
+++ b/src/pages-sub/ucenter/active/activePage.vue
@@ -98,7 +98,7 @@
     default-width="472rpx"
   >
     <template>
-      <view class="mt-[60rpx] flex flex-col items-center">
+      <view class="mt-[60rpx] flex flex-col items-center mb-[10rpx]">
         <image
           src="data:image/png;base64,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"
           mode="aspectFit"