From 7ae6d8f340e4469cc31617390359dbd14179db05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=B3?= <jia@jiadeMacBook-Air.local>
Date: Thu, 27 Nov 2025 19:10:42 +0800
Subject: [PATCH 01/17] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E8=81=8C?=
 =?UTF-8?q?=E4=B8=9A=E5=9B=BE=E8=B0=B1=E6=8E=A5=E5=8F=A3=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=92=8CappUserInfo=E6=8E=A5=E5=8F=A3=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apiRc/user/user.js                           |   2 +-
 pages/service/career-planning.vue            | 210 ++++++++++++-------
 pages/service/components/CareerRecommend.vue |  69 +++---
 utilsRc/config.js                            |   7 +-
 utilsRc/request.js                           |   3 +
 5 files changed, 169 insertions(+), 122 deletions(-)

diff --git a/apiRc/user/user.js b/apiRc/user/user.js
index 7e43b26..2e956fc 100644
--- a/apiRc/user/user.js
+++ b/apiRc/user/user.js
@@ -10,6 +10,6 @@ export function appUserInfo() {
   return request({
     url: '/app/user/appUserInfo',
     method: 'get',
-    baseUrlType: 'user' // 使用用户接口专用baseUrl
+    baseUrlType: 'appUserInfo' // 使用appUserInfo接口专用baseUrl
   })
 }
diff --git a/pages/service/career-planning.vue b/pages/service/career-planning.vue
index 89a48c5..b87aaae 100644
--- a/pages/service/career-planning.vue
+++ b/pages/service/career-planning.vue
@@ -67,7 +67,6 @@
 <script setup>
 import { ref, inject, nextTick, onMounted } from 'vue';
 import { onLoad } from '@dcloudio/uni-app';
-import { getJobSkillDetail } from '@/apiRc/jobSkill.js';
 import { appUserInfo } from '@/apiRc/user/user.js';
 import RemindPopup from './components/RemindPopup.vue';
 import PageHeader from './components/PageHeader.vue';
@@ -167,35 +166,41 @@ async function getRemindInfo() {
             idCard = cachedUserInfo?.resume?.idCard ?? cachedUserInfo?.idCard ?? null;
         }
         
