From 84661225c2a9c269c38cc79669ca91ff264cd5b4 Mon Sep 17 00:00:00 2001
From: xjs <xjs@ycymedu.com>
Date: Wed, 7 May 2025 13:24:54 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=93=E4=B8=9A=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/aiService-sub/index/index.vue                | 10 +---------
 .../composable/rankAreaEchart.ts                 |  6 +++---
 .../components/drop-menu/DropMenuItem.vue        |  2 +-
 .../home/college/components/EnrollmentPlan.vue   | 15 ++++++++++++++-
 src/pages-sub/home/college/info.vue              |  4 ++--
 .../home/wishesList/components/CollegeMajor.vue  | 16 ++++++++++++----
 6 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/src/aiService-sub/index/index.vue b/src/aiService-sub/index/index.vue
index 39d0051..d740334 100644
--- a/src/aiService-sub/index/index.vue
+++ b/src/aiService-sub/index/index.vue
@@ -8,14 +8,6 @@
 </route>
 <template>
   <web-view :src="url" @message="handleChildMessage" :update-title="false" />
-  <!-- <input
-    v-model="message"
-    type="text"
-    placeholder="请输入你的高考分数"
-    confirm-type="done"
-    class="flex-auto"
-    @confirm="handleMessage"
-  /> -->
 </template>
 
 <script setup lang="ts">
