From 236a33c8ac44e8961a2320d36e3e13f05bf5e0fd Mon Sep 17 00:00:00 2001
From: xjs <xjs@ycymedu.com>
Date: Tue, 20 May 2025 10:09:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8A=A8=E6=80=81URL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/aiService-sub/index/index.vue             | 29 +++++++++++--------
 .../college/components/EnrollmentMark.vue     |  7 +++--
 src/pages/home/index/index.vue                | 22 +++++++-------
 src/service/index/api.ts                      |  4 +++
 4 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/src/aiService-sub/index/index.vue b/src/aiService-sub/index/index.vue
index 6f82956..1e43649 100644
--- a/src/aiService-sub/index/index.vue
+++ b/src/aiService-sub/index/index.vue
@@ -12,29 +12,34 @@
 
 <script setup lang="ts">
 import { useUserStore } from '@/store'
+import { getAssistant } from '@/service/index/api'
 
 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}&timestamp=${new Date().getTime()}`,
-)
+const url = ref(``)
 
 const handleChildMessage = (event) => {
   console.log('子应用传递的消息', event)
 }
 
 onLoad((options) => {
-  if (options.id) {
-    url.value += `&reportId=${options.id}`
-  }
-  if (options.type) {
-    url.value += `&reportType=${options.type}`
-  }
-  if (options.fileId) {
-    url.value += `&fileId=${options.fileId}`
-  }
+  getAssistant().then((res) => {
+    if (res.code === 200) {
+      const data = res.result as unknown as string
+      url.value = `${data}?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()}`
+    }
+    if (options.id) {
+      url.value += `&reportId=${options.id}`
+    }
+    if (options.type) {
+      url.value += `&reportType=${options.type}`
+    }
+    if (options.fileId) {
+      url.value += `&fileId=${options.fileId}`
+    }
+  })
   // if (options.locationCode) {
   //   url.value += `&locationCode=${options.locationCode}`
   // }
diff --git a/src/pages-sub/home/college/components/EnrollmentMark.vue b/src/pages-sub/home/college/components/EnrollmentMark.vue
index 84691cc..91d32e9 100644
--- a/src/pages-sub/home/college/components/EnrollmentMark.vue
+++ b/src/pages-sub/home/college/components/EnrollmentMark.vue
@@ -18,11 +18,11 @@
       --->
     </view>
 
-    <scroll-view class="mt-[38rpx] flex-1 pb-safe">
+    <scroll-view class="mt-[38rpx] flex-1">
       <WXXTable :data="tableData">
         <WXXTableCol prop="year" label="年份" width="10%"></WXXTableCol>
-        <WXXTableCol prop="subject_name" label="院校/批次" width="19%"></WXXTableCol>
-        <WXXTableCol prop="second_subject" label="选考要求" width="17%"></WXXTableCol>
+        <WXXTableCol prop="major_name" label="专业" width="17%"></WXXTableCol>
+        <WXXTableCol prop="subjectAndCollege" label="院校/批次-选考要求" width="19%"></WXXTableCol>
         <WXXTableCol prop="enroll_num" label="录取数" width="13%"></WXXTableCol>
         <WXXTableCol prop="score" label="分数" width="24%"></WXXTableCol>
         <WXXTableCol prop="rank_min" label="最低位次" width="17%"></WXXTableCol>
@@ -109,6 +109,7 @@ const getPlanProListData = async (newVal) => {
     tableData.value = _res.newZsplanfusions.map((item) => {
       let _item = item
       _item.score = `最高分：${item.score_max !== '0' ? item.score_max : '--'} \n 最低分：${item.score_min !== '0' ? item.score_min : '--'} \n 平均分：${item.score_average !== '0' ? item.score_average : '--'}`
+      _item.subjectAndCollege = ` 院校/批次:${item.subject_name} \n 专业:${item.second_subject}`
       return _item
     })
 
diff --git a/src/pages/home/index/index.vue b/src/pages/home/index/index.vue
index f1dee56..383ed45 100644
--- a/src/pages/home/index/index.vue
+++ b/src/pages/home/index/index.vue
@@ -84,16 +84,18 @@ onPageScroll((e) => {
 onShow(() => {
   if (userStore.userInfo.token) {
     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
+      if (resp.code === 200) {
+        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/service/index/api.ts b/src/service/index/api.ts
index 04c4fe4..878ebc2 100644
--- a/src/service/index/api.ts
+++ b/src/service/index/api.ts
@@ -466,3 +466,7 @@ export const sendMessage = (params: { conversation_id: string; user: string; que
     { haPrefix: true },
   )
 }
+
+export const getAssistant = () => {
+  return http.get('/api/weChatUserEx/areaExtend', {})
+}