From 3ba03d591271b7f7cf4ec226ad7d36f182270fc9 Mon Sep 17 00:00:00 2001
From: xjs <xjs@ycymedu.com>
Date: Thu, 22 May 2025 17:02:43 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../home/wishesList/components/DataTable.vue  | 41 +++++++++++++++++++
 .../home/wishesList/components/HeaderTip.vue  | 33 ++++++++++++++-
 src/pages-sub/home/wishesList/index.vue       |  6 +--
 3 files changed, 76 insertions(+), 4 deletions(-)

diff --git a/src/pages-sub/home/wishesList/components/DataTable.vue b/src/pages-sub/home/wishesList/components/DataTable.vue
index 5688294..fdd292a 100644
--- a/src/pages-sub/home/wishesList/components/DataTable.vue
+++ b/src/pages-sub/home/wishesList/components/DataTable.vue
@@ -11,6 +11,9 @@
       >
         {{ headItem.label }}
         <view
+          @click.stop="
+            showToast(headItem.key === 'lineDiff' ? 1 : headItem.key === 'rankDiff' ? 2 : 0)
+          "
           class="i-carbon-help text-[#86909C]"
           v-if="headItem.key === 'lineDiff' || headItem.key === 'rankDiff'"
         ></view>
@@ -54,10 +57,29 @@
         </view>
       </view>
     </view>
+
+    <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>
+          <view class="text-[28rpx] text-[#333] mt-[34rpx] mx-[32rpx] text-center">
+            {{ tipContent }}
+          </view>
+          <view
+            @click.stop="handleSubmit"
+            class="py-[32rpx] text-[#1580FF] text-[36rpx] text-center border-t-[2rpx] border-t-solid border-[#F3F3F3] mt-[38rpx]"
+          >
+            确认
+          </view>
+        </view>
+      </template>
+    </MessageBox>
   </view>
 </template>
 
 <script lang="ts" setup>
+import MessageBox from '@/pages-sub/components/messageBox/MessageBox.vue'
+
 defineOptions({
   inheritAttrs: true,
 })
@@ -72,6 +94,25 @@ const props = defineProps({
   },
 })
 
+const title = ref('')
+const tipContent = ref('')
+const show = ref(false)
+const showToast = (type: number) => {
+  if (type === 1) {
+    title.value = '线差'
+    tipContent.value = '根据志愿历年最低分 - 当前批次线的差值得出，线差可为填报提供参考。'
+  } else if (type === 2) {
+    title.value = '历年位次差'
+    tipContent.value =
+      '根据考生历年的等效位次 - 志愿历年录取位次的差值得出，位次差可更准确的与历年位次进行比较。'
+  }
+  show.value = true
+}
+
+const handleSubmit = () => {
+  show.value = false
+}
+
 const columns = ref([
   { label: '年份', key: 'year', width: '62rpx' },
   { label: '录取', key: 'planCount', width: '54rpx' },
diff --git a/src/pages-sub/home/wishesList/components/HeaderTip.vue b/src/pages-sub/home/wishesList/components/HeaderTip.vue
index 490b4e1..210177f 100644
--- a/src/pages-sub/home/wishesList/components/HeaderTip.vue
+++ b/src/pages-sub/home/wishesList/components/HeaderTip.vue
@@ -9,9 +9,30 @@
       </text>
       <text>{{ userInfo.batchName }}</text>
     </view>
-    <view v-if="type === 0" class="flex items-center">
+    <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%">
+        <template>
+          <view class="">
+            <view class="text-[#000] text-[36rpx] font-700 mt-[40rpx] text-center">重要提示</view>
+            <view class="text-[28rpx] text-[#333] mt-[34rpx] mx-[32rpx]">
+              <view class="">
+                1.本平台基于历史分数及等效位次进行志愿推荐和风险评估，由于志愿填报本身存在不确定性，请谨慎参考。
+              </view>
+              <view class="mt-[34rpx]">
+                2.在正式填报时，院校/专业名称及代码请务必与官方信息平台核对，若发现差异则以官方数据为准，本平台数据仅供参考。
+              </view>
+            </view>
+            <view
+              @click.stop="handleSubmit"
+              class="py-[32rpx] text-[#1580FF] text-[36rpx] text-center border-t-[2rpx] border-t-solid border-[#F3F3F3] mt-[38rpx]"
+            >
+              确认
+            </view>
+          </view>
+        </template>
+      </MessageBox>
     </view>
 
     <HeaderModelTip v-if="type === 1" />
@@ -20,6 +41,7 @@
 
 <script lang="ts" setup>
 import HeaderModelTip from './HeaderModelTip.vue'
+import MessageBox from '@/pages-sub/components/messageBox/MessageBox.vue'
 defineProps({
   userInfo: {
     type: Object,
@@ -30,6 +52,15 @@ defineProps({
     default: 0,
   },
 })
+
+const show = ref(false)
+const showToast = () => {
+  show.value = true
+}
+
+const handleSubmit = () => {
+  show.value = false
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/pages-sub/home/wishesList/index.vue b/src/pages-sub/home/wishesList/index.vue
index fa3453a..26f5d9e 100644
--- a/src/pages-sub/home/wishesList/index.vue
+++ b/src/pages-sub/home/wishesList/index.vue
@@ -257,12 +257,12 @@ const handleConfirm = () => {
   } else if (actionType.value === 4) {
     let _cur = filterMajorRef.value.getSearchParam()
     let temSet = new Set()
-    collegeSearch.value.secondmajor = []
+    collegeSearch.value.majors = []
     _cur.forEach((item) => {
       temSet.add(item.pName)
-      collegeSearch.value.secondmajor.push(item.zymc)
+      collegeSearch.value.majors.push(item.zymc)
     })
-    collegeSearch.value.majors = Array.from(temSet.values())
+    collegeSearch.value.secondmajor = Array.from(temSet.values())
   }
   paging.value.reload()
 }