@@ -26,7 +18,7 @@ const userStore = useUserStore()
 //chat.ycymedu.com
 //chatv2.ycymedu.com
 const url = ref(
-  `https://chat.ycymedu.com?userId=${userStore.userInfo.estimatedAchievement.wxId}&subjectGroup=${userStore.userInfo.estimatedAchievement.subjectGroup}&expectedScore=${userStore.userInfo.estimatedAchievement.expectedScore}&provinceName=${userStore.userInfo.estimatedAchievement.provinceName}&locationCode=${userStore.userInfo.estimatedAchievement.provinceCode}&token=${userStore.userInfo.token}`,
+  `https://chat.ycymedu.com?userId=${userStore.userInfo.estimatedAchievement.wxId}&subjectGroup=${userStore.userInfo.estimatedAchievement.subjectGroup}&expectedScore=${userStore.userInfo.estimatedAchievement.expectedScore}&provinceName=${userStore.userInfo.estimatedAchievement.provinceName}&locationCode=${userStore.userInfo.estimatedAchievement.provinceCode}&token=${userStore.userInfo.token}?timestamp=${new Date().getTime()}`,
 )
 
 const handleChildMessage = (event) => {
diff --git a/src/pages-evaluation-sub/composable/rankAreaEchart.ts b/src/pages-evaluation-sub/composable/rankAreaEchart.ts
index 6ebbdae..75a0be6 100644
--- a/src/pages-evaluation-sub/composable/rankAreaEchart.ts
+++ b/src/pages-evaluation-sub/composable/rankAreaEchart.ts
@@ -81,8 +81,8 @@ export const initRankAreaEchart = ({
             },
             data: [
               {
-                xAxis: Score,
-                yAxis: currentCount,
+                xAxis: `${Score}`,
+                yAxis: `${currentCount}`,
                 label: {
                   show: true,
                   position: 'top',
@@ -117,7 +117,7 @@ export const initRankAreaEchart = ({
             },
             data: [
               {
-                xAxis: Score,
+                xAxis: `${Score}`,
                 label: {
                   show: false,
                 },
diff --git a/src/pages-sub/components/drop-menu/DropMenuItem.vue b/src/pages-sub/components/drop-menu/DropMenuItem.vue
index bdc68ea..e957803 100644
--- a/src/pages-sub/components/drop-menu/DropMenuItem.vue
+++ b/src/pages-sub/components/drop-menu/DropMenuItem.vue
@@ -80,7 +80,7 @@ const { activeIndex, addTitle, closeDropMenu, zIndex, duration, direction, title
 const itemIndex = ref(-1)
 
 // 是否显示下拉内容
-const isShow = computed(() => activeIndex.value === itemIndex.value)
+const isShow = computed(() => activeIndex.value !== -1 && activeIndex.value === itemIndex.value)
 
 // 监听显示状态变化
 watch(isShow, (newVal) => {
diff --git a/src/pages-sub/home/college/components/EnrollmentPlan.vue b/src/pages-sub/home/college/components/EnrollmentPlan.vue
index 9984afd..193d492 100644
--- a/src/pages-sub/home/college/components/EnrollmentPlan.vue
+++ b/src/pages-sub/home/college/components/EnrollmentPlan.vue
@@ -23,13 +23,21 @@
     </view>
 
     <scroll-view class="mt-[38rpx] flex-1 pb-safe">
-      <WXXTable :data="tableData">
+      <WXXTable :data="tableData" v-if="!flag">
         <WXXTableCol prop="universityName" label="院校名称" width="25%"></WXXTableCol>
         <WXXTableCol prop="major" label="招生专业" width="37%"></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="major" label="招生专业" width="30%"></WXXTableCol>
+        <WXXTableCol prop="plancount" label="计划数" width="15%"></WXXTableCol>
+        <WXXTableCol prop="academic" label="学制" width="10%"></WXXTableCol>
+        <WXXTableCol prop="fee" label="学费" width="15%"></WXXTableCol>
+      </WXXTable>
     </scroll-view>
 
     <ActionSheet v-model:show="show" title="">
@@ -99,6 +107,7 @@ const handleShow = (type: number) => {
   }
 }
 
+const flag = ref(false)
 const getPlanProListData = async (newVal) => {
   getPlanProList({
     years: year.value === '全部年份' ? '' : year.value,
@@ -116,6 +125,10 @@ const getPlanProListData = async (newVal) => {
       batches.value = ['全部分类', ..._res.batches.map((item) => item.batchName)]
       tableData.value = _res.plans
 
+      if (_res.plans.length > 0) {
+        flag.value = !!_res.plans[0].majorgroupname
+      }
+
       if (isFirst) {
         year.value = yearList.value[0]
         batche.value = batches.value[0]
diff --git a/src/pages-sub/home/college/info.vue b/src/pages-sub/home/college/info.vue
index 1d3e8fd..441636b 100644
--- a/src/pages-sub/home/college/info.vue
+++ b/src/pages-sub/home/college/info.vue
@@ -51,11 +51,11 @@
             v-if="startFlag"
           ></view>
           <view class="i-carbon-star min-w-[24rpx] min-h-[24rxp]" v-else></view>
-          收藏
+          <view class="leading-[1]">收藏</view>
         </button>
       </view>
 
-      <view class="mb-[32rpx] h-[126rpx]">
+      <view class="mb-[32rpx] h-[126rpx] min-h-[126rpx]">
         <swiper
           class="mx-[32rpx]"
           circular
diff --git a/src/pages-sub/home/wishesList/components/CollegeMajor.vue b/src/pages-sub/home/wishesList/components/CollegeMajor.vue
index a03b01b..50bceec 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] px-[32rpx] pb-[30rpx] custom-background flex gap-[58rpx]"
+    class="pt-[32rpx] px-[32rpx] pb-[30rpx] custom-background flex gap-[48rpx]"
     :style="`--background-color:${calcTypeName(major.type).style.backgroundColor}`"
   >
     <view class="flex flex-col gap-[16rpx]">
@@ -17,9 +17,17 @@
     <view class="flex flex-col gap-[16rpx] flex-1">
       <view class="flex justify-between flex-auto">
         <view class="flex flex-col flex-1">
-          <text class="text-[32rpx] text-[#000] font-semibold truncate max-w-[400rpx]">
-            {{ major.major.replace(/(\r\n|\n|\r)/g, '') }}
-          </text>
+          <view class="flex items-center justify-start">
+            <text class="text-[32rpx] text-[#000] font-semibold truncate max-w-[400rpx]">
+              {{ major.major.replace(/(\r\n|\n|\r)/g, '') }}
+            </text>
+            <view
+              v-if="major.majorGroup"
+              class="bg-[#E2EDF9] rounded-[4rpx] flex items-center justify-center px-[6rpx] py-[4rpx] text-[20rpx] text-[#1580FF] ml-[16rpx]"
+            >
+              专业组{{ major.majorGroup }}
+            </view>
+          </view>
           <text class="text-[22rpx] text-[#1F2329] mt-[14rpx] line-clamp-2">
             {{ major.remark }}
           </text>