From 8ea064eba4186f4669a380ddc3832c4c677673f3 Mon Sep 17 00:00:00 2001
From: xjs <xjs@ycymedu.com>
Date: Fri, 23 May 2025 11:38:17 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages-sub/customerService/index/index.vue |  2 +-
 .../college/components/EnrollmentPlan.vue     |  8 ++++----
 .../home/major/components/MajorTreeList.vue   |  8 +++++---
 .../wishesList/components/CustomCheckbox.vue  |  6 +++---
 .../home/wishesList/components/DataTable.vue  | 19 +++++++++++++------
 .../wishesList/components/FilterMajorList.vue | 10 ++--------
 .../components/FilterMajorTreeList.vue        | 10 +++++-----
 .../home/wishesList/components/HeaderTip.vue  | 12 +++++++++---
 src/pages-sub/home/wishesList/index.vue       |  8 ++++----
 src/pages-sub/home/wishesList/wishesList.vue  |  2 +-
 src/pages-sub/ucenter/setting/about.vue       |  2 +-
 src/pages-sub/ucenter/star/myStar.vue         | 11 +++++++++--
 12 files changed, 57 insertions(+), 41 deletions(-)

diff --git a/src/pages-sub/customerService/index/index.vue b/src/pages-sub/customerService/index/index.vue
index d805d2e..dc62b4c 100644
--- a/src/pages-sub/customerService/index/index.vue
+++ b/src/pages-sub/customerService/index/index.vue
@@ -57,7 +57,7 @@
 <script lang="ts" setup>
 import Navbar from '@/pages-sub/components/navbar/Navbar.vue'
 