-        // 优先从接口数据中获取职位信息
-        currentJobId.value = userInfo?.jobId ?? 
-                             userInfo?.currentJobId ?? 
-                             userInfo?.resume?.jobId ?? 
-                             userInfo?.resume?.currentJobId ?? 
-                             null;
-        currentJobName.value = userInfo?.jobName ?? 
-                               userInfo?.currentJobName ?? 
-                               userInfo?.resume?.jobName ?? 
-                               userInfo?.resume?.currentJobName ?? 
-                               '';
-        
-        // 如果接口数据中没有职位信息，从缓存中读取
-        if (!currentJobId.value && !currentJobName.value) {
-            currentJobId.value = cachedUserInfo?.jobId ?? 
-                                 cachedUserInfo?.currentJobId ?? 
-                                 cachedUserInfo?.resume?.jobId ?? 
-                                 cachedUserInfo?.resume?.currentJobId ?? 
+        // 优先从接口数据中的 jobTitles 数组获取职位信息（取第一个）
+        const jobTitles = Array.isArray(userInfo?.jobTitles) ? userInfo.jobTitles : [];
+        if (jobTitles.length > 0) {
+            currentJobName.value = jobTitles[0];
+        } else {
+            // 如果接口数据中没有 jobTitles，尝试从其他字段获取
+            currentJobId.value = userInfo?.jobId ?? 
+                                 userInfo?.currentJobId ?? 
+                                 userInfo?.resume?.jobId ?? 
+                                 userInfo?.resume?.currentJobId ?? 
                                  null;
-            currentJobName.value = cachedUserInfo?.jobName ?? 
-                                   cachedUserInfo?.currentJobName ?? 
-                                   cachedUserInfo?.resume?.jobName ?? 
-                                   cachedUserInfo?.resume?.currentJobName ?? 
+            currentJobName.value = userInfo?.jobName ?? 
+                                   userInfo?.currentJobName ?? 
+                                   userInfo?.resume?.jobName ?? 
+                                   userInfo?.resume?.currentJobName ?? 
                                    '';
-        }
-        
-        // 如果还是没有职位信息，使用默认值
-        if (!currentJobName.value) {
-            currentJobName.value = '市场专员';
+            
+            // 如果接口数据中没有职位信息，从缓存中读取
+            if (!currentJobId.value && !currentJobName.value) {
+                currentJobId.value = cachedUserInfo?.jobId ?? 
+                                     cachedUserInfo?.currentJobId ?? 
+                                     cachedUserInfo?.resume?.jobId ?? 
+                                     cachedUserInfo?.resume?.currentJobId ?? 
+                                     null;
+                currentJobName.value = cachedUserInfo?.jobName ?? 
+                                       cachedUserInfo?.currentJobName ?? 
+                                       cachedUserInfo?.resume?.jobName ?? 
+                                       cachedUserInfo?.resume?.currentJobName ?? 
+                                       '';
+            }
+            
+            // 如果还是没有职位信息，使用默认值
+            if (!currentJobName.value) {
+                currentJobName.value = '市场专员';
+            }
         }
         
         // 判断 idCard 是否存在（包括空字符串、undefined、null 的情况）
@@ -215,20 +220,26 @@ async function getRemindInfo() {
         const cachedUserInfo = uni.getStorageSync('userInfo') || {};
         const idCard = cachedUserInfo?.resume?.idCard ?? cachedUserInfo?.idCard ?? null;
         
-        // 从缓存中获取职位信息
-        currentJobId.value = cachedUserInfo?.jobId ?? 
-                             cachedUserInfo?.currentJobId ?? 
-                             cachedUserInfo?.resume?.jobId ?? 
-                             cachedUserInfo?.resume?.currentJobId ?? 
-                             null;
-        currentJobName.value = cachedUserInfo?.jobName ?? 
-                               cachedUserInfo?.currentJobName ?? 
-                               cachedUserInfo?.resume?.jobName ?? 
-                               cachedUserInfo?.resume?.currentJobName ?? 
-                               '';
-        // 如果缓存中没有职位信息，使用默认值
-        if (!currentJobName.value) {
-            currentJobName.value = '市场专员';
+        // 从缓存中获取职位信息（优先从 jobTitles 数组获取）
+        const cachedJobTitles = Array.isArray(cachedUserInfo?.jobTitles) ? cachedUserInfo.jobTitles : [];
+        if (cachedJobTitles.length > 0) {
+            currentJobName.value = cachedJobTitles[0];
+        } else {
+            // 如果缓存中没有 jobTitles，从其他字段获取
+            currentJobId.value = cachedUserInfo?.jobId ?? 
+                                 cachedUserInfo?.currentJobId ?? 
+                                 cachedUserInfo?.resume?.jobId ?? 
+                                 cachedUserInfo?.resume?.currentJobId ?? 
+                                 null;
+            currentJobName.value = cachedUserInfo?.jobName ?? 
+                                   cachedUserInfo?.currentJobName ?? 
+                                   cachedUserInfo?.resume?.jobName ?? 
+                                   cachedUserInfo?.resume?.currentJobName ?? 
+                                   '';
+            // 如果缓存中没有职位信息，使用默认值
+            if (!currentJobName.value) {
+                currentJobName.value = '市场专员';
+            }
         }
         
         if (!idCard || idCard === null || idCard === '') {
@@ -275,19 +286,57 @@ async function handleConfirm() {
     }
     
     // 如果 idCard 存在，说明已经完善了信息，直接显示页面内容
-    // 从缓存中更新职位信息
-    currentJobId.value = cachedUserInfo?.jobId ?? 
-                         cachedUserInfo?.currentJobId ?? 
-                         cachedUserInfo?.resume?.jobId ?? 
-                         cachedUserInfo?.resume?.currentJobId ?? 
-                         null;
-    currentJobName.value = cachedUserInfo?.jobName ?? 
-                           cachedUserInfo?.currentJobName ?? 
-                           cachedUserInfo?.resume?.jobName ?? 
-                           cachedUserInfo?.resume?.currentJobName ?? 
-                           '';
-    if (!currentJobName.value) {
-        currentJobName.value = '市场专员';
+    // 从接口获取最新的职位信息
+    try {
+        const response = await appUserInfo();
+        const userInfo = response?.data || {};
+        
+        // 优先从接口数据中的 jobTitles 数组获取职位信息（取第一个）
+        const jobTitles = Array.isArray(userInfo?.jobTitles) ? userInfo.jobTitles : [];
+        if (jobTitles.length > 0) {
+            currentJobName.value = jobTitles[0];
+        } else {
+            // 如果接口数据中没有 jobTitles，从缓存中获取
+            const cachedJobTitles = Array.isArray(cachedUserInfo?.jobTitles) ? cachedUserInfo.jobTitles : [];
+            if (cachedJobTitles.length > 0) {
+                currentJobName.value = cachedJobTitles[0];
+            } else {
+                // 从其他字段获取
+                currentJobId.value = cachedUserInfo?.jobId ?? 
+                                     cachedUserInfo?.currentJobId ?? 
+                                     cachedUserInfo?.resume?.jobId ?? 
+                                     cachedUserInfo?.resume?.currentJobId ?? 
+                                     null;
+                currentJobName.value = cachedUserInfo?.jobName ?? 
+                                       cachedUserInfo?.currentJobName ?? 
+                                       cachedUserInfo?.resume?.jobName ?? 
+                                       cachedUserInfo?.resume?.currentJobName ?? 
+                                       '';
+                if (!currentJobName.value) {
+                    currentJobName.value = '市场专员';
+                }
+            }
+        }
+    } catch (error) {
+        // 接口调用失败，从缓存中获取
+        const cachedJobTitles = Array.isArray(cachedUserInfo?.jobTitles) ? cachedUserInfo.jobTitles : [];
+        if (cachedJobTitles.length > 0) {
+            currentJobName.value = cachedJobTitles[0];
+        } else {
+            currentJobId.value = cachedUserInfo?.jobId ?? 
+                                 cachedUserInfo?.currentJobId ?? 
+                                 cachedUserInfo?.resume?.jobId ?? 
+                                 cachedUserInfo?.resume?.currentJobId ?? 
+                                 null;
+            currentJobName.value = cachedUserInfo?.jobName ?? 
+                                   cachedUserInfo?.currentJobName ?? 
+                                   cachedUserInfo?.resume?.jobName ?? 
+                                   cachedUserInfo?.resume?.currentJobName ?? 
+                                   '';
+            if (!currentJobName.value) {
+                currentJobName.value = '市场专员';
+            }
+        }
     }
     
     showContent.value = true;
@@ -300,19 +349,28 @@ function switchTab(index) {
     if (index === 0 && !currentJobId.value) {
         const cachedUserInfo = uni.getStorageSync('userInfo') || {};
         
+        // 优先从缓存中的 jobTitles 数组获取职位信息（取第一个）
+        const cachedJobTitles = Array.isArray(cachedUserInfo?.jobTitles) ? cachedUserInfo.jobTitles : [];
+        let newJobName = '';
+        
+        if (cachedJobTitles.length > 0) {
+            newJobName = cachedJobTitles[0];
+        } else {
+            // 如果缓存中没有 jobTitles，从其他字段获取
+            newJobName = currentJobName.value || 
+                        (cachedUserInfo?.jobName ?? 
+                        cachedUserInfo?.currentJobName ?? 
+                        cachedUserInfo?.resume?.jobName ?? 
+                        cachedUserInfo?.resume?.currentJobName ?? 
+                        '市场专员');
+        }
+        
         const newJobId = cachedUserInfo?.jobId ?? 
                          cachedUserInfo?.currentJobId ?? 
                          cachedUserInfo?.resume?.jobId ?? 
                          cachedUserInfo?.resume?.currentJobId ?? 
                          null;
         
-        const newJobName = currentJobName.value || 
-                          (cachedUserInfo?.jobName ?? 
-                          cachedUserInfo?.currentJobName ?? 
-                          cachedUserInfo?.resume?.jobName ?? 
-                          cachedUserInfo?.resume?.currentJobName ?? 
-                          '市场专员');
-        
         currentJobId.value = newJobId;
         currentJobName.value = newJobName;
     }
@@ -383,23 +441,23 @@ async function handleJobCardClick(job) {
         mask: true
     });
 
-    const fallbackSkills = Array.isArray(job?.rawSkills) ? job.rawSkills : [];
-    const params = {};
-    if (job?.jobId) {
-        params.jobId = job.jobId;
-    }
-    if (job?.title) {
-        params.jobName = job.title;
-    } else if (job?.jobName) {
-        params.jobName = job.jobName;
-    }
-
     try {
-        const response = await getJobSkillDetail(params);
-        const skillList = Array.isArray(response?.data) ? response.data : [];
+        // 从 appUserInfo 接口获取技能数据
+        const response = await appUserInfo();
+        const userInfo = response?.data || {};
+        const appSkillsList = Array.isArray(userInfo?.appSkillsList) ? userInfo.appSkillsList : [];
+        
+        // 将 appSkillsList 转换为 splitSkillListByScore 需要的格式
+        const skillList = appSkillsList.map(item => ({
+            skillName: item?.nameStr || '',
+            skillScore: item?.levelStr || 0
+        })).filter(item => item.skillName);
+        
         const { possessed, improvement } = splitSkillListByScore(skillList);
 
         if (possessed.length === 0 && improvement.length === 0) {
+            // 如果 appUserInfo 中没有技能数据，尝试使用推荐职位数据中的技能信息
+            const fallbackSkills = Array.isArray(job?.rawSkills) ? job.rawSkills : [];
             if (fallbackSkills.length === 0) {
                 uni.showToast({
                     title: '暂无技能数据',
@@ -416,6 +474,8 @@ async function handleJobCardClick(job) {
         }
         skillDetailPopup.value?.open();
     } catch (error) {
+        // 接口调用失败，尝试使用推荐职位数据中的技能信息
+        const fallbackSkills = Array.isArray(job?.rawSkills) ? job.rawSkills : [];
         if (fallbackSkills.length > 0) {
             const fallbackSplit = splitSkillListByScore(fallbackSkills);
             selectedJobPossessedSkills.value = fallbackSplit.possessed;
diff --git a/pages/service/components/CareerRecommend.vue b/pages/service/components/CareerRecommend.vue
index c35d7cb..2dff73f 100644
--- a/pages/service/components/CareerRecommend.vue
+++ b/pages/service/components/CareerRecommend.vue
@@ -55,7 +55,7 @@
 <script setup>
 import { ref, computed, watch, onMounted } from 'vue';
 import { recommendJob } from '@/apiRc/jobRecommend.js';
-import { getJobSkillDetail } from '@/apiRc/jobSkill.js';
+import { appUserInfo } from '@/apiRc/user/user.js';
 
 const props = defineProps({
     currentJobId: {
@@ -79,7 +79,15 @@ const isLoadingRecommend = ref(false);
 // 计算属性
 const currentJobDisplay = computed(() => props.currentJobName || '市场专员');
 
-// 从技能列表中提取技能名称用于显示
+
+// 从 appSkillsList 中提取技能名称
+function extractSkillsFromAppSkillsList(appSkillsList = []) {
+    return (Array.isArray(appSkillsList) ? appSkillsList : [])
+        .map(item => item?.nameStr || '')
+        .filter(name => !!name && name.trim().length > 0);
+}
+
+// 从技能列表中提取技能名称用于显示（用于推荐职位数据）
 function extractSkillNames(skillList = []) {
     return (Array.isArray(skillList) ? skillList : [])
         .map(item => item?.skillName || '')
@@ -88,38 +96,15 @@ function extractSkillNames(skillList = []) {
 
 // 获取当前职位的技能标签
 async function fetchCurrentJobSkills() {
-    // 如果没有职位名称，从缓存中获取技能标签
-    if (!props.currentJobName || props.currentJobName === '市场专员') {
-        const cachedUserInfo = uni.getStorageSync('userInfo') || {};
-        const cachedSkills = cachedUserInfo?.resume?.skillList ?? 
-                            cachedUserInfo?.skillList ?? 
-                            cachedUserInfo?.appSkillsList ?? 
-                            [];
-        
-        // 如果缓存中有技能数据，使用缓存的数据
-        if (Array.isArray(cachedSkills) && cachedSkills.length > 0) {
-            skillTags.value = extractSkillNames(cachedSkills);
-        } else {
-            skillTags.value = [];
-        }
-        
-        // 通知父组件技能数据已更新
-        emit('skills-updated', {
-            currentJobSkills: skillTags.value,
-            recommendedJobs: recommendedJobs.value
-        });
-        return;
-    }
-
-    // 优先调用接口获取技能数据
     isLoadingSkillTags.value = true;
     try {
-        const response = await getJobSkillDetail({
-            jobName: props.currentJobName
-        });
+        // 优先从 appUserInfo 接口获取技能标签
+        const response = await appUserInfo();
+        const userInfo = response?.data || {};
         
-        const skillList = Array.isArray(response?.data) ? response.data : [];
-        const apiSkills = extractSkillNames(skillList);
+        // 从 appSkillsList 中提取技能名称
+        const appSkillsList = Array.isArray(userInfo?.appSkillsList) ? userInfo.appSkillsList : [];
+        const apiSkills = extractSkillsFromAppSkillsList(appSkillsList);
         
         // 如果接口返回了技能数据，使用接口数据
         if (apiSkills.length > 0) {
@@ -127,13 +112,11 @@ async function fetchCurrentJobSkills() {
         } else {
             // 如果接口没有返回技能数据，从缓存中读取
             const cachedUserInfo = uni.getStorageSync('userInfo') || {};
-            const cachedSkills = cachedUserInfo?.resume?.skillList ?? 
-                                cachedUserInfo?.skillList ?? 
-                                cachedUserInfo?.appSkillsList ?? 
-                                [];
+            const cachedAppSkills = Array.isArray(cachedUserInfo?.appSkillsList) ? cachedUserInfo.appSkillsList : [];
+            const cachedSkills = extractSkillsFromAppSkillsList(cachedAppSkills);
             
-            if (Array.isArray(cachedSkills) && cachedSkills.length > 0) {
-                skillTags.value = extractSkillNames(cachedSkills);
+            if (cachedSkills.length > 0) {
+                skillTags.value = cachedSkills;
             } else {
                 skillTags.value = [];
             }
@@ -145,15 +128,13 @@ async function fetchCurrentJobSkills() {
             recommendedJobs: recommendedJobs.value
         });
     } catch (error) {
-        // 接口调用失败时，从缓存中读取
+        // appUserInfo 接口调用失败时，从缓存中读取
         const cachedUserInfo = uni.getStorageSync('userInfo') || {};
-        const cachedSkills = cachedUserInfo?.resume?.skillList ?? 
-                            cachedUserInfo?.skillList ?? 
-                            cachedUserInfo?.appSkillsList ?? 
-                            [];
+        const cachedAppSkills = Array.isArray(cachedUserInfo?.appSkillsList) ? cachedUserInfo.appSkillsList : [];
+        const cachedSkills = extractSkillsFromAppSkillsList(cachedAppSkills);
         
-        if (Array.isArray(cachedSkills) && cachedSkills.length > 0) {
-            skillTags.value = extractSkillNames(cachedSkills);
+        if (cachedSkills.length > 0) {
+            skillTags.value = cachedSkills;
         } else {
             skillTags.value = [];
         }
diff --git a/utilsRc/config.js b/utilsRc/config.js
index 213a3dc..1f9754d 100644
--- a/utilsRc/config.js
+++ b/utilsRc/config.js
@@ -26,10 +26,13 @@ let exports = {
 	// baseUrl: 'http://ks.zhaopinzao8dian.com/api/ks', // 已从根目录config.js引用，不再重复配置
 	
 	// ========== 职业图谱专用baseUrl ==========
-	zytpBaseUrl: 'http://ks.zhaopinzao8dian.com/api/ks_zytp/admin-api/zytp',
+	zytpBaseUrl: 'http://222.80.110.161:11111/career-map/api/ks_zytp/admin-api/zytp',
 	
-	// ========== 用户接口专用baseUrl（appUserInfo等接口使用） ==========
+	// ========== 用户接口专用baseUrl（其他用户接口使用） ==========
 	userBaseUrl: 'http://ks.zhaopinzao8dian.com/api/ks', // 用户相关接口使用根目录config.js的baseUrl
+	
+	// ========== appUserInfo接口专用baseUrl ==========
+	appUserInfoBaseUrl: 'http://222.80.110.161:11111/api/ks', // appUserInfo接口专用，与其他接口路径不一致
 
 
 
diff --git a/utilsRc/request.js b/utilsRc/request.js
index 5a915ad..6592004 100644
--- a/utilsRc/request.js
+++ b/utilsRc/request.js
@@ -14,6 +14,7 @@ let timeout = 10000
 const baseUrl = configRc.baseUrl
 const zytpBaseUrl = configRc.zytpBaseUrl || ''
 const userBaseUrl = configRc.userBaseUrl || ''
+const appUserInfoBaseUrl = configRc.appUserInfoBaseUrl || ''
 
 const request = config => {
   // 是否需要设置 token
@@ -31,6 +32,8 @@ const request = config => {
     requestBaseUrl = zytpBaseUrl
   } else if (baseType === 'user' && userBaseUrl) {
     requestBaseUrl = userBaseUrl
+  } else if (baseType === 'appUserInfo' && appUserInfoBaseUrl) {
+    requestBaseUrl = appUserInfoBaseUrl
   }
   let requestUrl = config.fullUrl ? config.fullUrl : (requestBaseUrl + (config.url || ''))
 

From 9c8e1827061be32e85729f31a5bbb7b9796efaec Mon Sep 17 00:00:00 2001
From: francis_fh <13935151924@163.com>
Date: Tue, 2 Dec 2025 13:35:48 +0800
Subject: [PATCH 02/17] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8A=80=E8=83=BD?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.js                                    |  4 +--
 packageA/pages/personalInfo/personalInfo.vue | 28 +++++++++++++++++---
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/config.js b/config.js
index a819393..2fcc09b 100644
--- a/config.js
+++ b/config.js
@@ -1,7 +1,7 @@
 export default {
     // baseUrl: 'http://39.98.44.136:8080', // 测试
-    baseUrl: 'http://222.80.110.161:11111/api/ks', // 测试
-    // baseUrl: 'http://ks.zhaopinzao8dian.com/api/ks', // 测试
+    // baseUrl: 'http://222.80.110.161:11111/api/ks', // 测试
+    baseUrl: 'http://ks.zhaopinzao8dian.com/api/ks', // 测试
 
 	LCBaseUrl:'http://10.110.145.145:9100',//招聘、培训、帮扶
 	LCBaseUrlInner:'http://10.110.145.145:10100',//内网端口
diff --git a/packageA/pages/personalInfo/personalInfo.vue b/packageA/pages/personalInfo/personalInfo.vue
index 7d75162..10fe842 100644
--- a/packageA/pages/personalInfo/personalInfo.vue
+++ b/packageA/pages/personalInfo/personalInfo.vue
@@ -394,11 +394,31 @@ function addSkill() {
 
 // 删除技能
 function removeSkill(index) {
-    state.skills.splice(index, 1);
+    const skill = state.skills[index];
     
-    // 更新完成度
-    const result = getFormCompletionPercent(fromValue);
-    percent.value = result;
+    // 如果有技能id，调用删除接口
+    if (skill && skill.id) {
+        $api.createRequest(`/app/appskill/${skill.id}`, {}, 'DELETE').then(() => {
+            // 接口调用成功，从本地数组中移除
+            state.skills.splice(index, 1);
+            
+            // 更新完成度
+            const result = getFormCompletionPercent(fromValue);
+            percent.value = result;
+            
+            $api.msg('删除成功');
+        }).catch((err) => {
+            console.error('删除技能失败:', err);
+            $api.msg('删除失败，请重试');
+        });
+    } else {
+        // 没有id的技能（新增的），直接从本地数组中移除
+        state.skills.splice(index, 1);
+        
+        // 更新完成度
+        const result = getFormCompletionPercent(fromValue);
+        percent.value = result;
+    }
 }
 
 // 获取技能等级文本

From 255f27555242c7e9f14708a2ba10c917ea2652d5 Mon Sep 17 00:00:00 2001
From: lintiantian <156569930@qq.com>
Date: Thu, 4 Dec 2025 14:04:58 +0800
Subject: [PATCH 03/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageCa/utilCa/config.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packageCa/utilCa/config.js b/packageCa/utilCa/config.js
index a97c819..6400d7a 100644
--- a/packageCa/utilCa/config.js
+++ b/packageCa/utilCa/config.js
@@ -2,9 +2,9 @@ let baseUrl = ""
 // #ifdef MP-WEIXIN
 // 编译项目，因为使用插件lime-echart，echart文件过大，需要非压缩代码方式编译，不然会很慢，发布的时候才压缩代码方式编译
 if (wx.getAccountInfoSync().miniProgram.envVersion === 'develop') {
-    baseUrl = 'https://localhost:7026/career' // 开发环境
+    baseUrl = 'http://222.80.110.161:11111/career' // 开发环境
 } else {
-    baseUrl = 'https://ksrs.51xuanxiao.com' // 生产环境
+    baseUrl = 'http://222.80.110.161:11111/career' // 生产环境
 }
 // #endif
 

From f8b9d3730b8ef2e88dc12d02d05bf90be4bdc29a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=B3?= <jia@jiadeMacBook-Air.local>
Date: Thu, 4 Dec 2025 14:38:54 +0800
Subject: [PATCH 04/17] =?UTF-8?q?feat:=20=E5=AE=8C=E5=96=84=E8=81=8C?=
 =?UTF-8?q?=E4=B8=9A=E5=9B=BE=E8=B0=B1=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apiRc/jobSkill.js                             |  10 +
 apiRc/user/user.js                            |   5 +-
 pages/service/career-planning.vue             | 259 ++++----
 pages/service/components/CareerRecommend.vue  |  31 +-
 pages/service/components/PageHeader.vue       |  22 +-
 pages/service/components/SkillDevelopment.vue | 555 ++++++++++++++----
 utilsRc/request.js                            |  12 +-
 7 files changed, 591 insertions(+), 303 deletions(-)

diff --git a/apiRc/jobSkill.js b/apiRc/jobSkill.js
index 4c9f8ac..8741153 100644
--- a/apiRc/jobSkill.js
+++ b/apiRc/jobSkill.js
@@ -13,6 +13,16 @@ export function getJobSkillDetail(params) {
   })
 }
 
+// 获取技能权重
+export function getJobSkillWeight(params) {
+  return request({
+    url: '/jobSkillDet/getJobSkillWeight',
+    method: 'get',
+    params,
+    baseUrlType: 'zytp'
+  })
+}
+
 // 暂未使用 - 如果需要在 CareerPath.vue 中点击路径职位查看详细技能信息时使用
 // 使用场景：获取职业路径中某个职位的详细技能信息（包含技能分数、类型等）
 // export function getJobPathSkill(data) {
diff --git a/apiRc/user/user.js b/apiRc/user/user.js
index 2e956fc..0599c98 100644
--- a/apiRc/user/user.js
+++ b/apiRc/user/user.js
@@ -8,8 +8,7 @@ import request from '@/utilsRc/request'
 // 获取用户信息（职业规划推荐用）
 export function appUserInfo() {
   return request({
-    url: '/app/user/appUserInfo',
-    method: 'get',
-    baseUrlType: 'appUserInfo' // 使用appUserInfo接口专用baseUrl
+    fullUrl: 'http://ks.zhaopinzao8dian.com/api/ks/app/user/appUserInfo',
+    method: 'get'
   })
 }
diff --git a/pages/service/career-planning.vue b/pages/service/career-planning.vue
index b87aaae..264b96f 100644
--- a/pages/service/career-planning.vue
+++ b/pages/service/career-planning.vue
@@ -49,10 +49,8 @@
                 />
                 <SkillDevelopment 
                     v-else 
-                    :current-job-skills="recommendSkillsData.currentJobSkills"
-                    :recommended-jobs="recommendSkillsData.recommendedJobs"
-                    :path-data="pathSkillsData.pathData"
-                    :target-career="pathSkillsData.targetCareer"
+                    :current-job-name="currentJobName"
+                    @path-data-updated="handlePathDataUpdated"
                 />
             </scroll-view>
         </view>
@@ -157,59 +155,68 @@ async function getRemindInfo() {
         const response = await appUserInfo();
         const userInfo = response?.data || {};
         
-        // 优先从接口数据中获取 idCard
+        // 检查 idCard（身份证）- 必须项
         let idCard = userInfo?.resume?.idCard ?? userInfo?.idCard ?? null;
-        
-        // 如果接口返回的数据中没有 idCard，则从缓存中读取
         const cachedUserInfo = uni.getStorageSync('userInfo') || {};
         if (!idCard || idCard === null || idCard === '') {
             idCard = cachedUserInfo?.resume?.idCard ?? cachedUserInfo?.idCard ?? null;
         }
-        
-        // 优先从接口数据中的 jobTitles 数组获取职位信息（取第一个）
-        const jobTitles = Array.isArray(userInfo?.jobTitles) ? userInfo.jobTitles : [];
-        if (jobTitles.length > 0) {
-            currentJobName.value = jobTitles[0];
-        } else {
-            // 如果接口数据中没有 jobTitles，尝试从其他字段获取
-            currentJobId.value = userInfo?.jobId ?? 
-                                 userInfo?.currentJobId ?? 
-                                 userInfo?.resume?.jobId ?? 
-                                 userInfo?.resume?.currentJobId ?? 
-                                 null;
-            currentJobName.value = userInfo?.jobName ?? 
-                                   userInfo?.currentJobName ?? 
-                                   userInfo?.resume?.jobName ?? 
-                                   userInfo?.resume?.currentJobName ?? 
-                                   '';
-            
-            // 如果接口数据中没有职位信息，从缓存中读取
-            if (!currentJobId.value && !currentJobName.value) {
-                currentJobId.value = cachedUserInfo?.jobId ?? 
-                                     cachedUserInfo?.currentJobId ?? 
-                                     cachedUserInfo?.resume?.jobId ?? 
-                                     cachedUserInfo?.resume?.currentJobId ?? 
-                                     null;
-                currentJobName.value = cachedUserInfo?.jobName ?? 
-                                       cachedUserInfo?.currentJobName ?? 
-                                       cachedUserInfo?.resume?.jobName ?? 
-                                       cachedUserInfo?.resume?.currentJobName ?? 
-                                       '';
-            }
-            
-            // 如果还是没有职位信息，使用默认值
-            if (!currentJobName.value) {
-                currentJobName.value = '市场专员';
-            }
-        }
-        
-        // 判断 idCard 是否存在（包括空字符串、undefined、null 的情况）
         const hasIdCard = idCard !== null && idCard !== undefined && idCard !== '';
         
-        if (!hasIdCard) {
-            remindList.value = ['请完善个人信息'];
+        // 检查职位信息：优先从 jobTitles 数组获取
+        const jobTitles = Array.isArray(userInfo?.jobTitles) ? userInfo.jobTitles : [];
+        const hasJobTitle = jobTitles.length > 0;
+        
+        // 如果 jobTitles 为空，尝试从其他字段获取
+        let jobName = '';
+        if (!hasJobTitle) {
+            jobName = userInfo?.jobName ?? 
+                     userInfo?.currentJobName ?? 
+                     userInfo?.resume?.jobName ?? 
+                     userInfo?.resume?.currentJobName ?? 
+                     '';
+        }
+        const hasJobInfo = hasJobTitle || (jobName && jobName.trim() !== '');
+        
+        // 检查技能标签：从 appSkillsList 获取
+        const appSkillsList = Array.isArray(userInfo?.appSkillsList) ? userInfo.appSkillsList : [];
+        // 检查是否有有效的技能（name 或 nameStr 不为空）
+        const hasSkills = appSkillsList.some(skill => {
+            const skillName = skill?.name || skill?.nameStr;
+            return skillName && skillName.trim() !== '';
+        });
+        
+        // 判断信息是否完整（idCard、职位信息、技能标签都必须有）
+        const isComplete = hasIdCard && hasJobInfo && hasSkills;
+        
+        if (!isComplete) {
+            // 收集缺失的信息提示
+            const missingItems = [];
+            if (!hasIdCard) {
+                missingItems.push('身份证信息');
+            }
+            if (!hasJobInfo) {
+                missingItems.push('职位信息');
+            }
+            if (!hasSkills) {
+                missingItems.push('技能标签');
+            }
+            remindList.value = [`请完善${missingItems.join('、')}`];
         } else {
-            remindList.value = ['暂无待完善信息'];
+            // 信息完整，设置职位信息
+            if (hasJobTitle) {
+                currentJobName.value = jobTitles[0];
+            } else {
+                currentJobName.value = jobName;
+                currentJobId.value = userInfo?.jobId ?? 
+                                   userInfo?.currentJobId ?? 
+                                   userInfo?.resume?.jobId ?? 
+                                   userInfo?.resume?.currentJobId ?? 
+                                   null;
+            }
+            // 信息完整，直接显示页面内容
+            showContent.value = true;
+            return;
         }
         
         setTimeout(() => {
@@ -218,34 +225,62 @@ async function getRemindInfo() {
     } catch (error) {
         // 接口调用失败时，使用缓存作为降级方案
         const cachedUserInfo = uni.getStorageSync('userInfo') || {};
+        
+        // 检查 idCard
         const idCard = cachedUserInfo?.resume?.idCard ?? cachedUserInfo?.idCard ?? null;
+        const hasIdCard = idCard !== null && idCard !== undefined && idCard !== '';
         
-        // 从缓存中获取职位信息（优先从 jobTitles 数组获取）
+        // 检查职位信息
         const cachedJobTitles = Array.isArray(cachedUserInfo?.jobTitles) ? cachedUserInfo.jobTitles : [];
-        if (cachedJobTitles.length > 0) {
-            currentJobName.value = cachedJobTitles[0];
-        } else {
-            // 如果缓存中没有 jobTitles，从其他字段获取
-            currentJobId.value = cachedUserInfo?.jobId ?? 
-                                 cachedUserInfo?.currentJobId ?? 
-                                 cachedUserInfo?.resume?.jobId ?? 
-                                 cachedUserInfo?.resume?.currentJobId ?? 
-                                 null;
-            currentJobName.value = cachedUserInfo?.jobName ?? 
-                                   cachedUserInfo?.currentJobName ?? 
-                                   cachedUserInfo?.resume?.jobName ?? 
-                                   cachedUserInfo?.resume?.currentJobName ?? 
-                                   '';
-            // 如果缓存中没有职位信息，使用默认值
-            if (!currentJobName.value) {
-                currentJobName.value = '市场专员';
-            }
+        const hasJobTitle = cachedJobTitles.length > 0;
+        let jobName = '';
+        if (!hasJobTitle) {
+            jobName = cachedUserInfo?.jobName ?? 
+                     cachedUserInfo?.currentJobName ?? 
+                     cachedUserInfo?.resume?.jobName ?? 
+                     cachedUserInfo?.resume?.currentJobName ?? 
+                     '';
         }
+        const hasJobInfo = hasJobTitle || (jobName && jobName.trim() !== '');
         
-        if (!idCard || idCard === null || idCard === '') {
-            remindList.value = ['请完善个人信息'];
+        // 检查技能标签
+        const cachedAppSkillsList = Array.isArray(cachedUserInfo?.appSkillsList) ? cachedUserInfo.appSkillsList : [];
+        const hasSkills = cachedAppSkillsList.some(skill => {
+            const skillName = skill?.name || skill?.nameStr;
+            return skillName && skillName.trim() !== '';
+        });
+        
+        // 判断信息是否完整（idCard、职位信息、技能标签都必须有）
+        const isComplete = hasIdCard && hasJobInfo && hasSkills;
+        
+        if (!isComplete) {
+            // 收集缺失的信息提示
+            const missingItems = [];
+            if (!hasIdCard) {
+                missingItems.push('身份证信息');
+            }
+            if (!hasJobInfo) {
+                missingItems.push('职位信息');
+            }
+            if (!hasSkills) {
+                missingItems.push('技能标签');
+            }
+            remindList.value = [`请完善${missingItems.join('、')}`];
         } else {
-            remindList.value = ['暂无待完善信息'];
+            // 信息完整，设置职位信息
+            if (hasJobTitle) {
+                currentJobName.value = cachedJobTitles[0];
+            } else {
+                currentJobName.value = jobName;
+                currentJobId.value = cachedUserInfo?.jobId ?? 
+                                   cachedUserInfo?.currentJobId ?? 
+                                   cachedUserInfo?.resume?.jobId ?? 
+                                   cachedUserInfo?.resume?.currentJobId ?? 
+                                   null;
+            }
+            // 信息完整，直接显示页面内容
+            showContent.value = true;
+            return;
         }
         
         setTimeout(() => {
@@ -264,82 +299,8 @@ function handleCancel() {
 async function handleConfirm() {
     remindPopup.value?.close();
     
-    // 直接从缓存中读取 idCard（因为接口返回的数据中没有 idCard）
-    const cachedUserInfo = uni.getStorageSync('userInfo') || {};
-    let idCard = cachedUserInfo?.resume?.idCard ?? cachedUserInfo?.idCard ?? null;
-    
-    // 如果缓存中也没有，尝试从接口获取（虽然接口通常也没有）
-    if (!idCard || idCard === null || idCard === '') {
-        try {
-            const response = await appUserInfo();
-            const userInfo = response?.data || {};
-            idCard = userInfo?.resume?.idCard ?? userInfo?.idCard ?? null;
-        } catch (error) {
-            // 接口调用失败，继续使用缓存数据
-        }
-    }
-    
-    // 如果 idCard 为空，才跳转到完善信息页面
-    if (!idCard || idCard === null || idCard === '') {
-        navTo('/pages/complete-info/complete-info');
-        return;
-    }
-    
-    // 如果 idCard 存在，说明已经完善了信息，直接显示页面内容
-    // 从接口获取最新的职位信息
-    try {
-        const response = await appUserInfo();
-        const userInfo = response?.data || {};
-        
-        // 优先从接口数据中的 jobTitles 数组获取职位信息（取第一个）
-        const jobTitles = Array.isArray(userInfo?.jobTitles) ? userInfo.jobTitles : [];
-        if (jobTitles.length > 0) {
-            currentJobName.value = jobTitles[0];
-        } else {
-            // 如果接口数据中没有 jobTitles，从缓存中获取
-            const cachedJobTitles = Array.isArray(cachedUserInfo?.jobTitles) ? cachedUserInfo.jobTitles : [];
-            if (cachedJobTitles.length > 0) {
-                currentJobName.value = cachedJobTitles[0];
-            } else {
-                // 从其他字段获取
-                currentJobId.value = cachedUserInfo?.jobId ?? 
-                                     cachedUserInfo?.currentJobId ?? 
-                                     cachedUserInfo?.resume?.jobId ?? 
-                                     cachedUserInfo?.resume?.currentJobId ?? 
-                                     null;
-                currentJobName.value = cachedUserInfo?.jobName ?? 
-                                       cachedUserInfo?.currentJobName ?? 
-                                       cachedUserInfo?.resume?.jobName ?? 
-                                       cachedUserInfo?.resume?.currentJobName ?? 
-                                       '';
-                if (!currentJobName.value) {
-                    currentJobName.value = '市场专员';
-                }
-            }
-        }
-    } catch (error) {
-        // 接口调用失败，从缓存中获取
-        const cachedJobTitles = Array.isArray(cachedUserInfo?.jobTitles) ? cachedUserInfo.jobTitles : [];
-        if (cachedJobTitles.length > 0) {
-            currentJobName.value = cachedJobTitles[0];
-        } else {
-            currentJobId.value = cachedUserInfo?.jobId ?? 
-                                 cachedUserInfo?.currentJobId ?? 
-                                 cachedUserInfo?.resume?.jobId ?? 
-                                 cachedUserInfo?.resume?.currentJobId ?? 
-                                 null;
-            currentJobName.value = cachedUserInfo?.jobName ?? 
-                                   cachedUserInfo?.currentJobName ?? 
-                                   cachedUserInfo?.resume?.jobName ?? 
-                                   cachedUserInfo?.resume?.currentJobName ?? 
-                                   '';
-            if (!currentJobName.value) {
-                currentJobName.value = '市场专员';
-            }
-        }
-    }
-    
-    showContent.value = true;
+    // 跳转到完善信息页面
+    navTo('/pages/complete-info/complete-info');
 }
 
 // 切换tab
@@ -449,8 +410,8 @@ async function handleJobCardClick(job) {
         
         // 将 appSkillsList 转换为 splitSkillListByScore 需要的格式
         const skillList = appSkillsList.map(item => ({
-            skillName: item?.nameStr || '',
-            skillScore: item?.levelStr || 0
+            skillName: item?.name || item?.nameStr || '',
+            skillScore: item?.levels || item?.levelStr || 0
         })).filter(item => item.skillName);
         
         const { possessed, improvement } = splitSkillListByScore(skillList);
diff --git a/pages/service/components/CareerRecommend.vue b/pages/service/components/CareerRecommend.vue
index 2dff73f..74a8260 100644
--- a/pages/service/components/CareerRecommend.vue
+++ b/pages/service/components/CareerRecommend.vue
@@ -21,6 +21,7 @@
                     {{ skill }}
                 </view>
                 <text v-if="!skillTags.length && !isLoadingSkillTags" class="empty-text">暂无技能数据</text>
+                <text v-if="isLoadingSkillTags" class="empty-text">加载中...</text>
             </view>
         </view>
 
@@ -35,7 +36,6 @@
             :key="index"
             @click="handleJobCardClick(job)"
         >
-            <button class="search-btn" @click.stop="handleJobSearch(job)">职位搜索</button>
             <view class="job-header">
                 <text class="job-title">{{ job.title }}</text>
             </view>
@@ -79,11 +79,10 @@ const isLoadingRecommend = ref(false);
 // 计算属性
 const currentJobDisplay = computed(() => props.currentJobName || '市场专员');
 
-
 // 从 appSkillsList 中提取技能名称
 function extractSkillsFromAppSkillsList(appSkillsList = []) {
     return (Array.isArray(appSkillsList) ? appSkillsList : [])
-        .map(item => item?.nameStr || '')
+        .map(item => item?.name || item?.nameStr || '')
         .filter(name => !!name && name.trim().length > 0);
 }
 
@@ -202,17 +201,15 @@ onMounted(() => {
 watch(
     () => [props.currentJobId, props.currentJobName],
     () => {
-        fetchCurrentJobSkills();
-        fetchRecommendedJobs();
+        if (props.currentJobName) {
+            fetchCurrentJobSkills();
+            fetchRecommendedJobs();
+        }
     },
     { immediate: true }
 );
 
 // 事件处理
-function handleJobSearch(job) {
-    // TODO: 实现职位搜索跳转
-}
-
 function handleJobCardClick(job) {
     emit('job-card-click', job);
 }
@@ -296,24 +293,8 @@ function handleJobCardClick(job) {
     cursor: pointer;
 }
 
-.search-btn {
-    position: absolute;
-    top: 16rpx;
-    right: 16rpx;
-    background-color: #FFDAB9;
-    color: #FF6347;
-    font-size: 20rpx;
-    padding: 6rpx 14rpx;
-    border-radius: 6rpx;
-    border: 1rpx solid #FFA07A;
-    white-space: nowrap;
-    z-index: 10;
-    line-height: 1.2;
-}
-
 .job-header {
     margin-bottom: 16rpx;
-    padding-right: 100rpx;
 }
 
 .job-title {
diff --git a/pages/service/components/PageHeader.vue b/pages/service/components/PageHeader.vue
index eaedd4b..055655c 100644
--- a/pages/service/components/PageHeader.vue
+++ b/pages/service/components/PageHeader.vue
@@ -1,5 +1,5 @@
 <template>
-    <view class="page-header">
+    <view class="page-header" :style="{ paddingTop: statusBarHeight > 0 ? `calc(40rpx + ${statusBarHeight * 2}rpx)` : '40rpx' }">
         <view class="header-top">
             <view class="title-section">
                 <text class="main-title">职业规划推荐指导平台</text>
@@ -54,7 +54,7 @@
 </template>
 
 <script setup>
-import { defineProps, defineEmits } from 'vue';
+import { defineProps, defineEmits, ref, onMounted } from 'vue';
 
 const props = defineProps({
     activeTab: {
@@ -65,6 +65,18 @@ const props = defineProps({
 
 const emit = defineEmits(['tab-change', 'search-click', 'menu-click', 'more-click']);
 
+// 状态栏高度
+const statusBarHeight = ref(0);
+
+onMounted(() => {
+    try {
+        const systemInfo = uni.getSystemInfoSync();
+        statusBarHeight.value = systemInfo.statusBarHeight || 0;
+    } catch (error) {
+        statusBarHeight.value = 0;
+    }
+});
+
 function handleTabClick(index) {
     emit('tab-change', index);
 }
@@ -86,6 +98,12 @@ function handleMoreClick() {
 .page-header {
     padding: 40rpx 28rpx 0;
     flex-shrink: 0;
+    /* #ifdef MP-WEIXIN */
+    padding-top: calc(40rpx + env(safe-area-inset-top));
+    /* #endif */
+    /* #ifdef H5 */
+    padding-top: calc(40rpx + var(--status-bar-height, 0px));
+    /* #endif */
 }
 
 .header-top {
diff --git a/pages/service/components/SkillDevelopment.vue b/pages/service/components/SkillDevelopment.vue
index cdbba21..8d0688d 100644
--- a/pages/service/components/SkillDevelopment.vue
+++ b/pages/service/components/SkillDevelopment.vue
@@ -1,5 +1,52 @@
 <template>
     <view class="skill-development">
+        <!-- 职业技能查询区域 -->
+        <view class="query-section">
+            <view class="section-title">
+                <uni-icons type="search" size="18" color="#286BFA"></uni-icons>
+                <text class="title-text">职业技能查询</text>
+            </view>
+            
+            <view class="input-group">
+                <view class="input-item">
+                    <text class="input-label">当前职位</text>
+                    <input 
+                        class="input-field" 
+                        :value="currentPosition"
+                        placeholder="市场专员"
+                        placeholder-style="color: #999999"
+                        disabled
+                    />
+                </view>
+                
+                <view class="input-item">
+                    <text class="input-label">目标职业</text>
+                    <picker 
+                        mode="selector"
+                        :range="targetCareerOptions"
+                        range-key="label"
+                        :value="selectedTargetIndex"
+                        @change="handleTargetChange"
+                    >
+                        <view class="picker-field">
+                            <text :class="selectedTargetIndex >= 0 ? 'picker-text' : 'picker-placeholder'">
+                                {{ selectedTargetIndex >= 0 ? targetCareerOptions[selectedTargetIndex].label : '请选择目标职业' }}
+                            </text>
+                            <uni-icons type="arrowdown" size="16" color="#999999"></uni-icons>
+                        </view>
+                    </picker>
+                </view>
+            </view>
+            
+            <button class="query-btn" @click="handleQuery">
+                <text>查询技能发展路径</text>
+                <uni-icons type="search" size="18" color="#FFFFFF"></uni-icons>
+            </button>
+            <view v-if="totalPathCount > 0" class="path-summary">
+                系统已收录 {{ totalPathCount }} 条职业路径
+            </view>
+        </view>
+
         <view class="content-section">
             <view class="section-title">
                 <uni-icons type="person-filled" size="18" color="#000000"></uni-icons>
@@ -11,17 +58,23 @@
             </view>
             
             <view class="skill-list">
+                <view v-if="isLoadingSkills" class="empty-text">加载中...</view>
+                <view v-else-if="!hasQueried" class="empty-text">请先查询职业路径以获取技能发展数据</view>
+                <view v-else-if="skillList.length === 0" class="empty-text">暂无数据</view>
                 <view 
+                    v-else
                     class="skill-item" 
                     v-for="(skill, index) in skillList" 
                     :key="index"
-                    @click="handleSkillItemClick(skill)"
                 >
                     <view class="skill-header">
                         <text class="skill-name">{{ skill.name }}</text>
-                        <text class="skill-weight">权重: {{ skill.weight }}</text>
+                        <view class="skill-info">
+                            <text class="skill-score">技能分数: {{ skill.score }}</text>
+                            <text class="skill-weight">权重: {{ skill.weight }}</text>
+                        </view>
                     </view>
-                    <view class="skill-tags">
+                    <view class="skill-tags" v-if="skill.tags && skill.tags.length > 0">
                         <view 
                             class="skill-tag" 
                             v-for="(tag, tagIndex) in skill.tags" 
@@ -33,151 +86,395 @@
                 </view>
             </view>
         </view>
-        
-        <!-- 技能权重弹出层 -->
-        <SkillWeightPopup
-            ref="skillWeightPopup"
-            :skill-name="selectedSkillName"
-            :weight="selectedSkillWeight"
-            :current-level="selectedSkillLevel"
-            @close="handlePopupClose"
-        />
     </view>
 </template>
 
 <script setup>
-import { ref, computed, watch } from 'vue';
-import SkillWeightPopup from './SkillWeightPopup.vue';
+import { ref, computed, watch, onMounted } from 'vue';
+import { getJobPathPage, getJobPathDetail, getJobPathNum } from '@/apiRc/jobPath.js';
+import { getJobSkillWeight } from '@/apiRc/jobSkill.js';
 
 const props = defineProps({
-    // 来自职业推荐 tab 的数据
-    currentJobSkills: {
-        type: Array,
-        default: () => []
-    },
-    recommendedJobs: {
-        type: Array,
-        default: () => []
-    },
-    // 来自职业路径 tab 的数据
-    pathData: {
-        type: Object,
-        default: () => ({
-            start: { title: '', skills: [] },
-            steps: [],
-            end: { title: '', skills: [] }
-        })
-    },
-    targetCareer: {
+    // 当前职位名称
+    currentJobName: {
         type: String,
         default: ''
     }
 });
 
-// 综合技能列表（基于前两个 tab 的数据）
-const skillList = computed(() => {
-    const skillMap = new Map();
-    
-    // 1. 收集当前职位技能（已有技能，权重较低）
-    props.currentJobSkills.forEach(skill => {
-        if (skill && skill.trim()) {
-            const existing = skillMap.get(skill) || { name: skill, weight: 0, tags: [], currentLevel: 0 };
-            existing.weight = Math.max(existing.weight, 0.3); // 已有技能权重较低
-            existing.tags.push('当前技能');
-            skillMap.set(skill, existing);
-        }
-    });
-    
-    // 2. 收集推荐职位的技能（需要发展的技能，权重较高）
-    props.recommendedJobs.forEach(job => {
-        if (Array.isArray(job.skills)) {
-            job.skills.forEach(skill => {
-                if (skill && skill.trim()) {
-                    const existing = skillMap.get(skill) || { name: skill, weight: 0, tags: [], currentLevel: 0 };
-                    existing.weight = Math.max(existing.weight, 0.7); // 推荐职位技能权重较高
-                    if (!existing.tags.includes('推荐技能')) {
-                        existing.tags.push('推荐技能');
-                    }
-                    skillMap.set(skill, existing);
-                }
-            });
-        }
-    });
-    
-    // 3. 收集职业路径中的技能（发展路径技能，权重最高）
-    const pathSkills = [];
-    if (props.pathData.start && Array.isArray(props.pathData.start.skills)) {
-        pathSkills.push(...props.pathData.start.skills);
+const emit = defineEmits(['path-data-updated']);
+
+// 当前职位（从父组件获取）
+const currentPosition = computed(() => props.currentJobName || '市场专员');
+
+// 目标职业选项列表
+const targetCareerOptions = ref([]);
+const selectedTargetIndex = ref(-1);
+const selectedJobPathId = ref(null);
+
+// 职业路径数量
+const totalPathCount = ref(0);
+
+// 技能列表数据（从接口获取）
+const skillList = ref([]);
+const isLoadingSkills = ref(false);
+// 是否已经查询过（用于区分未查询和已查询但无数据）
+const hasQueried = ref(false);
+
+function parseSkillList(skillString) {
+    if (!skillString) {
+        return [];
     }
-    if (Array.isArray(props.pathData.steps)) {
-        props.pathData.steps.forEach(step => {
-            if (Array.isArray(step.skills)) {
-                pathSkills.push(...step.skills);
-            }
+    return skillString
+        .split(/[,，]/)
+        .map(item => item.trim())
+        .filter(item => item.length > 0);
+}
+
+async function fetchTargetCareerOptions(keyword = '') {
+    try {
+        const response = await getJobPathPage({
+            jobName: keyword,
+            pageNo: 1,
+            pageSize: 100
+        });
+        
+        const list = response?.data?.list || response?.list || [];
+        
+        targetCareerOptions.value = list.map(item => ({
+            label: item.endJob || item.startJob || '未知职位',
+            value: item.id,
+            startJob: item.startJob,
+            endJob: item.endJob,
+            jobOrder: item.jobOrder
+        }));
+
+        if (targetCareerOptions.value.length === 0) {
+            selectedTargetIndex.value = -1;
+            selectedJobPathId.value = null;
+        }
+    } catch (error) {
+        targetCareerOptions.value = [];
+        selectedTargetIndex.value = -1;
+        selectedJobPathId.value = null;
+        uni.showToast({
+            title: '职业路径列表获取失败',
+            icon: 'none'
         });
     }
-    if (props.pathData.end && Array.isArray(props.pathData.end.skills)) {
-        pathSkills.push(...props.pathData.end.skills);
+}
+
+async function fetchPathCount() {
+    try {
+        const response = await getJobPathNum();
+        totalPathCount.value = response?.data ?? 0;
+    } catch (error) {
+        totalPathCount.value = 0;
+    }
+}
+
+async function loadPathDetail(jobPathId) {
+    if (!jobPathId || jobPathId === null || jobPathId === undefined || jobPathId === '') {
+        uni.showToast({
+            title: '职业路径ID无效',
+            icon: 'none'
+        });
+        localPathData.value = {
+            start: { title: '暂无数据', skills: [] },
+            steps: [],
+            end: { title: '暂无数据', skills: [] }
+        };
+        return;
     }
     
-    pathSkills.forEach(skill => {
-        if (skill && skill.trim()) {
-            const existing = skillMap.get(skill) || { name: skill, weight: 0, tags: [], currentLevel: 0 };
-            existing.weight = Math.max(existing.weight, 0.9); // 路径技能权重最高
-            if (!existing.tags.includes('路径技能')) {
-                existing.tags.push('路径技能');
-            }
-            skillMap.set(skill, existing);
+    try {
+        const requestParams = {
+            jobPathId: jobPathId
+        };
+        
+        const response = await getJobPathDetail(requestParams);
+        
+        const details = Array.isArray(response?.data) ? response.data : [];
+        
+        if (details.length === 0) {
+            localPathData.value = {
+                start: { title: '暂无数据', skills: [] },
+                steps: [],
+                end: { title: '暂无数据', skills: [] }
+            };
+            uni.showToast({
+                title: '暂无职业路径数据',
+                icon: 'none'
+            });
+            return;
         }
+
+        const normalized = details.map(item => ({
+            title: item?.name || '未命名职位',
+            skills: parseSkillList(item?.skillNameList)
+        }));
+
+        const start = normalized[0] || { title: '暂无数据', skills: [] };
+        const end = normalized[normalized.length - 1] || { title: '暂无数据', skills: [] };
+        const steps = normalized.slice(1, normalized.length - 1);
+
+        localPathData.value = {
+            start,
+            steps,
+            end
+        };
+        
+        // 通知父组件路径数据已更新
+        emit('path-data-updated', {
+            pathData: localPathData.value,
+            targetCareer: targetCareerOptions.value[selectedTargetIndex.value]?.label || ''
+        });
+    } catch (error) {
+        uni.showToast({
+            title: '获取路径详情失败',
+            icon: 'none'
+        });
+        localPathData.value = {
+            start: { title: '暂无数据', skills: [] },
+            steps: [],
+            end: { title: '暂无数据', skills: [] }
+        };
+        emit('path-data-updated', {
+            pathData: localPathData.value,
+            targetCareer: ''
+        });
+    }
+}
+
+function handleTargetChange(e) {
+    const index = Number(e.detail.value);
+    selectedTargetIndex.value = index;
+    const option = targetCareerOptions.value[index];
+    selectedJobPathId.value = option ? option.value : null;
+    // 重新选择目标职业时，重置查询状态和技能列表
+    hasQueried.value = false;
+    skillList.value = [];
+}
+
+async function handleQuery() {
+    if (selectedTargetIndex.value < 0) {
+        uni.showToast({
+            title: '请选择目标职业',
+            icon: 'none'
+        });
+        return;
+    }
+
+    const option = targetCareerOptions.value[selectedTargetIndex.value];
+    if (!option) {
+        uni.showToast({
+            title: '目标职业数据异常',
+            icon: 'none'
+        });
+        return;
+    }
+
+    // 获取技能权重数据
+    await fetchSkillWeight();
+}
+
+// 获取技能权重数据
+async function fetchSkillWeight() {
+    // 获取当前职位（使用界面上显示的值）
+    const currentJob = currentPosition.value || props.currentJobName || '';
+    
+    if (!currentJob) {
+        skillList.value = [];
+        uni.showToast({
+            title: '当前职位信息缺失',
+            icon: 'none'
+        });
+        return;
+    }
+    
+    // 获取目标职业（使用界面上选择的值）
+    const targetCareer = selectedTargetIndex.value >= 0 
+        ? targetCareerOptions.value[selectedTargetIndex.value]?.label 
+        : '';
+    
+    if (!targetCareer) {
+        skillList.value = [];
+        uni.showToast({
+            title: '请选择目标职业',
+            icon: 'none'
+        });
+        return;
+    }
+    
+    isLoadingSkills.value = true;
+    uni.showLoading({
+        title: '加载中...',
+        mask: true
     });
     
-    // 转换为数组并按权重排序
-    const result = Array.from(skillMap.values())
-        .map(item => ({
-            name: item.name,
-            weight: item.weight.toFixed(2),
-            tags: [...new Set(item.tags)], // 去重
-            currentLevel: item.currentLevel || Math.floor(item.weight * 5) + 1 // 根据权重计算等级
-        }))
-        .sort((a, b) => parseFloat(b.weight) - parseFloat(a.weight)); // 按权重降序
-    
-    return result;
+    try {
+        const response = await getJobSkillWeight({
+            currentJobName: currentJob,
+            targetJobName: targetCareer
+        });
+        
+        // 标记已经查询过
+        hasQueried.value = true;
+        
+        // 处理接口返回的数据
+        const responseData = response?.data || response || [];
+        const dataItem = Array.isArray(responseData) ? responseData[0] : responseData;
+        
+        // 合并当前职位和目标职位的技能列表
+        const currentSkills = Array.isArray(dataItem?.currentSkillDetList) ? dataItem.currentSkillDetList : [];
+        const targetSkills = Array.isArray(dataItem?.targetSkillDetList) ? dataItem.targetSkillDetList : [];
+        const allSkills = [...currentSkills, ...targetSkills];
+        
+        // 转换为组件需要的格式
+        skillList.value = allSkills.map(item => ({
+            name: item?.skillName || item?.name || '',
+            weight: item?.skillWeight || item?.weight || '0',
+            score: item?.skillScore !== undefined && item?.skillScore !== null ? item.skillScore : 0,
+            tags: item?.tags || [],
+            currentLevel: item?.currentLevel || item?.level || 0
+        })).filter(item => item.name).sort((a, b) => {
+            // 按技能分数降序排序（skillScore）
+            const scoreA = parseFloat(a.score) || 0;
+            const scoreB = parseFloat(b.score) || 0;
+            return scoreB - scoreA;
+        });
+        
+        if (skillList.value.length === 0) {
+            uni.showToast({
+                title: '暂无技能数据',
+                icon: 'none'
+            });
+        }
+    } catch (error) {
+        // 查询失败也标记为已查询
+        hasQueried.value = true;
+        uni.showToast({
+            title: '获取技能权重失败',
+            icon: 'none'
+        });
+        skillList.value = [];
+    } finally {
+        isLoadingSkills.value = false;
+        uni.hideLoading();
+    }
+}
+
+onMounted(async () => {
+    await Promise.all([
+        fetchTargetCareerOptions(),
+        fetchPathCount()
+    ]);
 });
-
-// 弹出层引用
-const skillWeightPopup = ref(null);
-
-// 选中的技能信息
-const selectedSkillName = ref('');
-const selectedSkillWeight = ref('');
-const selectedSkillLevel = ref(0);
-
-// 处理技能项点击
-function handleSkillItemClick(skill) {
-    selectedSkillName.value = skill.name || '';
-    selectedSkillWeight.value = skill.weight || '0';
-    selectedSkillLevel.value = skill.currentLevel || 0;
-    skillWeightPopup.value?.open();
-}
-
-// 处理弹出层关闭
-function handlePopupClose() {
-    // 可以在这里处理关闭后的逻辑
-}
 </script>
 
 <style lang="scss" scoped>
 .skill-development {
-    padding: 10rpx 0 20rpx;
+    padding: 10rpx 28rpx 20rpx;
     background-color: #EBF4FF;
     min-height:95%;
 }
 
+.query-section {
+    background-color: #FFFFFF;
+    border-radius: 16rpx;
+    padding: 28rpx;
+    margin-bottom: 20rpx;
+    box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.08);
+    
+    .section-title {
+        margin-top: 0;
+    }
+}
+
 .content-section {
-    background-color: #EBF4FF;
+    background-color: #FFFFFF;
+    border-radius: 16rpx;
     padding: 28rpx;
     box-sizing: border-box;
     overflow: visible;
+    box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.08);
+}
+
+.input-group {
+    display: flex;
+    flex-direction: column;
+    gap: 20rpx;
+    margin-bottom: 24rpx;
+}
+
+.input-item {
+    display: flex;
+    flex-direction: column;
+    gap: 12rpx;
+}
+
+.input-label {
+    font-size: 28rpx;
+    color: #000000;
+    font-weight: 500;
+}
+
+.input-field {
+    background-color: #F5F5F5;
+    border: 1rpx solid #E0E0E0;
+    border-radius: 12rpx;
+    padding: 20rpx 24rpx;
+    font-size: 28rpx;
+    color: #666666;
+}
+
+.picker-field {
+    background-color: #F5F5F5;
+    border: 1rpx solid #E0E0E0;
+    border-radius: 12rpx;
+    padding: 20rpx 24rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
+
+.picker-text {
+    font-size: 28rpx;
+    color: #000000;
+}
+
+.picker-placeholder {
+    font-size: 28rpx;
+    color: #999999;
+}
+
+.query-btn {
+    width: 100%;
+    height: 80rpx;
+    line-height: 40rpx;
+    border-radius: 20rpx;
+    background: linear-gradient(180deg, rgba(18, 125, 240, 1) 0%, rgba(59, 14, 123, 0.71) 100%);
+    color: rgba(255, 255, 255, 1);
+    font-size: 28rpx;
+    text-align: center;
+    font-family: '阿里巴巴普惠体3.0-regular', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
+    border: 2rpx solid rgba(187, 187, 187, 1);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 12rpx;
+    padding: 0;
+}
+
+.path-summary {
+    margin-top: 16rpx;
+    font-size: 24rpx;
+    color: #666666;
+    text-align: center;
+}
+
+button::after {
+    border: none;
 }
 
 .section-title {
@@ -185,7 +482,10 @@ function handlePopupClose() {
     align-items: center;
     gap: 12rpx;
     margin-bottom: 24rpx;
-    margin-top: -20rpx;
+    
+    .content-section & {
+        margin-top: 0;
+    }
 }
 
 .title-text {
@@ -253,6 +553,25 @@ function handlePopupClose() {
     white-space: nowrap;
 }
 
+.skill-info {
+    display: flex;
+    align-items: center;
+    gap: 12rpx;
+    flex-shrink: 0;
+    margin-left: 16rpx;
+}
+
+.skill-score {
+    font-size: 24rpx;
+    line-height: 34rpx;
+    border-radius: 10rpx;
+    background-color: rgba(49, 100, 239, 0.1);
+    color: rgba(44, 101, 247, 1);
+    text-align: center;
+    padding: 6rpx 12rpx;
+    white-space: nowrap;
+}
+
 .skill-weight {
     font-size: 24rpx;
     line-height: 34rpx;
@@ -262,8 +581,6 @@ function handlePopupClose() {
     text-align: center;
     padding: 6rpx 12rpx;
     white-space: nowrap;
-    flex-shrink: 0;
-    margin-left: 16rpx;
 }
 
 .skill-tags {
diff --git a/utilsRc/request.js b/utilsRc/request.js
index 6592004..de40339 100644
--- a/utilsRc/request.js
+++ b/utilsRc/request.js
@@ -20,13 +20,15 @@ const request = config => {
   // 是否需要设置 token
   const isToken = (config.headers || {}).isToken === false
   config.header = config.header || {}
-  // 从存储中获取微信登录的 token
-  const token = getToken()
-  if (token && !isToken) {
-    config.header['Authorization'] = 'Bearer ' + token
-  }
   // get请求映射params参数
   const baseType = config.baseUrlType
+  // 职业图谱相关接口不需要Authorization
+  const isZytpApi = baseType === 'zytp'
+  // 从存储中获取微信登录的 token
+  const token = getToken()
+  if (token && !isToken && !isZytpApi) {
+    config.header['Authorization'] = 'Bearer ' + token
+  }
   let requestBaseUrl = baseUrl
   if (baseType === 'zytp' && zytpBaseUrl) {
     requestBaseUrl = zytpBaseUrl

From ec9f49b5694d0d21fadbe21f045b92311775e7c9 Mon Sep 17 00:00:00 2001
From: lip <1040791966@qq.com>
Date: Thu, 4 Dec 2025 14:47:01 +0800
Subject: [PATCH 05/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/components/index-one.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/index/components/index-one.vue b/pages/index/components/index-one.vue
index 384b462..d707853 100644
--- a/pages/index/components/index-one.vue
+++ b/pages/index/components/index-one.vue
@@ -141,7 +141,7 @@
                     <view class="service-icon service-icon-9">
                         <IconfontIcon name="ai" :size="68" color="#FFFFFF" />
                     </view>
-                    <view class="service-title">AI智能面试</view>
+                    <view class="service-title">虚拟面试</view>
                 </view>
                 <view class="service-item press-button" style="justify-content:normal" @click="goRc()">
                     <view class="service-icon service-icon-9">

From cf7d228e0ff3bad34fed9b54bbd234e72d5ae4cc Mon Sep 17 00:00:00 2001
From: lintiantian <156569930@qq.com>
Date: Thu, 4 Dec 2025 15:08:01 +0800
Subject: [PATCH 06/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=81=8C=E4=B8=9A?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2id=E4=BC=A0=E5=80=BCbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageCa/job/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packageCa/job/index.vue b/packageCa/job/index.vue
index 1d1d55f..e020249 100644
--- a/packageCa/job/index.vue
+++ b/packageCa/job/index.vue
@@ -10,7 +10,7 @@
 				<text class="icon icon-search"></text>
 				<input type="search" v-model="kw" placeholder="请输入职业名称"  @input="inputKeywrok"/>
 				<view class="list-wrap" v-show="kw != ''">
-					<navigator  class="link" :url="'/packageCa/job/details?id='+item.Id" v-for="(item, index) in jobDataList" :key="index">{{item.Name}}</navigator>
+					<navigator  class="link" :url="'/packageCa/job/details?id='+item.EnCodeId" v-for="(item, index) in jobDataList" :key="index">{{item.Name}}</navigator>
 				</view>
 			</view>
 		</view>

From d564281671c4cb187d6f4228a5f3067d311c445e Mon Sep 17 00:00:00 2001
From: francis_fh <13935151924@163.com>
Date: Thu, 4 Dec 2025 17:18:45 +0800
Subject: [PATCH 07/17] =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91=E3=80=82=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.js                    |   4 +-
 packageA/pages/post/post.vue |  92 +++++++++++++++
 pages.json                   |   2 +-
 pages/job/publishJob.vue     | 212 ++++++++++++++++++++++++++++++++++-
 pages/search/search.vue      | 112 +++++++++---------
 5 files changed, 357 insertions(+), 65 deletions(-)

diff --git a/config.js b/config.js
index 2fcc09b..651e843 100644
--- a/config.js
+++ b/config.js
@@ -1,7 +1,7 @@
 export default {
     // baseUrl: 'http://39.98.44.136:8080', // 测试
-    // baseUrl: 'http://222.80.110.161:11111/api/ks', // 测试
-    baseUrl: 'http://ks.zhaopinzao8dian.com/api/ks', // 测试
+    baseUrl: 'http://222.80.110.161:11111/api/ks', // 正式环境
+    // baseUrl: 'http://ks.zhaopinzao8dian.com/api/ks', // 测试
 
 	LCBaseUrl:'http://10.110.145.145:9100',//招聘、培训、帮扶
 	LCBaseUrlInner:'http://10.110.145.145:10100',//内网端口
diff --git a/packageA/pages/post/post.vue b/packageA/pages/post/post.vue
index 05279af..4060ebc 100644
--- a/packageA/pages/post/post.vue
+++ b/packageA/pages/post/post.vue
@@ -68,6 +68,39 @@
                     {{ jobInfo.description }}
                 </view>
             </view>
+            <!-- 职位图片 -->
+            <view class="content-card" v-if="jobInfo.filesList && jobInfo.filesList.length > 0">
+                <view class="card-title">
+                    <text class="title">职位图片</text>
+                </view>
+                <view class="job-images">
+                    <view class="image-item" v-for="(file, index) in jobInfo.filesList" :key="file.id">
+                        <image :src="file.fileUrl" mode="aspectFit" @click="previewImage(file.fileUrl, index)"></image>
+                    </view>
+                </view>
+            </view>
+            <!-- 联系人信息 -->
+            <view class="content-card" v-if="jobInfo.jobContactList && jobInfo.jobContactList.length > 0">
+                <view class="card-title">
+                    <text class="title">联系人信息</text>
+                </view>
+                <view class="contact-list">
+                    <view class="contact-item" v-for="(contact, index) in jobInfo.jobContactList" :key="index">
+                        <view class="contact-info">
+                            <view class="contact-label">联系人：</view>
+                            <view class="contact-value">{{ contact.contactPerson }}</view>
+                        </view>
+                        <view class="contact-info">
+                            <view class="contact-label">职位：</view>
+                            <view class="contact-value">{{ contact.position }}</view>
+                        </view>
+                        <view class="contact-info">
+                            <view class="contact-label">电话：</view>
+                            <view class="contact-value">{{ contact.contactPersonPhone }}</view>
+                        </view>
+                    </view>
+                </view>
+            </view>
             <!-- 公司信息 -->
             <view class="content-card">
                 <view class="card-title">
@@ -482,6 +515,16 @@ function formatPublishTime(dateString) {
         return `${year}-${month.toString().padStart(2, '0')}-${day.toString().padStart(2, '0')}`;
     }
 }
+
+// 预览图片
+function previewImage(url, index) {
+    // 获取所有图片的URL列表
+    const allImageUrls = jobInfo.value.filesList.map(file => file.fileUrl);
+    uni.previewImage({
+        urls: allImageUrls,
+        current: index
+    });
+}
 </script>
 
 <style lang="stylus" scoped>
@@ -583,6 +626,55 @@ for i in 0..100
         }
     }
 }
+
+// 职位图片样式
+.job-images{
+    margin-top: 30rpx
+    display: flex
+    flex-wrap: wrap
+    gap: 20rpx
+    .image-item{
+        width: calc(50% - 10rpx)
+        height: 300rpx
+        border-radius: 12rpx
+        overflow: hidden
+        box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1)
+        image{
+            width: 100%
+            height: 100%
+            object-fit: cover
+        }
+    }
+}
+
+// 联系人信息样式
+.contact-list{
+    margin-top: 30rpx
+    .contact-item{
+        padding: 20rpx
+        background-color: #f8f9fa
+        border-radius: 12rpx
+        .contact-info{
+            display: flex
+            align-items: center
+            margin-bottom: 15rpx
+            &:last-child{
+                margin-bottom: 0
+            }
+            .contact-label{
+                font-weight: 500
+                font-size: 28rpx
+                color: #333333
+                width: 120rpx
+            }
+            .contact-value{
+                font-weight: 400
+                font-size: 28rpx
+                color: #495265
+            }
+        }
+    }
+}
 // ai
 .ai-explain{
     margin-top: 28rpx
diff --git a/pages.json b/pages.json
index 9cdf726..c2827e1 100644
--- a/pages.json
+++ b/pages.json
@@ -83,7 +83,7 @@
       {
         "path": "pages/search/search",
         "style": {
-          "navigationBarTitleText": ""
+          "navigationBarTitleText": "搜索职位"
         }
       },
       {
diff --git a/pages/job/publishJob.vue b/pages/job/publishJob.vue
index 13bfe3f..2395dd2 100644
--- a/pages/job/publishJob.vue
+++ b/pages/job/publishJob.vue
@@ -134,7 +134,38 @@
                 </view>
             </view>
 
-            <!-- 岗位描述区块 -->
+            <!-- 图片上传区块 -->
+            <view class="form-block">
+                <view class="section-title">岗位图片</view>
+                <view class="form-group">
+                    <view class="upload-container">
+                        <view 
+                            class="upload-item upload-btn" 
+                            v-if="formData.images.length < 3"
+                            @click="chooseImage"
+                        >
+                            <view class="upload-icon">+</view>
+                            <view class="upload-text">上传图片</view>
+                        </view>
+                        <view 
+                            class="upload-item preview-item" 
+                            v-for="(image, index) in formData.images" 
+                            :key="index"
+                        >
+                            <image 
+                                :src="image.filePath" 
+                                class="preview-img"
+                                @click="previewImage(index)"
+                            ></image>
+                            <view class="delete-img-btn" @click="deleteImage(index)">
+                                <view class="delete-icon">×</view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+
+        <!-- 岗位描述区块 -->
             <view class="form-block">
                 <view class="section-title">岗位描述</view>
                 <view class="form-group">
@@ -222,6 +253,7 @@ import { ref, reactive, onMounted, onUnmounted } from 'vue';
 import { onShow } from '@dcloudio/uni-app';
 import { storeToRefs } from 'pinia';
 import { createRequest } from '@/utils/request';
+import config from '@/config.js';
 import useDictStore from '@/stores/useDictStore';
 import useUserStore from '@/stores/useUserStore';
 import UniIcons from '@/uni_modules/uni-icons/components/uni-icons/uni-icons.vue';
@@ -244,6 +276,7 @@ const formData = reactive({
     jobLocationAreaCode: '', // 新增：工作地点区县字典代码
     education: '', // 新增：学历要求字典值
     experience: '', // 新增：工作经验字典值
+    images: [], // 新增：岗位图片
     contacts: [
         {
             name: '',
@@ -490,6 +523,101 @@ const goToCompanySearch = () => {
     });
 };
 
+// 图片选择
+const chooseImage = () => {
+    uni.chooseImage({
+        count: 3 - formData.images.length, // 最多可选择的图片数量
+        success: async (res) => {
+            uni.showLoading({
+                title: '上传中...'
+            });
+            
+            try {
+                for (const tempFilePath of res.tempFilePaths) {
+                    const uploadResult = await uploadImage(tempFilePath);
+                    formData.images.push(uploadResult);
+                }
+            } catch (error) {
+                console.error('上传失败:', error);
+                uni.showToast({
+                    title: '上传失败，请重试',
+                    icon: 'none'
+                });
+            } finally {
+                uni.hideLoading();
+            }
+        },
+        fail: (err) => {
+            console.error('选择图片失败:', err);
+        }
+    });
+};
+
+// 图片上传
+const uploadImage = (tempFilePath) => {
+    return new Promise((resolve, reject) => {
+        let Authorization = '';
+        if (useUserStore().token) {
+            Authorization = `${useUserStore().token}`;
+        }
+        
+        uni.uploadFile({
+            url: config.baseUrl + '/app/file/uploadFile',
+            filePath: tempFilePath,
+            name: 'file',
+            header: {
+                'Authorization': encodeURIComponent(Authorization)
+            },
+            success: (uploadFileRes) => {
+                if (uploadFileRes.statusCode === 200) {
+                    try {
+                        const result = JSON.parse(uploadFileRes.data);
+                        if (result.code === 200) {
+                            resolve(result);
+                        } else {
+                            reject(new Error(result.msg || '上传失败'));
+                        }
+                    } catch (e) {
+                        reject(new Error('解析上传结果失败'));
+                    }
+                } else {
+                    reject(new Error('网络请求失败'));
+                }
+            },
+            fail: (err) => {
+                reject(err);
+            }
+        });
+    });
+};
+
+// 删除图片
+const deleteImage = async (index) => {
+    const image = formData.images[index];
+    if (image.id) {
+        try {
+            await createRequest(`/app/file/${image.id}`, {}, 'DELETE', true);
+        } catch (error) {
+            console.error('删除图片失败:', error);
+            uni.showToast({
+                title: '删除图片失败',
+                icon: 'none'
+            });
+            return;
+        }
+    }
+    formData.images.splice(index, 1);
+};
+
+// 预览图片
+const previewImage = (index) => {
+    const urls = formData.images.map(image => image.filePath);
+    uni.previewImage({
+        current: index,
+        urls: urls
+    });
+};
+
 // 处理企业选择
 const handleCompanySelected = (company) => {
     formData.companyName = company.name;
@@ -525,7 +653,8 @@ const publishJob = async () => {
             jobCategory: formData.jobCategory,
             companyId: formData.companyId,
             companyName: formData.companyName,
-            jobContactList: formData.contacts.filter(contact => contact.name.trim() && contact.phone.trim())
+            jobContactList: formData.contacts.filter(contact => contact.name.trim() && contact.phone.trim()),
+            filesList: formData.images.map(image => ({ bussinessid: image.bussinessid })) // 新增：岗位图片列表，使用bussinessid
         };
         
         // 调试信息：打印companyId
@@ -1034,6 +1163,85 @@ const validateForm = () => {
 }
 /* #endif */
 
+/* 图片上传样式 */
+.upload-container {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 20rpx;
+    padding: 20rpx 0;
+}
+
+.upload-item {
+    width: 200rpx;
+    height: 200rpx;
+    border-radius: 12rpx;
+    position: relative;
+    box-sizing: border-box;
+}
+
+.upload-btn {
+    background-color: #f5f5f5;
+    border: 2rpx dashed #ddd;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    cursor: pointer;
+    transition: all 0.3s ease;
+    
+    &:active {
+        background-color: #e8e8e8;
+    }
+}
+
+.upload-icon {
+    font-size: 60rpx;
+    color: #999;
+    margin-bottom: 10rpx;
+    font-weight: 500;
+}
+
+.upload-text {
+    font-size: 24rpx;
+    color: #999;
+}
+
+.preview-item {
+    overflow: hidden;
+    background-color: #f5f5f5;
+}
+
+.preview-img {
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+}
+
+.delete-img-btn {
+    position: absolute;
+    top: 10rpx;
+    right: 10rpx;
+    width: 40rpx;
+    height: 40rpx;
+    background-color: rgba(0, 0, 0, 0.6);
+    border-radius: 50%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    cursor: pointer;
+    transition: all 0.3s ease;
+    
+    &:active {
+        background-color: rgba(0, 0, 0, 0.8);
+    }
+}
+
+.delete-icon {
+    font-size: 32rpx;
+    color: #fff;
+    font-weight: bold;
+}
+
 /* #ifdef MP-WEIXIN */
 .publish-job-page {
     position: fixed;
diff --git a/pages/search/search.vue b/pages/search/search.vue
index 6daa2e6..c3e0fe6 100644
--- a/pages/search/search.vue
+++ b/pages/search/search.vue
@@ -1,15 +1,15 @@
 <template>
     <view class="container safe-area-top">
-        <view>
+        <!-- 自定义头部搜索框 -->
+        <view class="custom-header">
             <view class="top">
-                <image class="btnback button-click" src="@/static/icon/back.png" @click="navBack"></image>
+                <!-- <image class="btnback button-click" src="@/static/icon/back.png" @click="navBack"></image> -->
                 <view class="search-box">
                     <uni-icons
                         class="iconsearch"
                         color="#666666"
                         type="search"
                         size="18"
-                        @confirm="searchCollection"
                     ></uni-icons>
                     <input
                         class="inputed"
@@ -200,61 +200,16 @@ function dataToImg(data) {
     display: flex
     flex-direction: column
     background: #F4f4f4
-    height: calc(100vh - var(--window-top) - var(--status-bar-height) - var(--window-bottom));
-    .view-top{
-        display: flex;
-        justify-content: space-around
-        background: #FFFFFF;
-        .top-item{
-            padding: 6rpx 0 18rpx 0
-        }
-        .active{
-            color: #256BFA;
-            font-weight: 500;
-            position: relative;
-        }
-        .active::after{
-            position: absolute;
-            content: ''
-            left: calc(50% - 12rpx)
-            bottom: 10rpx
-            width: 24rpx
-            height: 6rpx
-            background: #256BFA
-        }
-    }
-    .main-content{
-        background: #FFFFFF
-        height: 100%
-        .content-top{
-            padding: 28rpx
-            display: flex
-            justify-content: space-between
-            align-items: center
-            .top-left{
-                font-weight: 600;
-                font-size: 36rpx;
-                color: #000000;
-                line-height: 42rpx;
-            }
-        }
-        .content-history{
-            padding: 0 28rpx;
-            display: flex
-            flex-wrap: wrap
-            .history-tag{
-                margin-right: 40rpx
-                margin-bottom: 20rpx
-                white-space: nowrap
-                font-weight: 400;
-                font-size: 28rpx;
-                color: #333333;
-                background: #F5F5F5;
-                border-radius: 12rpx 12rpx 12rpx 12rpx;
-                width: fit-content;
-                padding: 12rpx 20rpx
-            }
-        }
+    height: 100vh;
+    .custom-header {
+        background-color: #fff;
+        padding:0;
+        box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+        position: fixed;
+        top: 0;
+        left: 0;
+        right: 0;
+        z-index: 999;
     }
     .top {
 		display: flex;
@@ -262,8 +217,6 @@ function dataToImg(data) {
         justify-content: space-between
 		background-color: #fff;
 		padding: 20rpx 20rpx;
-        position: sticky;
-        top: 0
         .btnback{
             width: 60rpx;
             height: 60rpx;
@@ -304,6 +257,45 @@ function dataToImg(data) {
 			color: #256BFA;
 		}
 	}
+    .main-content{
+        background: #FFFFFF
+        height: 100%
+        margin-top: 140rpx;
+        .content-top{
+            padding: 28rpx
+            display: flex
+            justify-content: space-between
+            align-items: center
+            .top-left{
+                font-weight: 600;
+                font-size: 36rpx;
+                color: #000000;
+                line-height: 42rpx;
+            }
+        }
+        .content-history{
+            padding: 0 28rpx;
+            display: flex
+            flex-wrap: wrap
+            .history-tag{
+                margin-right: 40rpx
+                margin-bottom: 20rpx
+                white-space: nowrap
+                font-weight: 400;
+                font-size: 28rpx;
+                color: #333333;
+                background: #F5F5F5;
+                border-radius: 12rpx 12rpx 12rpx 12rpx;
+                width: fit-content;
+                padding: 12rpx 20rpx
+            }
+        }
+    }
+    .Detailscroll-view{
+        flex: 1
+        overflow: hidden
+        margin-top: 140rpx;
+    }
 }
 
 .slot-item

From 16ebe3078b279f0e9a94f4a2d3c15965f70ea662 Mon Sep 17 00:00:00 2001
From: liyijie <13605448550@163.com>
Date: Thu, 4 Dec 2025 18:32:38 +0800
Subject: [PATCH 08/17] =?UTF-8?q?=E5=8D=95=E7=82=B9=EF=BC=8C=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E9=94=99=E9=A2=98=E6=9C=AC=EF=BC=8C=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/globalFunction.js                      |  3 +-
 components/jobfair/signDialog.vue             |  2 +-
 config.js                                     | 12 ++--
 packageB/login.vue                            | 46 +++++++++++--
 packageB/train/index.vue                      |  8 +--
 pages/careerfair/careerfair.vue               |  4 +-
 pages/index/components/index-one.vue          | 17 +++--
 .../dist/dev/mp-weixin/project.config.json    | 69 ++++++++++---------
 8 files changed, 105 insertions(+), 56 deletions(-)

diff --git a/common/globalFunction.js b/common/globalFunction.js
index 874e94d..8402cc1 100644
--- a/common/globalFunction.js
+++ b/common/globalFunction.js
@@ -50,7 +50,8 @@ const prePage = () => {
     return prePage.$vm;
 }
 
-export const urls ='http://10.110.145.145/images/train/'
+// export const urls ='http://10.110.145.145/images/train/'
+export const urls ='http://222.80.110.161:11111/images/train/'
 
 /**
  * 页面跳转封装，支持 query 参数传递和返回回调
diff --git a/components/jobfair/signDialog.vue b/components/jobfair/signDialog.vue
index 1b12efb..70a1704 100644
--- a/components/jobfair/signDialog.vue
+++ b/components/jobfair/signDialog.vue
@@ -54,7 +54,7 @@
 								</view>
 								<view class="job-info">
 									<view class="job-name">{{ item.jobTitle }}</view>
-									<view class="salary">{{ item.salaryRange }}元/月</view>
+									<view class="salary">{{ item.minSalary }} - {{ item.maxSalary }}元/月</view>
 								</view>
 							</view>
 						</view>
diff --git a/config.js b/config.js
index 2fcc09b..ec5cdb0 100644
--- a/config.js
+++ b/config.js
@@ -3,10 +3,14 @@ export default {
     // baseUrl: 'http://222.80.110.161:11111/api/ks', // 测试
     baseUrl: 'http://ks.zhaopinzao8dian.com/api/ks', // 测试
 
-	LCBaseUrl:'http://10.110.145.145:9100',//招聘、培训、帮扶
-	LCBaseUrlInner:'http://10.110.145.145:10100',//内网端口
-	imgBaseUrl:'http://10.110.145.145/images', //图片基础url
-	trainVideoImgUrl:'http://10.110.145.145:9100/file/file/minio',
+	// LCBaseUrl:'http://10.110.145.145:9100',//内网端口
+	// LCBaseUrlInner:'http://10.110.145.145:10100',//招聘、培训、帮扶
+	// imgBaseUrl:'http://10.110.145.145/images', //图片基础url
+	// trainVideoImgUrl:'http://10.110.145.145:9100/file/file/minio',
+	LCBaseUrl:'http://222.80.110.161:11111/prod-api',//内网端口
+	LCBaseUrlInner:'http://222.80.110.161:11111/prod-psout-api',//招聘、培训、帮扶
+	imgBaseUrl:'http://222.80.110.161:11111/images', //图片基础url
+	trainVideoImgUrl:'http://222.80.110.161:11111/prod-api/file/file/minio',
     // sseAI+
     // StreamBaseURl: 'http://39.98.44.136:8000',
     StreamBaseURl: 'https://qd.zhaopinzao8dian.com/ai',
diff --git a/packageB/login.vue b/packageB/login.vue
index 18e59df..47e7b19 100644
--- a/packageB/login.vue
+++ b/packageB/login.vue
@@ -1,7 +1,7 @@
 <template>
 	<AppLayout title="" :use-scroll-view="false">
 		<view class="wrap">
-			<view class="login_index">
+			<!-- <view class="login_index">
 				<input class="input" placeholder="请输入账号" placeholder-class="inputplace" v-model="form.username" />
 				<view class="login_yzm">
 					<input class="input" type="password" placeholder="请输入密码" placeholder-class="inputplace"
@@ -13,7 +13,7 @@
 				</view>
 
 				<button class="com-btn" @click="register">登 录</button>
-			</view>
+			</view> -->
 		</view>
 	</AppLayout>
 </template>
@@ -43,8 +43,8 @@
 	const flag=ref('hlw')
 
 	const form = reactive({
-		username: 'langchaojituan',
-		password: 'Aa123456?',
+		username: '913700004941904564',
+		password: '913700004941904564',
 		rememberMe: false,
 		code: '',
 		uuid: ''
@@ -57,7 +57,43 @@
 	})
 
 	onMounted(() => {
-		getCodeImg()
+		// getCodeImg()
+		let form={}
+		if (uni.getStorageSync('userInfo').isCompanyUser=='1') {
+			form={
+				usertype: '1',
+				idno: uni.getStorageSync('userInfo').idCard,
+				name: uni.getStorageSync('userInfo').name,
+				enterprisecode:"",
+				enterprisename: "",
+				contactperson: "",
+				contactphone: "",
+			}
+		}else if (uni.getStorageSync('userInfo').isCompanyUser=='0') {
+			form={
+				usertype: "2",
+				enterprisecode: uni.getStorageSync('userInfo').idCard,
+				enterprisename: uni.getStorageSync('userInfo').name,
+				contactperson: "",
+				contactphone: "",
+				idno: "",
+				name: ""
+			}
+		}
+		$api.myRequest('/auth/login2/ks',form,'post',10100).then((res) => {
+			if (res.code=='200') {
+				uni.setStorageSync('Padmin-Token', res.data.access_token)
+				uni.navigateBack({
+					delta:2
+				})
+			}
+		}).catch(() => {
+			uni.hideLoading()
+			uni.showToast({
+				icon: 'none',
+				title: '登录失败，请重试'
+			})
+		})
 	})
 
 	function register() {
diff --git a/packageB/train/index.vue b/packageB/train/index.vue
index 8e39257..4703b17 100644
--- a/packageB/train/index.vue
+++ b/packageB/train/index.vue
@@ -3,7 +3,7 @@
         <view class="tab-container">
 			<image src="/packageB/static/images/train/bj.jpg" mode=""></image>
 			<view>
-				<view class="btns" @click="jumps('/packageB/train/video/videoList')">
+				<!-- <view class="btns" @click="jumps('/packageB/train/video/videoList')">
 					<image src="/packageB/static/images/train/spxx-k.png" mode=""></image>
 					<view>
 						<text>培训视频</text>
@@ -12,7 +12,7 @@
 							<image src="/packageB/static/images/train/arrow.png" mode=""></image>
 						</view>
 					</view>
-				</view>
+				</view> -->
 				<view class="btns" @click="jumps('/packageB/train/practice/startPracticing')">
 					<image src="/packageB/static/images/train/zxxl-k.png" mode=""></image>
 					<view>
@@ -35,7 +35,7 @@
 					</view>
 					
 				</view>
-				<view class="btns" @click="jumps('/packageB/train/wrongAnswer/mistakeNotebook')">
+				<!-- <view class="btns" @click="jumps('/packageB/train/wrongAnswer/mistakeNotebook')">
 					<image src="/packageB/static/images/train/ctb-k.png" mode=""></image>
 					<view>
 						<text>错题本 </text>
@@ -45,7 +45,7 @@
 						</view>
 					</view>
 					
-				</view>
+				</view> -->
 			</view>
         </view>
     <!-- </AppLayout> -->
diff --git a/pages/careerfair/careerfair.vue b/pages/careerfair/careerfair.vue
index e699f76..a816058 100644
--- a/pages/careerfair/careerfair.vue
+++ b/pages/careerfair/careerfair.vue
@@ -13,9 +13,9 @@
 					<view class="header-btnLf button-click" @click="seemsg(3)" :class="{ active: state.current === 3 }">
 						我参与的
 					</view>
-					<view class="header-btnLf button-click" @click="navTo('/packageB/login')">
+					<!-- <view class="header-btnLf button-click" @click="navTo('/packageB/login')">
 						登录
-					</view>
+					</view> -->
 				</view>
 				<view class="header-input btn-feel">
 					<uni-icons class="iconsearch" color="#666666" type="search" size="18"
diff --git a/pages/index/components/index-one.vue b/pages/index/components/index-one.vue
index 384b462..bb16738 100644
--- a/pages/index/components/index-one.vue
+++ b/pages/index/components/index-one.vue
@@ -117,20 +117,20 @@
                     <view class="service-icon service-icon-5">
                         <IconfontIcon name="jinengpeixun" :size="48" color="#FFFFFF" />
                     </view>
-                    <view class="service-title">技能培训信息</view>
+                    <view class="service-title">技能培训</view>
                 </view>
                 <view class="service-item press-button" @click="handleServiceClick('skill-evaluation')">
                     <view class="service-icon service-icon-6">
                         <IconfontIcon name="jinengpingjia" :size="48" color="#FFFFFF" />
                     </view>
-                    <view class="service-title">技能评价指引</view>
+                    <view class="service-title">技能评价</view>
                 </view>
-                <view class="service-item press-button" @click="handleServiceClick('question-bank')">
+                <!-- <view class="service-item press-button" @click="handleServiceClick('question-bank')">
                     <view class="service-icon service-icon-7">
                         <IconfontIcon name="suzhicepingtiku" :size="48" color="#FFFFFF" />
                     </view>
                     <view class="service-title">题库和考试</view>
-                </view>
+                </view> -->
                 <view class="service-item press-button" @click="goCa()">
                     <view class="service-icon service-icon-8">
                         <IconfontIcon name="suzhicepingtiku" :size="48" color="#FFFFFF" />
@@ -862,7 +862,8 @@ function navToService(serviceType) {
         'public-recruitment': '/pages/service/public-recruitment', 
         'resume-creation': '/pages/resume-guide/resume-guide',
         'labor-policy': '/pages/service/labor-policy',
-        'skill-training': '/pages/service/skill-training',
+        'skill-training': '/packageB/train/video/videoList',
+        'skill-evaluation': '/packageB/train/index',
         // 'skill-evaluation': '/pages/service/skill-evaluation',
         'question-bank': '/pages/service/question-bank',
         // 'quality-assessment': '/packageCa/search/search',
@@ -874,9 +875,11 @@ function navToService(serviceType) {
         'interview-tips': '/pages/service/interview-tips',
         'employment-news': '/pages/service/employment-news',
         'more-services': '/pages/service/more-services',
-        'skill-evaluation': '/packageB/train/index'
     };
-    
+    if((serviceType=='skill-training'||serviceType=='skill-evaluation')&&!uni.getStorageSync('userInfo').idCard){
+        $api.msg('请先完善信息');
+		return
+	}
     const route = serviceRoutes[serviceType];
     if (route) {
         navTo(route);
diff --git a/unpackage/dist/dev/mp-weixin/project.config.json b/unpackage/dist/dev/mp-weixin/project.config.json
index 013e402..78517a9 100644
--- a/unpackage/dist/dev/mp-weixin/project.config.json
+++ b/unpackage/dist/dev/mp-weixin/project.config.json
@@ -1,35 +1,40 @@
 {
-  "setting": {
-    "es6": true,
-    "postcss": true,
-    "minified": true,
-    "uglifyFileName": false,
-    "enhance": true,
-    "packNpmRelationList": [],
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
+    "setting": {
+        "es6": true,
+        "postcss": true,
+        "minified": true,
+        "uglifyFileName": false,
+        "enhance": true,
+        "packNpmRelationList": [],
+        "babelSetting": {
+            "ignore": [],
+            "disablePlugins": [],
+            "outputPath": ""
+        },
+        "useCompilerPlugins": false,
+        "minifyWXML": true,
+        "compileWorklet": false,
+        "uploadWithSourceMap": true,
+        "packNpmManually": false,
+        "minifyWXSS": true,
+        "localPlugins": false,
+        "disableUseStrict": false,
+        "condition": false,
+        "swc": false,
+        "disableSWC": true,
+        "ignoreUploadUnusedFiles": false
     },
-    "useCompilerPlugins": false,
-    "minifyWXML": true,
-    "compileWorklet": false,
-    "uploadWithSourceMap": true,
-    "packNpmManually": false,
-    "minifyWXSS": true,
-    "localPlugins": false,
-    "disableUseStrict": false,
-    "condition": false,
-    "swc": false,
-    "disableSWC": true
-  },
-  "compileType": "miniprogram",
-  "simulatorPluginLibVersion": {},
-  "packOptions": {
-    "ignore": [],
-    "include": []
-  },
-  "appid": "wx4aa34488b965a331",
-  "editorSetting": {},
-  "libVersion": "3.11.1"
+    "compileType": "miniprogram",
+    "simulatorPluginLibVersion": {},
+    "packOptions": {
+        "ignore": [],
+        "include": []
+    },
+    "appid": "wx4aa34488b965a331",
+    "editorSetting": {
+        "tabIndent": "insertSpaces",
+        "tabSize": 4
+    },
+    "libVersion": "3.11.1",
+    "condition": {}
 }
\ No newline at end of file

From f20efdaa0ae172bcd468cfe9d203f1a92a140357 Mon Sep 17 00:00:00 2001
From: lintiantian <156569930@qq.com>
Date: Thu, 4 Dec 2025 19:50:47 +0800
Subject: [PATCH 09/17] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=B4=A0=E8=B4=A8?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=84=E5=8A=9F=E8=83=BD=E4=BD=93=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageCa/userCenter/careerCompass.vue  | 45 ++++++++++++++++++++++++-
 packageCa/userCenter/learningPlan.vue   |  7 ++--
 packageCa/userCenter/professionPath.vue |  2 +-
 packageCa/userCenter/smartTarget.vue    | 21 ++++++++++--
 4 files changed, 68 insertions(+), 7 deletions(-)

diff --git a/packageCa/userCenter/careerCompass.vue b/packageCa/userCenter/careerCompass.vue
index 58f9ce2..50c8727 100644
--- a/packageCa/userCenter/careerCompass.vue
+++ b/packageCa/userCenter/careerCompass.vue
@@ -5,7 +5,7 @@
 				生涯罗盘
 			</view>
 			<view class="section">
-				<view class="table">
+				<view class="table" v-if="compassList.length > 0">
 					<view class="tr">
 						<view class="th">
 						</view>
@@ -40,6 +40,13 @@
 						</view>
 					</view>
 				</view>
+				<view class="empty" v-else>
+					<view class="icon"></view>
+					<view class="txt">暂无推荐职业，请先进行兴趣测评</view>
+					<view class="nav-btn" @click="navTest">
+						去测评
+					</view>
+				</view>
 			</view>
 			<view class="title">
 				我的职业
@@ -115,6 +122,12 @@
 			this.getGXCareerPlanList();
 		},
 		methods: {
+			// 去测评
+			navTest(){
+				uni.navigateTo({
+					url: `/packageCa/pagesTest/testList`
+				})
+			},
 			//选中职业添加
 			async checkedJob(ITEM){
 				uni.showLoading({
@@ -218,6 +231,36 @@
 		    background-size: 38rpx 38rpx;
 		}
 	}
+	.empty {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		padding-top: 60rpx;
+		padding-bottom: 100rpx;
+		.icon {
+			width: 240rpx;
+			height: 240rpx;
+			background: url("#{$image-oss-url}/empty.png") no-repeat;
+			background-size: 100%;
+			margin-bottom: 20rpx;
+		}
+		.txt {
+			font-size: 28rpx;
+			color: #A4B3E5;
+		}
+		.nav-btn {
+			width: 335rpx;
+			height: 80rpx;
+			margin: 40rpx auto 0;
+			background-color: #1989fa;
+			border-radius: 40rpx;
+			font-size: 28rpx;
+			color: #fff;
+			text-align: center;
+			line-height: 80rpx;
+		}
+	}
 	.index-wrap {
 		 .content {
 			 padding: 0 20rpx;
diff --git a/packageCa/userCenter/learningPlan.vue b/packageCa/userCenter/learningPlan.vue
index 3c00319..576ddbb 100644
--- a/packageCa/userCenter/learningPlan.vue
+++ b/packageCa/userCenter/learningPlan.vue
@@ -302,20 +302,21 @@
 				padding: 40rpx 30rpx 0;
 				margin-top: 40rpx;
 				.target-tabbar {
-					margin-bottom: 50rpx;
+					margin-bottom: 30rpx;
 					display: flex;
 					flex-wrap: wrap;
 					.item {
 						position: relative;
-						width: 155rpx;
+						width: 150rpx;
 						height: 64rpx;
 						line-height: 64rpx;
 						text-align: center;
 						border-radius: 34rpx;
 						border: solid 2rpx #eeeeee;
-						font-size: 28rpx;
+						font-size: 26rpx;
 						color: #999999;
 						margin-right: 20rpx;
+						margin-bottom: 20rpx;
 						&.on {
 							color: #1989fa;
 							border-color: #1989fa;
diff --git a/packageCa/userCenter/professionPath.vue b/packageCa/userCenter/professionPath.vue
index 521e68c..d365432 100644
--- a/packageCa/userCenter/professionPath.vue
+++ b/packageCa/userCenter/professionPath.vue
@@ -203,7 +203,7 @@
 			// 去测评
 			navTest(){
 				uni.navigateTo({
-					url: `/pagesTest/interestTestCollect/interestTestTitle`
+					url: `/packageCa/pagesTest/interestTestTitle`
 				})
 			},
 			//选中职业
diff --git a/packageCa/userCenter/smartTarget.vue b/packageCa/userCenter/smartTarget.vue
index d7eaab2..1261450 100644
--- a/packageCa/userCenter/smartTarget.vue
+++ b/packageCa/userCenter/smartTarget.vue
@@ -83,7 +83,7 @@
 				<view class="form-wrap" >
 					<view class="form-item">
 						<view class="label">
-							目标描述
+							<text>*</text>目标描述
 						</view>
 						<view class="input-wrap">
 							<textarea v-model="targetForm.TargetDesc"
@@ -92,7 +92,7 @@
 					</view>
 					<view class="form-item">
 						<view class="label">
-							目标类型
+							<text>*</text>目标类型
 						</view>
 						<view class="check-wrap">
 							<view class="checked-item" @click="targetForm.TargetType = 1">
@@ -228,6 +228,20 @@
 			},
 			// 保存目标
 			async saveTarget(){
+				if(this.targetForm.TargetDesc == ""){
+					uni.showToast({
+						title: "请输入目标描述",
+						icon: "none"
+					})
+					return;
+				}
+				if(this.targetForm.TargetType == ""){
+					uni.showToast({
+						title: "请选择目标类型",
+						icon: "none"
+					})
+					return;
+				}
 				const res = await api.saveSmartTarget(this.targetForm);
 				if (res.Result == 1) {
 					uni.showToast({
@@ -565,6 +579,9 @@
 							font-size: 28rpx;
 							color: #333333;
 							margin-bottom: 30rpx;
+							text {
+								color: #ff0000;
+							}
 						}
 						.check-wrap {
 							display: flex;

From d76b8b664e855578a30cd9b63b38e69a1e30d06f Mon Sep 17 00:00:00 2001
From: francis_fh <13935151924@163.com>
Date: Fri, 5 Dec 2025 11:26:05 +0800
Subject: [PATCH 10/17] 1

---
 config.js                                     |  2 +-
 stores/useLocationStore.js                    |  8 +--
 .../dist/dev/mp-weixin/project.config.json    | 69 +++++++++----------
 3 files changed, 37 insertions(+), 42 deletions(-)

diff --git a/config.js b/config.js
index 4bdfd0c..b478506 100644
--- a/config.js
+++ b/config.js
@@ -25,7 +25,7 @@ export default {
     // 只使用本地缓寸的数据
     OnlyUseCachedDB: true,
     // 使用模拟定位
-    UsingSimulatedPositioning: true,
+    UsingSimulatedPositioning: false,
     // 应用信息
     appInfo: {
         // 应用名称
diff --git a/stores/useLocationStore.js b/stores/useLocationStore.js
index fc0c453..c8fd9fe 100644
--- a/stores/useLocationStore.js
+++ b/stores/useLocationStore.js
@@ -24,8 +24,8 @@ const useLocationStore = defineStore("location", () => {
                 timeout: 10000,
                 success: function(res) {
                     const resd = {
-                        longitude: 120.382665,
-                        latitude: 36.066938
+                        longitude: 75.993802,
+                        latitude: 39.468225
                     }
                     if (config.UsingSimulatedPositioning) { // 使用模拟定位
                         longitudeVal.value = resd.longitude
@@ -44,8 +44,8 @@ const useLocationStore = defineStore("location", () => {
                     // latitudeVal.value = ''
                     // reject(err)
                     const resd = {
-                        longitude: 120.382665,
-                        latitude: 36.066938
+                        longitude: 75.993802,
+                        latitude: 39.468225
                     }
                     longitudeVal.value = resd.longitude
                     latitudeVal.value = resd.latitude
diff --git a/unpackage/dist/dev/mp-weixin/project.config.json b/unpackage/dist/dev/mp-weixin/project.config.json
index 78517a9..013e402 100644
--- a/unpackage/dist/dev/mp-weixin/project.config.json
+++ b/unpackage/dist/dev/mp-weixin/project.config.json
@@ -1,40 +1,35 @@
 {
-    "setting": {
-        "es6": true,
-        "postcss": true,
-        "minified": true,
-        "uglifyFileName": false,
-        "enhance": true,
-        "packNpmRelationList": [],
-        "babelSetting": {
-            "ignore": [],
-            "disablePlugins": [],
-            "outputPath": ""
-        },
-        "useCompilerPlugins": false,
-        "minifyWXML": true,
-        "compileWorklet": false,
-        "uploadWithSourceMap": true,
-        "packNpmManually": false,
-        "minifyWXSS": true,
-        "localPlugins": false,
-        "disableUseStrict": false,
-        "condition": false,
-        "swc": false,
-        "disableSWC": true,
-        "ignoreUploadUnusedFiles": false
+  "setting": {
+    "es6": true,
+    "postcss": true,
+    "minified": true,
+    "uglifyFileName": false,
+    "enhance": true,
+    "packNpmRelationList": [],
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
     },
-    "compileType": "miniprogram",
-    "simulatorPluginLibVersion": {},
-    "packOptions": {
-        "ignore": [],
-        "include": []
-    },
-    "appid": "wx4aa34488b965a331",
-    "editorSetting": {
-        "tabIndent": "insertSpaces",
-        "tabSize": 4
-    },
-    "libVersion": "3.11.1",
-    "condition": {}
+    "useCompilerPlugins": false,
+    "minifyWXML": true,
+    "compileWorklet": false,
+    "uploadWithSourceMap": true,
+    "packNpmManually": false,
+    "minifyWXSS": true,
+    "localPlugins": false,
+    "disableUseStrict": false,
+    "condition": false,
+    "swc": false,
+    "disableSWC": true
+  },
+  "compileType": "miniprogram",
+  "simulatorPluginLibVersion": {},
+  "packOptions": {
+    "ignore": [],
+    "include": []
+  },
+  "appid": "wx4aa34488b965a331",
+  "editorSetting": {},
+  "libVersion": "3.11.1"
 }
\ No newline at end of file

From 0fbba1d868679353cad54aa8f44da0eecc4295be Mon Sep 17 00:00:00 2001
From: francis_fh <13935151924@163.com>
Date: Fri, 5 Dec 2025 13:31:15 +0800
Subject: [PATCH 11/17] =?UTF-8?q?=E9=99=84=E8=BF=91=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/nearby/components/four.vue  | 124 ++++++++------
 pages/nearby/components/one.vue   | 273 +++++++++++++++++-------------
 pages/nearby/components/three.vue | 231 +++++++++++++------------
 pages/nearby/components/two.vue   | 264 +++++++++++++++++------------
 pages/nearby/nearby.vue           |   1 +
 5 files changed, 503 insertions(+), 390 deletions(-)

diff --git a/pages/nearby/components/four.vue b/pages/nearby/components/four.vue
index 1cf2833..7fd0921 100644
--- a/pages/nearby/components/four.vue
+++ b/pages/nearby/components/four.vue
@@ -1,5 +1,5 @@
 <template>
-    <scroll-view :scroll-y="true" class="nearby-scroll" @scrolltolower="scrollBottom">
+    <view class="nearby-container">
         <view class="two-head">
             <view
                 class="head-item"
@@ -11,66 +11,68 @@
                 {{ item.commercialAreaName }}
             </view>
         </view>
-        <view class="nearby-list">
-            <view class="nav-filter" @touchmove.stop.prevent>
-                <view class="filter-top">
-                    <scroll-view :scroll-x="true" :show-scrollbar="false" class="tab-scroll">
-                        <view class="jobs-left">
-                            <view
-                                class="job button-click"
-                                :class="{ active: state.tabIndex === 'all' }"
-                                @click="choosePosition('all')"
-                            >
-                                全部
+        <scroll-view :scroll-y="true" class="nearby-scroll" @scrolltolower="scrollBottom" lower-threshold="50">
+            <view class="nearby-list">
+                <view class="nav-filter" @touchmove.stop.prevent>
+                    <view class="filter-top">
+                        <scroll-view :scroll-x="true" :show-scrollbar="false" class="tab-scroll">
+                            <view class="jobs-left">
+                                <view
+                                    class="job button-click"
+                                    :class="{ active: state.tabIndex === 'all' }"
+                                    @click="choosePosition('all')"
+                                >
+                                    全部
+                                </view>
+                                <view
+                                    class="job button-click"
+                                    :class="{ active: state.tabIndex === index }"
+                                    v-for="(item, index) in userInfo.jobTitle"
+                                    :key="index"
+                                    @click="choosePosition(index)"
+                                >
+                                    {{ item }}
+                                </view>
                             </view>
-                            <view
-                                class="job button-click"
-                                :class="{ active: state.tabIndex === index }"
-                                v-for="(item, index) in userInfo.jobTitle"
-                                :key="index"
-                                @click="choosePosition(index)"
-                            >
-                                {{ item }}
-                            </view>
-                        </view>
-                    </scroll-view>
-                    <view class="jobs-add button-click" @click="navTo('/packageA/pages/addPosition/addPosition')">
-                        <uni-icons class="iconsearch" color="#666D7F" type="plusempty" size="18"></uni-icons>
-                        <text>添加</text>
-                    </view>
-                </view>
-                <view class="filter-bottom">
-                    <view class="btm-left">
-                        <view
-                            class="button-click filterbtm"
-                            :class="{ active: pageState.search.order === item.value }"
-                            v-for="item in rangeOptions"
-                            @click="handelHostestSearch(item)"
-                            :key="item.value"
-                        >
-                            {{ item.text }}
+                        </scroll-view>
+                        <view class="jobs-add button-click" @click="navTo('/packageA/pages/addPosition/addPosition')">
+                            <uni-icons class="iconsearch" color="#666D7F" type="plusempty" size="18"></uni-icons>
+                            <text>添加</text>
                         </view>
                     </view>
-                    <view class="btm-right button-click" @click="openFilter">
-                        筛选
-                        <image class="right-sx" :class="{ active: showFilter }" src="@/static/icon/shaixun.png"></image>
+                    <view class="filter-bottom">
+                        <view class="btm-left">
+                            <view
+                                class="button-click filterbtm"
+                                :class="{ active: pageState.search.order === item.value }"
+                                v-for="item in rangeOptions"
+                                @click="handelHostestSearch(item)"
+                                :key="item.value"
+                            >
+                                {{ item.text }}
+                            </view>
+                        </view>
+                        <view class="btm-right button-click" @click="openFilter">
+                            筛选
+                            <image class="right-sx" :class="{ active: showFilter }" src="@/static/icon/shaixun.png"></image>
+                        </view>
                     </view>
                 </view>
+                <view class="one-cards">
+                    <renderJobs
+                        v-if="list.length"
+                        :list="list"
+                        :longitude="longitudeVal"
+                        :latitude="latitudeVal"
+                    ></renderJobs>
+                    <empty v-else pdTop="60"></empty>
+                    <loadmore ref="loadmoreRef"></loadmore>
+                </view>
             </view>
-            <view class="one-cards">
-                <renderJobs
-                    v-if="list.length"
-                    :list="list"
-                    :longitude="longitudeVal"
-                    :latitude="latitudeVal"
-                ></renderJobs>
-                <empty v-else pdTop="60"></empty>
-                <loadmore ref="loadmoreRef"></loadmore>
-            </view>
-        </view>
+        </scroll-view>
         <!-- 筛选 -->
         <select-filter ref="selectFilterModel"></select-filter>
-    </scroll-view>
+    </view>
 </template>
 
 <script setup>
@@ -273,9 +275,20 @@ defineExpose({ loadData, handleFilterConfirm });
 <style lang="stylus" scoped>
 .tabchecked
     color:  #4778EC !important
-.nearby-scroll
+
+.nearby-container
+    // 确保容器占据整个可用视口高度，包括安全区域
+    height: calc(100vh - var(--window-top));
+    display: flex;
+    flex-direction: column;
     overflow: hidden;
-    .two-head
+    
+.nearby-scroll
+    // 使用flex布局让scroll-view自适应高度，占据剩余空间
+    flex: 1;
+    overflow: hidden;
+    
+.two-head
         margin: 22rpx;
         display: flex;
         flex-wrap: wrap
@@ -303,7 +316,6 @@ defineExpose({ loadData, handleFilterConfirm });
             border-radius: 12rpx 12rpx 12rpx 12rpx;
 .nearby-list
     border-top: 2rpx solid #EBEBEB;
-    height: 100%
     .one-cards{
         display: flex;
         flex-direction: column;
diff --git a/pages/nearby/components/one.vue b/pages/nearby/components/one.vue
index c7e8ee8..cc7277c 100644
--- a/pages/nearby/components/one.vue
+++ b/pages/nearby/components/one.vue
@@ -1,6 +1,11 @@
 <template>
-    <scroll-view :scroll-y="true" class="nearby-scroll" @scrolltolower="scrollBottom">
-        <view class="nearby-map" @touchmove.stop.prevent>
+    <view class="nearby-container">
+        <!-- 地图区域 - 可折叠 -->
+        <view 
+            class="nearby-map" 
+            @touchmove.stop.prevent
+            :class="{ 'map-collapsed': isMapCollapsed }"
+        >
             <map
                 style="width: 100%; height: 400px"
                 :latitude="latitudeVal"
@@ -22,71 +27,79 @@
                         </view>
                     </view>
                 </transition>
-                <!-- <view class="select-list" v-show="!rangeShow">
-                    <view class="list-item" v-for="(item, index) in range">{{ item }}km</view>
-                </view> -->
             </view>
         </view>
-        <view class="nearby-list">
-            <view class="nav-filter" @touchmove.stop.prevent>
-                <view class="filter-top">
-                    <scroll-view :scroll-x="true" :show-scrollbar="false" class="tab-scroll">
-                        <view class="jobs-left">
-                            <view
-                                class="job button-click"
-                                :class="{ active: state.tabIndex === 'all' }"
-                                @click="choosePosition('all')"
-                            >
-                                全部
-                            </view>
-                            <view
-                                class="job button-click"
-                                :class="{ active: state.tabIndex === index }"
-                                v-for="(item, index) in userInfo.jobTitle"
-                                :key="index"
-                                @click="choosePosition(index)"
-                            >
-                                {{ item }}
-                            </view>
-                        </view>
-                    </scroll-view>
-                    <view class="jobs-add button-click" @click="navTo('/packageA/pages/addPosition/addPosition')">
-                        <uni-icons class="iconsearch" color="#666D7F" type="plusempty" size="18"></uni-icons>
-                        <text>添加</text>
-                    </view>
-                </view>
-                <view class="filter-bottom">
-                    <view class="btm-left">
+        <!-- 筛选条件 - 固定显示 -->
+        <view class="nav-filter" @touchmove.stop.prevent>
+            <view class="filter-top">
+                <scroll-view :scroll-x="true" :show-scrollbar="false" class="tab-scroll">
+                    <view class="jobs-left">
                         <view
-                            class="button-click filterbtm"
-                            :class="{ active: pageState.search.order === item.value }"
-                            v-for="item in rangeOptions"
-                            @click="handelHostestSearch(item)"
-                            :key="item.value"
+                            class="job button-click"
+                            :class="{ active: state.tabIndex === 'all' }"
+                            @click="choosePosition('all')"
                         >
-                            {{ item.text }}
+                            全部
+                        </view>
+                        <view
+                            class="job button-click"
+                            :class="{ active: state.tabIndex === index }"
+                            v-for="(item, index) in userInfo.jobTitle"
+                            :key="index"
+                            @click="choosePosition(index)"
+                        >
+                            {{ item }}
                         </view>
                     </view>
-                    <view class="btm-right button-click" @click="openFilter">
-                        筛选
-                        <image class="right-sx" :class="{ active: showFilter }" src="@/static/icon/shaixun.png"></image>
-                    </view>
+                </scroll-view>
+                <view class="jobs-add button-click" @click="navTo('/packageA/pages/addPosition/addPosition')">
+                    <uni-icons class="iconsearch" color="#666D7F" type="plusempty" size="18"></uni-icons>
+                    <text>添加</text>
                 </view>
             </view>
-            <view class="one-cards">
-                <renderJobs
-                    v-if="list.length"
-                    :list="list"
-                    :longitude="longitudeVal"
-                    :latitude="latitudeVal"
-                ></renderJobs>
-                <empty v-else pdTop="60"></empty>
-                <loadmore ref="loadmoreRef"></loadmore>
+            <view class="filter-bottom">
+                <view class="btm-left">
+                    <view
+                        class="button-click filterbtm"
+                        :class="{ active: pageState.search.order === item.value }"
+                        v-for="item in rangeOptions"
+                        @click="handelHostestSearch(item)"
+                        :key="item.value"
+                    >
+                        {{ item.text }}
+                    </view>
+                </view>
+                <view class="btm-right button-click" @click="openFilter">
+                    筛选
+                    <image class="right-sx" :class="{ active: showFilter }" src="@/static/icon/shaixun.png"></image>
+                </view>
             </view>
         </view>
+        <!-- 列表滚动区域 -->
+        <scroll-view 
+            :scroll-y="true" 
+            class="nearby-scroll" 
+            @scrolltolower="scrollBottom" 
+            lower-threshold="50"
+            ref="scrollViewRef"
+            @scroll="handleScroll"
+        >
+            <view class="nearby-list">
+                <view class="one-cards">
+                    <renderJobs
+                        v-if="list.length"
+                        :list="list"
+                        :longitude="longitudeVal"
+                        :latitude="latitudeVal"
+                    ></renderJobs>
+                    <empty v-else pdTop="60"></empty>
+                    <loadmore ref="loadmoreRef"></loadmore>
+                </view>
+            </view>
+        </scroll-view>
         <!-- 筛选 -->
         <select-filter ref="selectFilterModel"></select-filter>
-    </scroll-view>
+    </view>
 </template>
 
 <script setup>
@@ -107,6 +120,8 @@ const range = ref([1, 2, 4, 6, 8, 10]);
 const rangeShow = ref(false);
 
 const selectFilterModel = ref(null);
+const scrollViewRef = ref(null);
+const isMapCollapsed = ref(false);
 const tMap = ref();
 const progress = ref();
 const mapCovers = ref([]);
@@ -264,6 +279,13 @@ function progressChange(value) {
     debounceAjax('refresh');
 }
 
+// 处理滚动事件，实现地图折叠
+function handleScroll(e) {
+    const scrollTop = e.detail.scrollTop;
+    // 当滚动超过100rpx时，折叠地图
+    isMapCollapsed.value = scrollTop > 100;
+}
+
 let debounceAjax = debounce(getJobList, 500);
 function getJobList(type = 'add') {
     if (type === 'add' && pageState.page < pageState.maxPage) {
@@ -363,78 +385,97 @@ defineExpose({ loadData, handleFilterConfirm });
         }
     }
 }
-.nearby-scroll
+.nearby-container
+    // 确保容器占据整个可用视口高度，包括安全区域
+    height: calc(100vh - var(--window-top));
+    display: flex;
+    flex-direction: column;
     overflow: hidden;
-    .nearby-map
-        height: 767rpx;
-        background: #e8e8e8;
-        overflow: hidden
+    
+.nearby-map
+    height: 767rpx;
+    background: #e8e8e8;
+    overflow: hidden
+    transition: height 0.3s ease;
+    
+    &.map-collapsed {
+        height: 0;
+        overflow: hidden;
+    }
+    
+.nearby-scroll
+    // 使用flex布局让scroll-view自适应高度，占据剩余空间
+    flex: 1;
+    overflow: hidden;
+    transition: flex 0.3s ease;
 .nearby-list
     .one-cards{
         display: flex;
         flex-direction: column;
         padding: 0 20rpx 20rpx 20rpx;
         background: #f4f4f4
-        height: 100%
     }
-    .nav-filter
-        padding: 16rpx 28rpx 0 28rpx
-        .filter-top
-            display: flex
-            justify-content: space-between;
-            .tab-scroll
-                flex: 1;
-                overflow: hidden;
-                margin-right: 20rpx
-                white-space: nowrap;
-                overflow: hidden;
-                text-overflow: clip;
-                -webkit-mask-image: linear-gradient(to right, black 60%, transparent);
-                mask-image: linear-gradient(to right, black 60%, transparent);
-                .jobs-left
-                    display: flex
-                    flex-wrap: nowrap
-                    .job
-                        font-weight: 400;
-                        font-size: 36rpx;
-                        color: #666D7F;
-                        margin-right: 32rpx;
-                        white-space: nowrap
-                    .active
-                        font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
-                        font-weight: 500;
-                        font-size: 36rpx;
-                        color: #000000;
-            .jobs-add
+
+// 筛选条件样式 - 顶级选择器
+.nav-filter
+    padding: 16rpx 28rpx 0 28rpx
+    background: #ffffff
+    .filter-top
+        display: flex
+        justify-content: space-between;
+        .tab-scroll
+            flex: 1;
+            overflow: hidden;
+            margin-right: 20rpx
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: clip;
+            -webkit-mask-image: linear-gradient(to right, black 60%, transparent);
+            mask-image: linear-gradient(to right, black 60%, transparent);
+            .jobs-left
                 display: flex
-                align-items: center;
-                justify-content: center;
+                flex-wrap: nowrap
+                .job
+                    font-weight: 400;
+                    font-size: 36rpx;
+                    color: #666D7F;
+                    margin-right: 32rpx;
+                    white-space: nowrap
+                .active
+                    font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
+                    font-weight: 500;
+                    font-size: 36rpx;
+                    color: #000000;
+        .jobs-add
+            display: flex
+            align-items: center;
+            justify-content: center;
+            font-weight: 400;
+            font-size: 32rpx;
+            color: #666D7F;
+            line-height: 38rpx;
+    .filter-bottom
+        display: flex
+        justify-content: space-between
+        padding: 24rpx 0
+        .btm-left
+            display: flex
+            .filterbtm
                 font-weight: 400;
                 font-size: 32rpx;
                 color: #666D7F;
-                line-height: 38rpx;
-        .filter-bottom
-            display: flex
-            justify-content: space-between
-            padding: 24rpx 0
-            .btm-left
-                display: flex
-                .filterbtm
-                    font-weight: 400;
-                    font-size: 32rpx;
-                    color: #666D7F;
-                    margin-right: 40rpx
-                .active
-                    font-weight: 500;
-                    font-size: 32rpx;
-                    color: #256BFA;
-            .btm-right
-                font-weight: 400;
+                margin-right: 40rpx
+            .active
+                font-weight: 500;
                 font-size: 32rpx;
-                color: #6C7282;
-                .right-sx
-                    width: 26rpx;
-                    height: 26rpx;
-                .active
-                    transform: rotate(180deg)
+                color: #256BFA;
+        .btm-right
+            font-weight: 400;
+            font-size: 32rpx;
+            color: #6C7282;
+            .right-sx
+                width: 26rpx;
+                height: 26rpx;
+            .active
+                transform: rotate(180deg)
 </style>
diff --git a/pages/nearby/components/three.vue b/pages/nearby/components/three.vue
index 8355421..1126a62 100644
--- a/pages/nearby/components/three.vue
+++ b/pages/nearby/components/three.vue
@@ -1,5 +1,5 @@
 <template>
-    <scroll-view :scroll-y="true" class="nearby-scroll" @scrolltolower="scrollBottom">
+    <view class="nearby-container">
         <view class="three-head" @touchmove.stop.prevent>
             <view class="one-picker">
                 <view class="oneleft button-click" @click="openFilterSubway">
@@ -48,66 +48,69 @@
                 </view>
             </scroll-view>
         </view>
-        <view class="nearby-list">
-            <view class="nav-filter" @touchmove.stop.prevent>
-                <view class="filter-top">
-                    <scroll-view :scroll-x="true" :show-scrollbar="false" class="tab-scroll">
-                        <view class="jobs-left">
-                            <view
-                                class="job button-click"
-                                :class="{ active: state.tabIndex === 'all' }"
-                                @click="choosePosition('all')"
-                            >
-                                全部
-                            </view>
-                            <view
-                                class="job button-click"
-                                :class="{ active: state.tabIndex === index }"
-                                v-for="(item, index) in userInfo.jobTitle"
-                                :key="index"
-                                @click="choosePosition(index)"
-                            >
-                                {{ item }}
-                            </view>
-                        </view>
-                    </scroll-view>
-                    <view class="jobs-add button-click" @click="navTo('/packageA/pages/addPosition/addPosition')">
-                        <uni-icons class="iconsearch" color="#666D7F" type="plusempty" size="18"></uni-icons>
-                        <text>添加</text>
-                    </view>
-                </view>
-                <view class="filter-bottom">
-                    <view class="btm-left">
+        <!-- 筛选项移到scroll-view外面 -->
+        <view class="nav-filter" @touchmove.stop.prevent>
+            <view class="filter-top">
+                <scroll-view :scroll-x="true" :show-scrollbar="false" class="tab-scroll">
+                    <view class="jobs-left">
                         <view
-                            class="button-click filterbtm"
-                            :class="{ active: pageState.search.order === item.value }"
-                            v-for="item in rangeOptions"
-                            @click="handelHostestSearch(item)"
-                            :key="item.value"
+                            class="job button-click"
+                            :class="{ active: state.tabIndex === 'all' }"
+                            @click="choosePosition('all')"
                         >
-                            {{ item.text }}
+                            全部
+                        </view>
+                        <view
+                            class="job button-click"
+                            :class="{ active: state.tabIndex === index }"
+                            v-for="(item, index) in userInfo.jobTitle"
+                            :key="index"
+                            @click="choosePosition(index)"
+                        >
+                            {{ item }}
                         </view>
                     </view>
-                    <view class="btm-right button-click" @click="openFilter">
-                        筛选
-                        <image class="right-sx" :class="{ active: showFilter }" src="@/static/icon/shaixun.png"></image>
-                    </view>
+                </scroll-view>
+                <view class="jobs-add button-click" @click="navTo('/packageA/pages/addPosition/addPosition')">
+                    <uni-icons class="iconsearch" color="#666D7F" type="plusempty" size="18"></uni-icons>
+                    <text>添加</text>
                 </view>
             </view>
-            <view class="one-cards">
-                <renderJobs
-                    v-if="list.length"
-                    :list="list"
-                    :longitude="longitudeVal"
-                    :latitude="latitudeVal"
-                ></renderJobs>
-                <empty v-else pdTop="60"></empty>
-                <loadmore ref="loadmoreRef"></loadmore>
+            <view class="filter-bottom">
+                <view class="btm-left">
+                    <view
+                        class="button-click filterbtm"
+                        :class="{ active: pageState.search.order === item.value }"
+                        v-for="item in rangeOptions"
+                        @click="handelHostestSearch(item)"
+                        :key="item.value"
+                    >
+                        {{ item.text }}
+                    </view>
+                </view>
+                <view class="btm-right button-click" @click="openFilter">
+                    筛选
+                    <image class="right-sx" :class="{ active: showFilter }" src="@/static/icon/shaixun.png"></image>
+                </view>
             </view>
         </view>
+        <scroll-view :scroll-y="true" class="nearby-scroll" @scrolltolower="scrollBottom" lower-threshold="50">
+            <view class="nearby-list">
+                <view class="one-cards">
+                    <renderJobs
+                        v-if="list.length"
+                        :list="list"
+                        :longitude="longitudeVal"
+                        :latitude="latitudeVal"
+                    ></renderJobs>
+                    <empty v-else pdTop="60"></empty>
+                    <loadmore ref="loadmoreRef"></loadmore>
+                </view>
+            </view>
+        </scroll-view>
         <!-- 筛选 -->
         <select-filter ref="selectFilterModel"></select-filter>
-    </scroll-view>
+    </view>
 </template>
 
 <script setup>
@@ -358,9 +361,18 @@ defineExpose({ loadData, handleFilterConfirm });
         transform: rotate(180deg)
 .tabchecked
     color:  #4778EC !important;
+
+.nearby-container
+    // 确保容器占据整个可用高度
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    
 .nearby-scroll
-    overflow: hidden;
-    .three-head
+    // 为scroll-view设置明确高度，减去nav-filter的高度
+    height: calc(100vh - var(--window-top) - var(--status-bar-height) - 63rpx - 200rpx - 120rpx);
+    
+.three-head
         margin: 24rpx 0 0 0;
         padding: 26rpx 0 0 0;
         border-radius: 17rpx 17rpx 17rpx 17rpx;
@@ -482,71 +494,72 @@ defineExpose({ loadData, handleFilterConfirm });
                     border-radius: 17rpx 17rpx 17rpx 17rpx;
                     z-index: 1;
 .nearby-list
-    border-top: 2rpx solid #EBEBEB;
     .one-cards{
         display: flex;
         flex-direction: column;
         padding: 0 20rpx 20rpx 20rpx;
         background: #f4f4f4
     }
-    .nav-filter
-        padding: 16rpx 28rpx 0 28rpx
-        .filter-top
-            display: flex
-            justify-content: space-between;
-            .tab-scroll
-                flex: 1;
-                overflow: hidden;
-                margin-right: 20rpx
-                white-space: nowrap;
-                overflow: hidden;
-                text-overflow: clip;
-                -webkit-mask-image: linear-gradient(to right, black 60%, transparent);
-                mask-image: linear-gradient(to right, black 60%, transparent);
-                .jobs-left
-                    display: flex
-                    flex-wrap: nowrap
-                    .job
-                        font-weight: 400;
-                        font-size: 36rpx;
-                        color: #666D7F;
-                        margin-right: 32rpx;
-                        white-space: nowrap
-                    .active
-                        font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
-                        font-weight: 500;
-                        font-size: 36rpx;
-                        color: #000000;
-            .jobs-add
+.nav-filter
+    border-top: 2rpx solid #EBEBEB;
+    padding: 16rpx 28rpx 0 28rpx;
+    margin-top: 125rpx;
+    .filter-top
+        display: flex
+        justify-content: space-between;
+        .tab-scroll
+            flex: 1;
+            overflow: hidden;
+            margin-right: 20rpx
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: clip;
+            -webkit-mask-image: linear-gradient(to right, black 60%, transparent);
+            mask-image: linear-gradient(to right, black 60%, transparent);
+            .jobs-left
                 display: flex
-                align-items: center;
-                justify-content: center;
+                flex-wrap: nowrap
+                .job
+                    font-weight: 400;
+                    font-size: 36rpx;
+                    color: #666D7F;
+                    margin-right: 32rpx;
+                    white-space: nowrap
+                .active
+                    font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
+                    font-weight: 500;
+                    font-size: 36rpx;
+                    color: #000000;
+        .jobs-add
+            display: flex
+            align-items: center;
+            justify-content: center;
+            font-weight: 400;
+            font-size: 32rpx;
+            color: #666D7F;
+            line-height: 38rpx;
+    .filter-bottom
+        display: flex
+        justify-content: space-between
+        padding: 24rpx 0
+        .btm-left
+            display: flex
+            .filterbtm
                 font-weight: 400;
                 font-size: 32rpx;
                 color: #666D7F;
-                line-height: 38rpx;
-        .filter-bottom
-            display: flex
-            justify-content: space-between
-            padding: 24rpx 0
-            .btm-left
-                display: flex
-                .filterbtm
-                    font-weight: 400;
-                    font-size: 32rpx;
-                    color: #666D7F;
-                    margin-right: 40rpx
-                .active
-                    font-weight: 500;
-                    font-size: 32rpx;
-                    color: #256BFA;
-            .btm-right
-                font-weight: 400;
+                margin-right: 40rpx
+            .active
+                font-weight: 500;
                 font-size: 32rpx;
-                color: #6C7282;
-                .right-sx
-                    width: 26rpx;
-                    height: 26rpx;
-                .active
-                    transform: rotate(180deg)
+                color: #256BFA;
+        .btm-right
+            font-weight: 400;
+            font-size: 32rpx;
+            color: #6C7282;
+            .right-sx
+                width: 26rpx;
+                height: 26rpx;
+            .active
+                transform: rotate(180deg)
 </style>
diff --git a/pages/nearby/components/two.vue b/pages/nearby/components/two.vue
index f544bd0..616c11e 100644
--- a/pages/nearby/components/two.vue
+++ b/pages/nearby/components/two.vue
@@ -1,6 +1,10 @@
 <template>
-    <scroll-view :scroll-y="true" class="nearby-scroll" @scrolltolower="scrollBottom">
-        <view class="two-head">
+    <view class="nearby-container">
+        <!-- 区县选择区域 - 可折叠 -->
+        <view 
+            class="two-head"
+            :class="{ 'area-collapsed': isAreaCollapsed }"
+        >
             <view
                 class="head-item"
                 :class="{ active: item.value === fromValue.area }"
@@ -18,66 +22,72 @@
                 不限区域
             </view>
         </view>
-        <view class="nearby-list">
-            <view class="nav-filter" @touchmove.stop.prevent>
-                <view class="filter-top">
-                    <scroll-view :scroll-x="true" :show-scrollbar="false" class="tab-scroll">
-                        <view class="jobs-left">
-                            <view
-                                class="job button-click"
-                                :class="{ active: state.tabIndex === 'all' }"
-                                @click="choosePosition('all')"
-                            >
-                                全部
-                            </view>
-                            <view
-                                class="job button-click"
-                                :class="{ active: state.tabIndex === index }"
-                                v-for="(item, index) in userInfo.jobTitle"
-                                :key="index"
-                                @click="choosePosition(index)"
-                            >
-                                {{ item }}
-                            </view>
-                        </view>
-                    </scroll-view>
-                    <view class="jobs-add button-click" @click="navTo('/packageA/pages/addPosition/addPosition')">
-                        <uni-icons class="iconsearch" color="#666D7F" type="plusempty" size="18"></uni-icons>
-                        <text>添加</text>
-                    </view>
-                </view>
-                <view class="filter-bottom">
-                    <view class="btm-left">
+        <!-- 筛选条件 - 固定显示 -->
+        <view class="nav-filter" @touchmove.stop.prevent>
+            <view class="filter-top">
+                <scroll-view :scroll-x="true" :show-scrollbar="false" class="tab-scroll">
+                    <view class="jobs-left">
                         <view
-                            class="button-click filterbtm"
-                            :class="{ active: pageState.search.order === item.value }"
-                            v-for="item in rangeOptions"
-                            @click="handelHostestSearch(item)"
-                            :key="item.value"
+                            class="job button-click"
+                            :class="{ active: state.tabIndex === 'all' }"
+                            @click="choosePosition('all')"
                         >
-                            {{ item.text }}
+                            全部
+                        </view>
+                        <view
+                            class="job button-click"
+                            :class="{ active: state.tabIndex === index }"
+                            v-for="(item, index) in userInfo.jobTitle"
+                            :key="index"
+                            @click="choosePosition(index)"
+                        >
+                            {{ item }}
                         </view>
                     </view>
-                    <view class="btm-right button-click" @click="openFilter">
-                        筛选
-                        <image class="right-sx" :class="{ active: showFilter }" src="@/static/icon/shaixun.png"></image>
-                    </view>
+                </scroll-view>
+                <view class="jobs-add button-click" @click="navTo('/packageA/pages/addPosition/addPosition')">
+                    <uni-icons class="iconsearch" color="#666D7F" type="plusempty" size="18"></uni-icons>
+                    <text>添加</text>
                 </view>
             </view>
-            <view class="one-cards">
-                <renderJobs
-                    v-if="list.length"
-                    :list="list"
-                    :longitude="longitudeVal"
-                    :latitude="latitudeVal"
-                ></renderJobs>
-                <empty v-else pdTop="60"></empty>
-                <loadmore ref="loadmoreRef"></loadmore>
+            <view class="filter-bottom">
+                <view class="btm-left">
+                    <view
+                        class="button-click filterbtm"
+                        :class="{ active: pageState.search.order === item.value }"
+                        v-for="item in rangeOptions"
+                        @click="handelHostestSearch(item)"
+                        :key="item.value"
+                    >
+                        {{ item.text }}
+                    </view>
+                </view>
+                <view class="btm-right button-click" @click="openFilter">
+                    筛选
+                    <image class="right-sx" :class="{ active: showFilter }" src="@/static/icon/shaixun.png"></image>
+                </view>
             </view>
         </view>
+        <!-- 列表滚动区域 -->
+        <scroll-view 
+            :scroll-y="true" 
+            class="nearby-scroll" 
+            @scrolltolower="scrollBottom" 
+            lower-threshold="50"
+            ref="scrollViewRef"
+            @scroll="handleScroll"
+        >
+            <view class="nearby-list">
+                <view class="one-cards">
+                    <renderJobs v-if="list.length" :list="list"></renderJobs>
+                    <empty v-else pdTop="60"></empty>
+                    <loadmore ref="loadmoreRef"></loadmore>
+                </view>
+            </view>
+        </scroll-view>
         <!-- 筛选 -->
         <select-filter ref="selectFilterModel"></select-filter>
-    </scroll-view>
+    </view>
 </template>
 
 <script setup>
@@ -103,6 +113,8 @@ const state = reactive({
 const isLoaded = ref(false);
 const showFilter = ref(false);
 const selectFilterModel = ref();
+const scrollViewRef = ref(null);
+const isAreaCollapsed = ref(false);
 const fromValue = reactive({
     area: 0,
 });
@@ -192,8 +204,20 @@ function scrollBottom() {
 // }
 function changeArea(area, item) {
     fromValue.area = area;
+    // 切换区县时列表置顶
+    if (scrollViewRef.value) {
+        scrollViewRef.value.scrollTop = 0;
+    }
     getJobList('refresh');
 }
+
+// 处理滚动事件，实现区县选择区域折叠
+function handleScroll(e) {
+    const scrollTop = e.detail.scrollTop;
+    // 当滚动超过100rpx时，折叠区县选择区域
+    isAreaCollapsed.value = scrollTop > 100;
+    console.log('scrollTop:', scrollTop, 'collapsed:', isAreaCollapsed.value);
+}
 function getJobList(type = 'add') {
     if (type === 'add' && pageState.page < pageState.maxPage) {
         pageState.page += 1;
@@ -254,13 +278,32 @@ defineExpose({ loadData, handleFilterConfirm });
 <style lang="stylus" scoped>
 .tabchecked
     color:  #4778EC !important
-.nearby-scroll
+
+.nearby-container
+    // 确保容器占据整个可用视口高度，包括安全区域
+    height: calc(100vh - var(--window-top));
+    display: flex;
+    flex-direction: column;
     overflow: hidden;
-    .two-head
+    
+.nearby-scroll
+    // 使用flex布局让scroll-view自适应高度，占据剩余空间
+    flex: 1;
+    overflow: hidden;
+    
+.two-head
         margin: 22rpx;
         display: flex;
         flex-wrap: wrap
         // grid-template-columns: repeat(4, 1fr);
+        transition: all 0.3s ease;
+        
+        &.area-collapsed {
+            height: 0;
+            margin: 0;
+            padding: 0;
+            overflow: hidden;
+        }
         // grid-column-gap: 10rpx;
         // grid-row-gap: 24rpx;
 
@@ -291,64 +334,67 @@ defineExpose({ loadData, handleFilterConfirm });
         padding: 0 20rpx 20rpx 20rpx;
         background: #f4f4f4
     }
-    .nav-filter
-        padding: 16rpx 28rpx 0 28rpx
-        .filter-top
-            display: flex
-            justify-content: space-between;
-            .tab-scroll
-                flex: 1;
-                overflow: hidden;
-                margin-right: 20rpx
-                white-space: nowrap;
-                overflow: hidden;
-                text-overflow: clip;
-                -webkit-mask-image: linear-gradient(to right, black 60%, transparent);
-                mask-image: linear-gradient(to right, black 60%, transparent);
-                .jobs-left
-                    display: flex
-                    flex-wrap: nowrap
-                    .job
-                        font-weight: 400;
-                        font-size: 36rpx;
-                        color: #666D7F;
-                        margin-right: 32rpx;
-                        white-space: nowrap
-                    .active
-                        font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
-                        font-weight: 500;
-                        font-size: 36rpx;
-                        color: #000000;
-            .jobs-add
+
+// 筛选条件样式 - 顶级选择器
+.nav-filter
+    padding: 16rpx 28rpx 0 28rpx
+    background: #ffffff
+    .filter-top
+        display: flex
+        justify-content: space-between;
+        .tab-scroll
+            flex: 1;
+            overflow: hidden;
+            margin-right: 20rpx
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: clip;
+            -webkit-mask-image: linear-gradient(to right, black 60%, transparent);
+            mask-image: linear-gradient(to right, black 60%, transparent);
+            .jobs-left
                 display: flex
-                align-items: center;
-                justify-content: center;
+                flex-wrap: nowrap
+                .job
+                    font-weight: 400;
+                    font-size: 36rpx;
+                    color: #666D7F;
+                    margin-right: 32rpx;
+                    white-space: nowrap
+                .active
+                    font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
+                    font-weight: 500;
+                    font-size: 36rpx;
+                    color: #000000;
+        .jobs-add
+            display: flex
+            align-items: center;
+            justify-content: center;
+            font-weight: 400;
+            font-size: 32rpx;
+            color: #666D7F;
+            line-height: 38rpx;
+    .filter-bottom
+        display: flex
+        justify-content: space-between
+        padding: 24rpx 0
+        .btm-left
+            display: flex
+            .filterbtm
                 font-weight: 400;
                 font-size: 32rpx;
                 color: #666D7F;
-                line-height: 38rpx;
-        .filter-bottom
-            display: flex
-            justify-content: space-between
-            padding: 24rpx 0
-            .btm-left
-                display: flex
-                .filterbtm
-                    font-weight: 400;
-                    font-size: 32rpx;
-                    color: #666D7F;
-                    margin-right: 40rpx
-                .active
-                    font-weight: 500;
-                    font-size: 32rpx;
-                    color: #256BFA;
-            .btm-right
-                font-weight: 400;
+                margin-right: 40rpx
+            .active
+                font-weight: 500;
                 font-size: 32rpx;
-                color: #6C7282;
-                .right-sx
-                    width: 26rpx;
-                    height: 26rpx;
-                .active
-                    transform: rotate(180deg)
+                color: #256BFA;
+        .btm-right
+            font-weight: 400;
+            font-size: 32rpx;
+            color: #6C7282;
+            .right-sx
+                width: 26rpx;
+                height: 26rpx;
+            .active
+                transform: rotate(180deg)
 </style>
diff --git a/pages/nearby/nearby.vue b/pages/nearby/nearby.vue
index 6216396..f5f1509 100644
--- a/pages/nearby/nearby.vue
+++ b/pages/nearby/nearby.vue
@@ -132,4 +132,5 @@ image {
             .swiper-item
                 display: flex;
                 flex-direction: column;
+                height: 100%;
 </style>

From 75a8edad10b6f06c606ca03e27e85887965975d2 Mon Sep 17 00:00:00 2001
From: hanguangpu01 <hanguangpu01@inspur.com>
Date: Fri, 5 Dec 2025 16:20:56 +0800
Subject: [PATCH 12/17] =?UTF-8?q?feat(video):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E8=A7=86=E9=A2=91=E8=AF=A6=E6=83=85=E9=A1=B5=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加 v-if 条件渲染确保视频封面存在时才加载视频组件
- 设置 preload="metadata" 提高页面初始加载性能
- 保留原有事件监听器和样式配置
---
 packageB/train/video/videoDetail.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packageB/train/video/videoDetail.vue b/packageB/train/video/videoDetail.vue
index 2b42d83..fea32f3 100644
--- a/packageB/train/video/videoDetail.vue
+++ b/packageB/train/video/videoDetail.vue
@@ -9,7 +9,9 @@
 			<view class="video-detail-container">
 			    <!-- 视频播放组件 -->
 			    <view class="video-wrapper">
-					<video id="myVideo" :src="videoInfo.currentUrl" :poster="trainVideoImgUrl+ videoInfo.cover" @seeked="onSeeked"
+					<video v-if="videoInfo && videoInfo.cover" id="myVideo" :src="videoInfo.currentUrl" :poster="trainVideoImgUrl+ videoInfo.cover" @seeked="onSeeked"
+					
+                preload="metadata"
 						 enable-danmu controls style="width: 100%;" @pause="onPause" @timeupdate="onTimeupdate" @ended="onEnded"></video>
 			    </view>
 			</view>

From 85a60664941edbd3d0a67b5340a64eede93e8ac3 Mon Sep 17 00:00:00 2001
From: francis_fh <13935151924@163.com>
Date: Fri, 5 Dec 2025 16:29:47 +0800
Subject: [PATCH 13/17] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=A0=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/globalFunction.js | 96 ++++++++++++++++++++++++++++------------
 utils/loginHelper.js     | 29 ++++++++++--
 utils/request.js         | 36 +++++++++++----
 3 files changed, 122 insertions(+), 39 deletions(-)

diff --git a/common/globalFunction.js b/common/globalFunction.js
index 8402cc1..f97113a 100644
--- a/common/globalFunction.js
+++ b/common/globalFunction.js
@@ -61,34 +61,74 @@ export const urls ='http://222.80.110.161:11111/images/train/'
  * @param {object} options.query - 携带参数
  * @param {function} options.onBack - 页面返回时的回调（目标页调用 uni.navigateBack 时传递数据）
  */
-export const navTo = function(url, {
-    needLogin = false,
-    query = {},
-    onBack = null
-} = {}) {
-    const userStore = useUserStore();
-
-    if (needLogin && !userStore.hasLogin) {
-        uni.navigateTo({
-            url: '/pages/complete-info/complete-info'
-        });
-        return;
-    }
-
-    const queryStr = Object.entries(query)
-        .map(([key, val]) => `${key}=${encodeURIComponent(val)}`)
-        .join('&');
-    const finalUrl = queryStr ? `${url}?${queryStr}` : url;
-
-    if (onBack) {
-        const pages = getCurrentPages();
-        const currentPage = pages[pages.length - 1];
-        currentPage.__onBackCallback__ = onBack;
-    }
-
-    uni.navigateTo({
-        url: finalUrl
-    });
+export const navTo = function(url, {
+    needLogin = false,
+    query = {},
+    onBack = null
+} = {}) {
+    const userStore = useUserStore();
+
+    if (needLogin && !userStore.hasLogin) {
+        const pages = getCurrentPages();
+        if (pages.length >= 10) {
+            uni.redirectTo({
+                url: '/pages/complete-info/complete-info',
+                fail: (err) => {
+                    console.error('页面跳转失败:', err);
+                }
+            });
+        } else {
+            uni.navigateTo({
+                url: '/pages/complete-info/complete-info',
+                fail: (err) => {
+                    console.error('页面跳转失败:', err);
+                    uni.redirectTo({
+                        url: '/pages/complete-info/complete-info',
+                        fail: (err2) => {
+                            console.error('redirectTo也失败:', err2);
+                        }
+                    });
+                }
+            });
+        }
+        return;
+    }
+
+    const queryStr = Object.entries(query)
+        .map(([key, val]) => `${key}=${encodeURIComponent(val)}`)
+        .join('&');
+    const finalUrl = queryStr ? `${url}?${queryStr}` : url;
+
+    if (onBack) {
+        const pages = getCurrentPages();
+        const currentPage = pages[pages.length - 1];
+        currentPage.__onBackCallback__ = onBack;
+    }
+
+    const pages = getCurrentPages();
+    if (pages.length >= 10) {
+        // 页面栈已满，使用redirectTo替代
+        uni.redirectTo({
+            url: finalUrl,
+            fail: (err) => {
+                console.error('页面跳转失败:', err);
+            }
+        });
+    } else {
+        uni.navigateTo({
+            url: finalUrl,
+            fail: (err) => {
+                console.error('页面跳转失败:', err);
+                // 失败后尝试redirectTo
+                uni.redirectTo({
+                    url: finalUrl,
+                    fail: (err2) => {
+                        console.error('redirectTo也失败:', err2);
+                    }
+                });
+            }
+        });
+    }
 };
 
 export const navBack = function({
diff --git a/utils/loginHelper.js b/utils/loginHelper.js
index 77ce8b3..919567d 100644
--- a/utils/loginHelper.js
+++ b/utils/loginHelper.js
@@ -72,9 +72,32 @@ export function navigateToLoginPage(options = {}) {
             ? `?${new URLSearchParams(params).toString()}`
             : '';
             
-        uni.navigateTo({
-            url: `${loginPage}${queryString}`
-        });
+        const finalUrl = `${loginPage}${queryString}`;
+        const pages = getCurrentPages();
+        
+        if (pages.length >= 10) {
+            // 页面栈已满，使用redirectTo替代
+            uni.redirectTo({
+                url: finalUrl,
+                fail: (err) => {
+                    console.error('页面跳转失败:', err);
+                }
+            });
+        } else {
+            uni.navigateTo({
+                url: finalUrl,
+                fail: (err) => {
+                    console.error('页面跳转失败:', err);
+                    // 失败后尝试redirectTo
+                    uni.redirectTo({
+                        url: finalUrl,
+                        fail: (err2) => {
+                            console.error('redirectTo也失败:', err2);
+                        }
+                    });
+                }
+            });
+        }
     }
 }
 
diff --git a/utils/request.js b/utils/request.js
index ab07299..573cce0 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -215,14 +215,34 @@ export function myRequest(url, data = {}, method = 'GET', port = 9100, headers =
 							resolve(resData.data)
 							return
 						}
-						// 处理业务错误
-						if (resData.data?.code === 401 || resData.data?.code === 402) {
-							uni.navigateTo({
-								url:'/packageB/login?flag=nw'
-							})
-							// navTo('/packageB/login?flag=nw');
-							useUserStore().logOut()
-							
+						// 处理业务错误
+						if (resData.data?.code === 401 || resData.data?.code === 402) {
+							const pages = getCurrentPages();
+							if (pages.length >= 10) {
+								// 页面栈已满，使用redirectTo替代
+								uni.redirectTo({
+									url:'/packageB/login?flag=nw',
+									fail: (err) => {
+										console.error('页面跳转失败:', err);
+									}
+								});
+							} else {
+								uni.navigateTo({
+									url:'/packageB/login?flag=nw',
+									fail: (err) => {
+										console.error('页面跳转失败:', err);
+										// 失败后尝试redirectTo
+										uni.redirectTo({
+											url:'/packageB/login?flag=nw',
+											fail: (err2) => {
+												console.error('redirectTo也失败:', err2);
+											}
+										});
+									}
+								});
+							}
+							useUserStore().logOut()
+							    
 						}
 						// 显示具体的错误信息
 						const errorMsg = msg || '请求出现异常，请联系工作人员'

From b2016378fbfdae9fa9ec8d0373a6a187a8998840 Mon Sep 17 00:00:00 2001
From: francis_fh <13935151924@163.com>
Date: Fri, 5 Dec 2025 17:01:50 +0800
Subject: [PATCH 14/17] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E5=AF=BC?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                           |  18 +-
 pages/index/components/index-one.vue |  12 +-
 pages/service/guidance.vue           | 456 +++++++++++++++++++++++++++
 3 files changed, 474 insertions(+), 12 deletions(-)
 create mode 100644 pages/service/guidance.vue

diff --git a/pages.json b/pages.json
index c2827e1..e9d6d62 100644
--- a/pages.json
+++ b/pages.json
@@ -138,12 +138,18 @@
           "navigationBarTitleText": "简历示例"
         }
       },
-      {
-        "path": "pages/service/salary-info",
-        "style": {
-          "navigationBarTitleText": "薪酬信息"
-        }
-      }
+      {
+        "path": "pages/service/salary-info",
+        "style": {
+          "navigationBarTitleText": "薪酬信息"
+        }
+      },
+      {
+        "path": "pages/service/guidance",
+        "style": {
+          "navigationBarTitleText": "服务指导"
+        }
+      }
     ],
     "subpackages": [
       {
diff --git a/pages/index/components/index-one.vue b/pages/index/components/index-one.vue
index 05559a7..955c313 100644
--- a/pages/index/components/index-one.vue
+++ b/pages/index/components/index-one.vue
@@ -95,12 +95,12 @@
                     </view>
                     <view class="service-title">服务指导</view>
                 </view>
-                <view class="service-item press-button" @click="handleServiceClick('public-recruitment')">
-                    <view class="service-icon service-icon-2">
-                        <IconfontIcon name="zhengfulou" :size="48" color="#FFFFFF" />
-                    </view>
-                    <view class="service-title">事业单位招录</view>
-                </view>
+                // <view class="service-item press-button" @click="handleServiceClick('public-recruitment')">
+                //     <view class="service-icon service-icon-2">
+                //         <IconfontIcon name="zhengfulou" :size="48" color="#FFFFFF" />
+                //     </view>
+                //     <view class="service-title">事业单位招录</view>
+                // </view>
                 <view class="service-item press-button" @click="handleServiceClick('resume-creation')">
                     <view class="service-icon service-icon-3">
                         <IconfontIcon name="jianli" :size="48" color="#FFFFFF" />
diff --git a/pages/service/guidance.vue b/pages/service/guidance.vue
new file mode 100644
index 0000000..0c2cb7e
--- /dev/null
+++ b/pages/service/guidance.vue
@@ -0,0 +1,456 @@
+<template>
+    <view class="service-guidance-container">
+        <view class="guidance-header">
+            <text class="header-title">服务指导</text>
+            <text class="header-subtitle">如何使用喀什智慧就业平台</text>
+        </view>
+        
+        <scroll-view class="guidance-content" scroll-y="true">
+            <!-- 欢迎介绍 -->
+            <view class="guidance-section">
+                <view class="section-title">
+                    <uni-icons type="info-filled" size="24" color="#256BFA"></uni-icons>
+                    <text class="title-text">欢迎使用</text>
+                </view>
+                <view class="section-content">
+                    <text class="content-text">喀什智慧就业平台是为您提供全方位就业服务的小程序，包括职位搜索、简历创建、职业规划等功能。</text>
+                </view>
+            </view>
+            
+            <!-- 使用步骤 -->
+            <view class="guidance-section">
+                <view class="section-title">
+                    <uni-icons type="steps-filled" size="24" color="#256BFA"></uni-icons>
+                    <text class="title-text">使用步骤</text>
+                </view>
+                <view class="section-content">
+                    <view class="step-item">
+                        <view class="step-number">1</view>
+                        <view class="step-content">
+                            <text class="step-title">登录/注册</text>
+                            <text class="step-desc">首次使用请先完成登录或注册，完善个人信息以便获取更好的服务。</text>
+                        </view>
+                    </view>
+                    <view class="step-item">
+                        <view class="step-number">2</view>
+                        <view class="step-content">
+                            <text class="step-title">浏览首页</text>
+                            <text class="step-desc">首页展示了推荐职位、附近工作和各种服务功能，您可以根据需求选择。</text>
+                        </view>
+                    </view>
+                    <view class="step-item">
+                        <view class="step-number">3</view>
+                        <view class="step-content">
+                            <text class="step-title">搜索职位</text>
+                            <text class="step-desc">使用顶部搜索框输入职位名称、关键词等，快速找到您感兴趣的职位。</text>
+                        </view>
+                    </view>
+                    <view class="step-item">
+                        <view class="step-number">4</view>
+                        <view class="step-content">
+                            <text class="step-title">查看职位详情</text>
+                            <text class="step-desc">点击职位卡片查看详细信息，包括薪资待遇、工作地点、任职要求等。</text>
+                        </view>
+                    </view>
+                    <view class="step-item">
+                        <view class="step-number">5</view>
+                        <view class="step-content">
+                            <text class="step-title">投递简历</text>
+                            <text class="step-desc">如果您对某个职位感兴趣，可以直接投递简历，等待企业联系。</text>
+                        </view>
+                    </view>
+                    <view class="step-item">
+                        <view class="step-number">6</view>
+                        <view class="step-content">
+                            <text class="step-title">使用服务功能</text>
+                            <text class="step-desc">首页九宫格提供了多种服务，包括简历指导、劳动政策指引、技能培训等，您可以根据需要使用。</text>
+                        </view>
+                    </view>
+                </view>
+            </view>
+            
+            <!-- 功能介绍 -->
+            <view class="guidance-section">
+                <view class="section-title">
+                    <uni-icons type="grid-filled" size="24" color="#256BFA"></uni-icons>
+                    <text class="title-text">主要功能</text>
+                </view>
+                <view class="section-content">
+                    <view class="feature-grid">
+                        <view class="feature-item">
+                            <view class="feature-icon">
+                                <uni-icons type="search" size="36" color="#256BFA"></uni-icons>
+                            </view>
+                            <text class="feature-title">职位搜索</text>
+                            <text class="feature-desc">智能匹配，精准推荐</text>
+                        </view>
+                        <view class="feature-item">
+                            <view class="feature-icon">
+                                <uni-icons type="person-filled" size="36" color="#256BFA"></uni-icons>
+                            </view>
+                            <text class="feature-title">简历管理</text>
+                            <text class="feature-desc">在线创建，一键投递</text>
+                        </view>
+                        <view class="feature-item">
+                            <view class="feature-icon">
+                                <uni-icons type="map-pin" size="36" color="#256BFA"></uni-icons>
+                            </view>
+                            <text class="feature-title">附近工作</text>
+                            <text class="feature-desc">基于位置，就近推荐</text>
+                        </view>
+                        <view class="feature-item">
+                            <view class="feature-icon">
+                                <uni-icons type="document" size="36" color="#256BFA"></uni-icons>
+                            </view>
+                            <text class="feature-title">简历指导</text>
+                            <text class="feature-desc">专业建议，优化简历</text>
+                        </view>
+                        <view class="feature-item">
+                            <view class="feature-icon">
+                                <uni-icons type="book-filled" size="36" color="#256BFA"></uni-icons>
+                            </view>
+                            <text class="feature-title">政策指引</text>
+                            <text class="feature-desc">最新政策，实时更新</text>
+                        </view>
+                        <view class="feature-item">
+                            <view class="feature-icon">
+                                <uni-icons type="videocam-filled" size="36" color="#256BFA"></uni-icons>
+                            </view>
+                            <text class="feature-title">技能培训</text>
+                            <text class="feature-desc">线上学习，提升技能</text>
+                        </view>
+                    </view>
+                </view>
+            </view>
+            
+            <!-- 常见问题 -->
+            <view class="guidance-section">
+                <view class="section-title">
+                    <uni-icons type="help-filled" size="24" color="#256BFA"></uni-icons>
+                    <text class="title-text">常见问题</text>
+                </view>
+                <view class="section-content">
+                    <view class="faq-item">
+                        <view class="faq-question">
+                            <uni-icons type="right" size="18" color="#256BFA"></uni-icons>
+                            <text>如何修改个人信息？</text>
+                        </view>
+                        <view class="faq-answer">
+                            <text>在"我的"页面点击个人信息，进入编辑页面即可修改基本信息、求职意向等。</text>
+                        </view>
+                    </view>
+                    <view class="faq-item">
+                        <view class="faq-question">
+                            <uni-icons type="right" size="18" color="#256BFA"></uni-icons>
+                            <text>如何查看投递记录？</text>
+                        </view>
+                        <view class="faq-answer">
+                            <text>在"我的"页面点击"投递记录"，即可查看所有已投递的职位和状态。</text>
+                        </view>
+                    </view>
+                    <view class="faq-item">
+                        <view class="faq-question">
+                            <uni-icons type="right" size="18" color="#256BFA"></uni-icons>
+                            <text>如何收藏职位？</text>
+                        </view>
+                        <view class="faq-answer">
+                            <text>在职位详情页面点击右上角的收藏按钮，即可将职位添加到收藏夹。</text>
+                        </view>
+                    </view>
+                    <view class="faq-item">
+                        <view class="faq-question">
+                            <uni-icons type="right" size="18" color="#256BFA"></uni-icons>
+                            <text>如何联系客服？</text>
+                        </view>
+                        <view class="faq-answer">
+                            <text>如果您在使用过程中遇到问题，可以在"我的"页面找到"联系客服"入口，或拨打客服热线。</text>
+                        </view>
+                    </view>
+                </view>
+            </view>
+            
+            <!-- 温馨提示 -->
+            <view class="guidance-section">
+                <view class="section-title">
+                    <uni-icons type="warning-filled" size="24" color="#256BFA"></uni-icons>
+                    <text class="title-text">温馨提示</text>
+                </view>
+                <view class="section-content">
+                    <view class="tips-list">
+                        <view class="tip-item">
+                            <uni-icons type="circle" size="12" color="#256BFA" class="tip-icon"></uni-icons>
+                            <text class="tip-text">请确保填写的个人信息真实有效，这有助于企业更好地了解您。</text>
+                        </view>
+                        <view class="tip-item">
+                            <uni-icons type="circle" size="12" color="#256BFA" class="tip-icon"></uni-icons>
+                            <text class="tip-text">定期更新简历，保持简历内容的时效性。</text>
+                        </view>
+                        <view class="tip-item">
+                            <uni-icons type="circle" size="12" color="#256BFA" class="tip-icon"></uni-icons>
+                            <text class="tip-text">多关注"附近工作"和"推荐职位"，不错过好机会。</text>
+                        </view>
+                        <view class="tip-item">
+                            <uni-icons type="circle" size="12" color="#256BFA" class="tip-icon"></uni-icons>
+                            <text class="tip-text">如有任何疑问，欢迎随时联系我们的客服团队。</text>
+                        </view>
+                    </view>
+                </view>
+            </view>
+            
+            <!-- 结尾鼓励 -->
+            <view class="guidance-section end-section">
+                <view class="encourage-content">
+                    <uni-icons type="thumbsup-filled" size="48" color="#256BFA"></uni-icons>
+                    <text class="encourage-text">祝您早日找到理想的工作！</text>
+                    <text class="encourage-subtext">喀什智慧就业平台与您同行</text>
+                </view>
+            </view>
+        </scroll-view>
+    </view>
+</template>
+
+<script setup>
+import { onLoad } from '@dcloudio/uni-app';
+
+onLoad(() => {
+    // 页面加载时的逻辑
+    console.log('服务指导页面加载');
+});
+</script>
+
+<style lang="stylus" scoped>
+.service-guidance-container {
+    width: 100%;
+    height: 100vh;
+    background-color: #F5F7FA;
+    display: flex;
+    flex-direction: column;
+    position: relative;
+}
+
+.guidance-header {
+    padding: 32rpx 24rpx;
+    background-color: #FFFFFF;
+    box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.05);
+    text-align: center;
+    box-sizing: border-box;
+}
+
+.header-title {
+    display: block;
+    font-size: 36rpx;
+    font-weight: bold;
+    color: #333333;
+    margin-bottom: 8rpx;
+}
+
+.header-subtitle {
+    display: block;
+    font-size: 24rpx;
+    color: #666666;
+}
+
+.guidance-content {
+    flex: 1;
+    padding: 24rpx;
+    overflow-y: scroll;
+    box-sizing: border-box;
+    -webkit-overflow-scrolling: touch;
+}
+
+.guidance-section {
+    background-color: #FFFFFF;
+    border-radius: 16rpx;
+    padding: 32rpx;
+    margin-bottom: 24rpx;
+    box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.05);
+}
+
+.section-title {
+    display: flex;
+    align-items: center;
+    margin-bottom: 24rpx;
+}
+
+.title-text {
+    font-size: 28rpx;
+    font-weight: bold;
+    color: #333333;
+    margin-left: 12rpx;
+}
+
+.section-content {
+    font-size: 24rpx;
+    color: #666666;
+    line-height: 1.6;
+}
+
+/* 步骤样式 */
+.step-item {
+    display: flex;
+    margin-bottom: 32rpx;
+    align-items: flex-start;
+}
+
+.step-number {
+    width: 48rpx;
+    height: 48rpx;
+    border-radius: 50%;
+    background-color: #256BFA;
+    color: #FFFFFF;
+    font-size: 24rpx;
+    font-weight: bold;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-right: 20rpx;
+    flex-shrink: 0;
+}
+
+.step-content {
+    flex: 1;
+}
+
+.step-title {
+    display: block;
+    font-size: 26rpx;
+    font-weight: bold;
+    color: #333333;
+    margin-bottom: 8rpx;
+}
+
+.step-desc {
+    display: block;
+    font-size: 24rpx;
+    color: #666666;
+    line-height: 1.6;
+}
+
+/* 功能网格样式 */
+.feature-grid {
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    gap: 24rpx;
+    margin-top: 16rpx;
+}
+
+.feature-item {
+    text-align: center;
+    padding: 24rpx;
+    background-color: #F8FAFC;
+    border-radius: 12rpx;
+}
+
+.feature-icon {
+    margin-bottom: 16rpx;
+}
+
+.feature-title {
+    display: block;
+    font-size: 24rpx;
+    font-weight: bold;
+    color: #333333;
+    margin-bottom: 8rpx;
+}
+
+.feature-desc {
+    display: block;
+    font-size: 20rpx;
+    color: #999999;
+}
+
+/* 常见问题样式 */
+.faq-item {
+    margin-bottom: 24rpx;
+    padding-bottom: 24rpx;
+    border-bottom: 1rpx solid #F0F0F0;
+}
+
+.faq-item:last-child {
+    border-bottom: none;
+    margin-bottom: 0;
+    padding-bottom: 0;
+}
+
+.faq-question {
+    display: flex;
+    align-items: center;
+    font-size: 26rpx;
+    font-weight: bold;
+    color: #333333;
+    margin-bottom: 12rpx;
+}
+
+.faq-question uni-icons {
+    margin-right: 12rpx;
+}
+
+.faq-answer {
+    font-size: 24rpx;
+    color: #666666;
+    line-height: 1.6;
+    padding-left: 40rpx;
+}
+
+/* 温馨提示样式 */
+.tips-list {
+    margin-top: 16rpx;
+}
+
+.tip-item {
+    display: flex;
+    align-items: flex-start;
+    margin-bottom: 16rpx;
+    font-size: 24rpx;
+    color: #666666;
+    line-height: 1.6;
+}
+
+.tip-icon {
+    margin-right: 12rpx;
+    margin-top: 8rpx;
+    flex-shrink: 0;
+}
+
+.tip-text {
+    flex: 1;
+}
+
+/* 结尾鼓励样式 */
+.end-section {
+    text-align: center;
+    background: linear-gradient(135deg, #256BFA 0%, #6A8FFF 100%);
+    color: #FFFFFF;
+}
+
+.end-section .section-title {
+    color: #FFFFFF;
+    justify-content: center;
+}
+
+.end-section .title-text {
+    color: #FFFFFF;
+}
+
+.encourage-content {
+    text-align: center;
+}
+
+.encourage-content uni-icons {
+    margin-bottom: 16rpx;
+}
+
+.encourage-text {
+    display: block;
+    font-size: 32rpx;
+    font-weight: bold;
+    color: #FFFFFF;
+    margin-bottom: 8rpx;
+}
+
+.encourage-subtext {
+    display: block;
+    font-size: 24rpx;
+    color: rgba(255, 255, 255, 0.9);
+}
+</style>
\ No newline at end of file

From fa7749da9d50d51a9c758a088c0f908fc21607fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=B3?= <jia@jiadeMacBook-Air.local>
Date: Fri, 5 Dec 2025 17:02:44 +0800
Subject: [PATCH 15/17] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=20appUserInfo?=
 =?UTF-8?q?=20=E5=AE=8C=E6=95=B4=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apiRc/user/user.js | 2 +-
 config.js          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apiRc/user/user.js b/apiRc/user/user.js
index 0599c98..a40ac31 100644
--- a/apiRc/user/user.js
+++ b/apiRc/user/user.js
@@ -8,7 +8,7 @@ import request from '@/utilsRc/request'
 // 获取用户信息（职业规划推荐用）
 export function appUserInfo() {
   return request({
-    fullUrl: 'http://ks.zhaopinzao8dian.com/api/ks/app/user/appUserInfo',
+    fullUrl: 'http://222.80.110.161:11111/api/ks/app/user/appUserInfo',
     method: 'get'
   })
 }
diff --git a/config.js b/config.js
index 761f865..a819393 100644
--- a/config.js
+++ b/config.js
@@ -1,6 +1,6 @@
 export default {
     // baseUrl: 'http://39.98.44.136:8080', // 测试
-    baseUrl: 'http://ks.zhaopinzao8dian.com/api/ks', // 测试
+    baseUrl: 'http://222.80.110.161:11111/api/ks', // 测试
     // baseUrl: 'http://ks.zhaopinzao8dian.com/api/ks', // 测试
 
 	LCBaseUrl:'http://10.110.145.145:9100',//招聘、培训、帮扶

From c4f7d6d998acc736132054ef3295a1f68c43d437 Mon Sep 17 00:00:00 2001
From: francis_fh <13935151924@163.com>
Date: Fri, 5 Dec 2025 17:06:22 +0800
Subject: [PATCH 16/17] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E5=AF=BC?=
 =?UTF-8?q?=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

---
 pages/index/components/index-one.vue | 7 +------
 pages/service/guidance.vue           | 4 ++--
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/pages/index/components/index-one.vue b/pages/index/components/index-one.vue
index 955c313..3be61c3 100644
--- a/pages/index/components/index-one.vue
+++ b/pages/index/components/index-one.vue
@@ -95,12 +95,7 @@
                     </view>
                     <view class="service-title">服务指导</view>
                 </view>
-                // <view class="service-item press-button" @click="handleServiceClick('public-recruitment')">
-                //     <view class="service-icon service-icon-2">
-                //         <IconfontIcon name="zhengfulou" :size="48" color="#FFFFFF" />
-                //     </view>
-                //     <view class="service-title">事业单位招录</view>
-                // </view>
+                
                 <view class="service-item press-button" @click="handleServiceClick('resume-creation')">
                     <view class="service-icon service-icon-3">
                         <IconfontIcon name="jianli" :size="48" color="#FFFFFF" />
diff --git a/pages/service/guidance.vue b/pages/service/guidance.vue
index 0c2cb7e..a9ba2f3 100644
--- a/pages/service/guidance.vue
+++ b/pages/service/guidance.vue
@@ -157,7 +157,7 @@
                             <text>在职位详情页面点击右上角的收藏按钮，即可将职位添加到收藏夹。</text>
                         </view>
                     </view>
-                    <view class="faq-item">
+                    <!-- <view class="faq-item">
                         <view class="faq-question">
                             <uni-icons type="right" size="18" color="#256BFA"></uni-icons>
                             <text>如何联系客服？</text>
@@ -165,7 +165,7 @@
                         <view class="faq-answer">
                             <text>如果您在使用过程中遇到问题，可以在"我的"页面找到"联系客服"入口，或拨打客服热线。</text>
                         </view>
-                    </view>
+                    </view> -->
                 </view>
             </view>
             

From bc48d7fff082dec23f1f0ecb50f018faef236425 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=B3?= <jia@jiadeMacBook-Air.local>
Date: Fri, 5 Dec 2025 17:59:37 +0800
Subject: [PATCH 17/17] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/service/career-planning.vue | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pages/service/career-planning.vue b/pages/service/career-planning.vue
index 264b96f..f9bcdb3 100644
--- a/pages/service/career-planning.vue
+++ b/pages/service/career-planning.vue
@@ -64,7 +64,7 @@
 
 <script setup>
 import { ref, inject, nextTick, onMounted } from 'vue';
-import { onLoad } from '@dcloudio/uni-app';
+import { onLoad, onShow } from '@dcloudio/uni-app';
 import { appUserInfo } from '@/apiRc/user/user.js';
 import RemindPopup from './components/RemindPopup.vue';
 import PageHeader from './components/PageHeader.vue';
@@ -300,7 +300,7 @@ async function handleConfirm() {
     remindPopup.value?.close();
     
     // 跳转到完善信息页面
-    navTo('/pages/complete-info/complete-info');
+    navTo('/packageA/pages/personalInfo/personalInfo');
 }
 
 // 切换tab
@@ -483,6 +483,14 @@ onLoad(() => {
     getRemindInfo();
 });
 
+onShow(() => {
+    // 返回本页后，如果之前因为信息缺失未展示内容，则重新检查
+    if (!showContent.value) {
+        hasCheckedRemindInfo = false;
+        getRemindInfo();
+    }
+});
+
 onMounted(() => {
     if (remindList.value.length > 0 && !showContent.value) {
         setTimeout(() => {