-const phoneNumber = '400-621-1003'
+const phoneNumber = '18724728603'
 
 const makePhoneCall = () => {
   uni
diff --git a/src/pages-sub/home/college/components/EnrollmentPlan.vue b/src/pages-sub/home/college/components/EnrollmentPlan.vue
index 193d492..56f2e38 100644
--- a/src/pages-sub/home/college/components/EnrollmentPlan.vue
+++ b/src/pages-sub/home/college/components/EnrollmentPlan.vue
@@ -24,15 +24,15 @@
 
     <scroll-view class="mt-[38rpx] flex-1 pb-safe">
       <WXXTable :data="tableData" v-if="!flag">
-        <WXXTableCol prop="universityName" label="院校名称" width="25%"></WXXTableCol>
-        <WXXTableCol prop="major" label="招生专业" width="37%"></WXXTableCol>
+        <!-- <WXXTableCol prop="universityName" label="院校名称" width="25%"></WXXTableCol> -->
+        <WXXTableCol prop="major" label="招生专业" width="62%"></WXXTableCol>
         <WXXTableCol prop="plancount" label="计划数" width="13%"></WXXTableCol>
         <WXXTableCol prop="academic" label="学制" width="10%"></WXXTableCol>
         <WXXTableCol prop="fee" label="学费" width="15%"></WXXTableCol>
       </WXXTable>
       <WXXTable :data="tableData" v-else>
-        <WXXTableCol prop="universityName" label="院校名称" width="20%"></WXXTableCol>
-        <WXXTableCol prop="majorgroupname" label="专业组" width="15%"></WXXTableCol>
+        <!-- <WXXTableCol prop="universityName" label="院校名称" width="20%"></WXXTableCol> -->
+        <WXXTableCol prop="majorgroupname" label="专业组" width="35%"></WXXTableCol>
         <WXXTableCol prop="major" label="招生专业" width="30%"></WXXTableCol>
         <WXXTableCol prop="plancount" label="计划数" width="15%"></WXXTableCol>
         <WXXTableCol prop="academic" label="学制" width="10%"></WXXTableCol>
diff --git a/src/pages-sub/home/major/components/MajorTreeList.vue b/src/pages-sub/home/major/components/MajorTreeList.vue
index 9bb4de2..cc1722d 100644
--- a/src/pages-sub/home/major/components/MajorTreeList.vue
+++ b/src/pages-sub/home/major/components/MajorTreeList.vue
@@ -9,12 +9,12 @@
       <CollapseItem v-for="(item, index) in subMajorList.items" :key="item.key" :name="`${index}`">
         <template #title="{ expanded }">
           <view class="header">
-            <text :class="`text-[24rpx] text-[#303030] ${expanded ? 'text-[#1580FF]!' : ''}`">
+            <text :class="`text-[26rpx] text-[#303030] ${expanded ? 'text-[#1580FF]!' : ''}`">
               {{ item.name }}
             </text>
             <view class="flex items-center justify-between">
               <text
-                :class="`mr-[12rpx] text-[24rpx] text-[#303030] ${expanded ? 'text-[#1580FF]!' : ''}`"
+                :class="`mr-[12rpx] text-[26rpx] text-[#303030] ${expanded ? 'text-[#1580FF]!' : ''}`"
               >
                 {{ item.childMajors.length }}
               </text>
@@ -33,7 +33,9 @@
             :key="childMajor.zymc"
             @click="navigatorToMajorInfo(childMajor)"
           >
-            {{ childMajor.zymc }}
+            <view class="ml-[32rpx]">
+              {{ childMajor.zymc }}
+            </view>
           </view>
         </view>
       </CollapseItem>
diff --git a/src/pages-sub/home/wishesList/components/CustomCheckbox.vue b/src/pages-sub/home/wishesList/components/CustomCheckbox.vue
index 3d8a9f2..b14a732 100644
--- a/src/pages-sub/home/wishesList/components/CustomCheckbox.vue
+++ b/src/pages-sub/home/wishesList/components/CustomCheckbox.vue
@@ -1,12 +1,12 @@
 <template>
   <view class="flex items-center">
-    <view class="i-carbon-checkbox w-[32rpx] h-[32rpx]" v-if="status === 1"></view>
+    <view class="i-carbon-checkbox w-[40rpx] h-[40rpx] text-[#ccc]" v-if="status === 1"></view>
     <view
-      class="i-carbon-checkbox-undeterminate-filled w-[32rpx] h-[32rpx] text-[#1677FF]"
+      class="i-carbon-checkbox-undeterminate-filled w-[40rpx] h-[40rpx] text-[#1677FF]"
       v-if="status === 2"
     ></view>
     <view
-      class="i-carbon-checkbox-checked-filled w-[32rpx] h-[32rpx] text-[#1677FF]"
+      class="i-carbon-checkbox-checked-filled w-[40rpx] h-[40rpx] text-[#1677FF]"
       v-if="status === 3"
     ></view>
   </view>
diff --git a/src/pages-sub/home/wishesList/components/DataTable.vue b/src/pages-sub/home/wishesList/components/DataTable.vue
index fdd292a..2b4f8a7 100644
--- a/src/pages-sub/home/wishesList/components/DataTable.vue
+++ b/src/pages-sub/home/wishesList/components/DataTable.vue
@@ -58,7 +58,7 @@
       </view>
     </view>
 
-    <MessageBox v-model:show="show" title="" :defaultPadding="false" defaultWidth="85%">
+    <!-- <MessageBox v-model:show="show" title="" :defaultPadding="false" defaultWidth="85%">
       <template>
         <view class="">
           <view class="text-[#000] text-[36rpx] font-700 mt-[40rpx] text-center">{{ title }}</view>
@@ -73,12 +73,12 @@
           </view>
         </view>
       </template>
-    </MessageBox>
+    </MessageBox> -->
   </view>
 </template>
 
 <script lang="ts" setup>
-import MessageBox from '@/pages-sub/components/messageBox/MessageBox.vue'
+// import MessageBox from '@/pages-sub/components/messageBox/MessageBox.vue'
 
 defineOptions({
   inheritAttrs: true,
@@ -106,12 +106,19 @@ const showToast = (type: number) => {
     tipContent.value =
       '根据考生历年的等效位次 - 志愿历年录取位次的差值得出，位次差可更准确的与历年位次进行比较。'
   }
+
+  uni.showModal({
+    title: title.value,
+    content: tipContent.value,
+    showCancel: false,
+    confirmColor: '#1580FF',
+  })
   show.value = true
 }
 
-const handleSubmit = () => {
-  show.value = false
-}
+// const handleSubmit = () => {
+//   show.value = false
+// }
 
 const columns = ref([
   { label: '年份', key: 'year', width: '62rpx' },
diff --git a/src/pages-sub/home/wishesList/components/FilterMajorList.vue b/src/pages-sub/home/wishesList/components/FilterMajorList.vue
index 7b276d2..0f5c62e 100644
--- a/src/pages-sub/home/wishesList/components/FilterMajorList.vue
+++ b/src/pages-sub/home/wishesList/components/FilterMajorList.vue
@@ -17,12 +17,8 @@
         </scroll-view>
       </view>
       <scroll-view class="pb-[14rpx] h-[40vh] pt-[32rpx] flex-1" :scroll-y="true">
-        <view>
-          <MajorTreeList
-            v-if="currentMenuObj"
-            v-model:subMajorList="currentMenuObj"
-            @change-check="handleChangeCheck"
-          />
+        <view v-if="currentMenuObj">
+          <MajorTreeList v-model:subMajorList="currentMenuObj" @change-check="handleChangeCheck" />
         </view>
       </scroll-view>
     </view>
@@ -76,8 +72,6 @@ const changeMenu = (item: any) => {
 }
 
 const handleChangeCheck = (params) => {
-  console.log(params)
-
   const groupIndex = menus.value.findIndex((menu) => menu.key === params.groupItem.key)
   if (Object.prototype.toString.call(params.cIndex) === '[object Undefined]') {
     // 选中了专业大类
diff --git a/src/pages-sub/home/wishesList/components/FilterMajorTreeList.vue b/src/pages-sub/home/wishesList/components/FilterMajorTreeList.vue
index e171e26..153ecbe 100644
--- a/src/pages-sub/home/wishesList/components/FilterMajorTreeList.vue
+++ b/src/pages-sub/home/wishesList/components/FilterMajorTreeList.vue
@@ -9,12 +9,12 @@
       <CollapseItem v-for="(item, index) in subMajorList.items" :key="item.key" :name="`${index}`">
         <template #title="{ expanded }">
           <view class="header">
-            <text :class="`text-[24rpx] text-[#303030] ${expanded ? 'text-[#1580FF]!' : ''}`">
+            <text :class="`text-[26rpx] text-[#303030] ${expanded ? 'text-[#1580FF]!' : ''}`">
               {{ item.name }}
             </text>
             <view class="flex items-center justify-between">
               <text
-                :class="`mr-[12rpx] text-[24rpx] text-[#303030] ${expanded ? 'text-[#1580FF]!' : ''}`"
+                :class="`mr-[10rpx] text-[28rpx] text-[#303030] ${expanded ? 'text-[#1580FF]!' : ''}`"
               >
                 {{ item.childMajors.length }}
               </text>
@@ -23,7 +23,7 @@
                 v-if="expanded"
               ></view>
               <view class="i-carbon-chevron-down text-[16rpx]" v-else></view>
-              <view @click.stop="handleCheckSubMajor(item, index)" class="ml-[20rpx]">
+              <view @click.stop="handleCheckSubMajor(item, index)" class="ml-[8rpx]">
                 <CustomCheckbox :status="item.check" />
               </view>
             </view>
@@ -36,7 +36,7 @@
             :key="childMajor.zymc"
             @click="handleCheckMajor(childMajor, index, cIndex)"
           >
-            <view>
+            <view :class="`${childMajor.check === 3 ? 'text-[#1580FF]' : ''} ml-[32rpx]`">
               {{ childMajor.zymc }}
             </view>
             <view class="mr-[32rpx]">
@@ -73,7 +73,7 @@ const props = defineProps({
   },
 })
 
-const collapseValue = ref<string>('0')
+const collapseValue = ref<string>('')
 const emits = defineEmits(['update:subMajorList', 'changeCheck'])
 
 const handleCheckSubMajor = (_item: any, index: number) => {
diff --git a/src/pages-sub/home/wishesList/components/HeaderTip.vue b/src/pages-sub/home/wishesList/components/HeaderTip.vue
index 210177f..72320de 100644
--- a/src/pages-sub/home/wishesList/components/HeaderTip.vue
+++ b/src/pages-sub/home/wishesList/components/HeaderTip.vue
@@ -12,7 +12,7 @@
     <view v-if="type === 0" class="flex items-center" @click="showToast">
       <text>重要提示</text>
       <text class="i-carbon-help"></text>
-      <MessageBox v-model:show="show" title="" :defaultPadding="false" defaultWidth="85%">
+      <!-- <MessageBox v-model:show="show" title="" :defaultPadding="false" defaultWidth="85%">
         <template>
           <view class="">
             <view class="text-[#000] text-[36rpx] font-700 mt-[40rpx] text-center">重要提示</view>
@@ -32,7 +32,7 @@
             </view>
           </view>
         </template>
-      </MessageBox>
+      </MessageBox> -->
     </view>
 
     <HeaderModelTip v-if="type === 1" />
@@ -55,7 +55,13 @@ defineProps({
 
 const show = ref(false)
 const showToast = () => {
-  show.value = true
+  uni.showModal({
+    title: '重要提示',
+    content:
+      '1.本平台基于历史分数及等效位次进行志愿推荐和风险评估，由于志愿填报本身存在不确定性，请谨慎参考。\r\n 2.在正式填报时，院校/专业名称及代码请务必与官方信息平台核对，若发现差异则以官方数据为准，本平台数据仅供参考。',
+    showCancel: false,
+    confirmColor: '#1580FF',
+  })
 }
 
 const handleSubmit = () => {
diff --git a/src/pages-sub/home/wishesList/index.vue b/src/pages-sub/home/wishesList/index.vue
index 26f5d9e..cda72b5 100644
--- a/src/pages-sub/home/wishesList/index.vue
+++ b/src/pages-sub/home/wishesList/index.vue
@@ -107,23 +107,23 @@
   </z-paging>
   <ActionSheet v-model:show="show" :title="actionTitle">
     <Region
-      v-if="actionType === 2"
+      v-show="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" />
+    <FilterMenu v-show="actionType === 1" :show-phase="false" ref="filterMenuRef" :menuBit="28" />
     <CustomPickerView
-      v-if="actionType === 3"
+      v-show="actionType === 3"
       :list="typeModelList"
       v-model:modelValue="collegeSearch.tModelValue"
       value-key="value"
       label-key="name"
       @change="handleTypeModelChange"
     />
-    <FilterMajorList ref="filterMajorRef" v-if="actionType === 4" :type="1050" class="h-full" />
+    <FilterMajorList ref="filterMajorRef" v-show="actionType === 4" :type="1050" class="h-full" />
     <template #footer>
       <view class="flex items-center justify-between mx-[32rpx] gap-[20rpx]">
         <view class="cancel-btn" @click="show = false">取消</view>
diff --git a/src/pages-sub/home/wishesList/wishesList.vue b/src/pages-sub/home/wishesList/wishesList.vue
index 45a070c..8b72148 100644
--- a/src/pages-sub/home/wishesList/wishesList.vue
+++ b/src/pages-sub/home/wishesList/wishesList.vue
@@ -121,7 +121,7 @@ let vTbId = ref(0)
 let webUrl = computed(() => {
   if (vTbId.value !== 0) {
     //sort.ycymedu.com
-    return `https://sort.ycymedu.com/sort-college?id=${vTbId.value}&token=${userStore.userInfo.token}&score=${userStore.userInfo.estimatedAchievement.expectedScore}&batchName=${userStore.userInfo.batchName}&subjectGroup=${userStore.userInfo.estimatedAchievement.subjectGroup}&location=${userStore.userInfo.estimatedAchievement.provinceCode}`
+    return `https://sort.ycymedu.com/sort-college?id=${vTbId.value}&token=${userStore.userInfo.token}&score=${userStore.userInfo.estimatedAchievement.expectedScore}&batchName=${userStore.userInfo.batchName}&subjectGroup=${userStore.userInfo.estimatedAchievement.subjectGroup}&location=${userStore.userInfo.estimatedAchievement.provinceCode}&timestamp=${new Date().getTime()}`
   }
   return ''
 })
diff --git a/src/pages-sub/ucenter/setting/about.vue b/src/pages-sub/ucenter/setting/about.vue
index 096431c..607c14d 100644
--- a/src/pages-sub/ucenter/setting/about.vue
+++ b/src/pages-sub/ucenter/setting/about.vue
@@ -42,7 +42,7 @@
 </template>
 
 <script setup lang="ts">
-const phoneNumber = '0531-58786060'
+const phoneNumber = '18724728603'
 
 const makePhoneCall = () => {
   uni
diff --git a/src/pages-sub/ucenter/star/myStar.vue b/src/pages-sub/ucenter/star/myStar.vue
index 91a2d46..bf48e39 100644
--- a/src/pages-sub/ucenter/star/myStar.vue
+++ b/src/pages-sub/ucenter/star/myStar.vue
@@ -33,9 +33,13 @@
       class="item-wrapper"
       :id="`zp-id-${item.zp_index}`"
       :key="item.zp_index"
-      v-for="(item, index) in starList"
+      v-for="item in starList"
     >
-      <view class="flex gap-[24rpx] py-[40rpx] border-bt" v-if="currentTab === 0">
+      <view
+        class="flex gap-[24rpx] py-[40rpx] border-bt"
+        v-if="currentTab === 0"
+        @click.stop="navigatorTo(item)"
+      >
         <image
           class="min-w-[112rpx] min-h-[112rpx] w-[112rpx] h-[112rpx]"
           :src="item.logo"
@@ -121,6 +125,9 @@ const handleStar = (item: any) => {
     })
   }
 }
+const navigatorTo = (item: any) => {
+  uni.navigateTo({ url: `/pages-sub/home/college/info?collegeId=${item._id}` })
+}
 </script>
 <style lang="scss" scoped>
 .collect-btn {