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/login.js b/apiRc/login.js
index c085b13..eb70902 100644
--- a/apiRc/login.js
+++ b/apiRc/login.js
@@ -1,7 +1,7 @@
 /*
  * @Date: 2025-10-31 11:06:15
  * @LastEditors: shirlwang
- * @LastEditTime: 2025-11-03 15:51:28
+ * @LastEditTime: 2025-12-16 16:29:33
  */
 import request from '@/utilsRc/request'
 
@@ -13,6 +13,14 @@ export function login(data) {
     params: data,
   })
 }
+// 登录方法
+export function loginByUserId(data) {
+  return request({
+    method: 'get',
+    url: '/ksSso/getTjmhTokenById?userId='+data,
+    // params: data,
+  })
+}
 export function smsLogin(data) {
   return request({
     method: 'post',
diff --git a/apiRc/user/user.js b/apiRc/user/user.js
index 7e43b26..8721ef1 100644
--- a/apiRc/user/user.js
+++ b/apiRc/user/user.js
@@ -1,15 +1,14 @@
 /*
  * @Date: 2025-01-XX
- * @LastEditors: 
- * @LastEditTime: 
+ * @LastEditors: shirlwang
+ * @LastEditTime: 2025-12-16 16:35:06
  */
 import request from '@/utilsRc/request'
 
 // 获取用户信息（职业规划推荐用）
 export function appUserInfo() {
   return request({
-    url: '/app/user/appUserInfo',
-    method: 'get',
-    baseUrlType: 'user' // 使用用户接口专用baseUrl
+    fullUrl: 'https://www.xjksly.cn/api/ks/app/user/appUserInfo',
+    method: 'get'
   })
 }
diff --git a/common/globalFunction.js b/common/globalFunction.js
index 8402cc1..8a183eb 100644
--- a/common/globalFunction.js
+++ b/common/globalFunction.js
@@ -51,7 +51,7 @@ const prePage = () => {
 }
 
 // export const urls ='http://10.110.145.145/images/train/'
-export const urls ='http://222.80.110.161:11111/images/train/'
+export const urls ='https://www.xjksly.cn/images/train/'
 
 /**
  * 页面跳转封装，支持 query 参数传递和返回回调
@@ -69,9 +69,28 @@ export const navTo = function(url, {
     const userStore = useUserStore();
 
     if (needLogin && !userStore.hasLogin) {
-        uni.navigateTo({
-            url: '/pages/complete-info/complete-info'
-        });
+        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;
     }
 
@@ -86,9 +105,30 @@ export const navTo = function(url, {
         currentPage.__onBackCallback__ = onBack;
     }
 
-    uni.navigateTo({
-        url: finalUrl
-    });
+    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/components/CustomTabBar/CustomTabBar.vue b/components/CustomTabBar/CustomTabBar.vue
index 762dbab..105766b 100644
--- a/components/CustomTabBar/CustomTabBar.vue
+++ b/components/CustomTabBar/CustomTabBar.vue
@@ -114,15 +114,15 @@ const generateTabbarList = () => {
         // 求职者用户（包括未登录状态）：显示招聘会
         // H5端隐藏招聘会
         // #ifndef H5
-        baseItems.splice(1, 0, {
-            id: 1,
-            text: '招聘会',
-            path: '/pages/careerfair/careerfair',
-            iconPath: '/static/tabbar/post.png',
-            selectedIconPath: '/static/tabbar/posted.png',
-            centerItem: false,
-            badge: readMsg.badges[1]?.count || 0,
-        });
+        // baseItems.splice(1, 0, {
+        //     id: 1,
+        //     text: '招聘会',
+        //     path: '/pages/careerfair/careerfair',
+        //     iconPath: '/static/tabbar/post.png',
+        //     selectedIconPath: '/static/tabbar/posted.png',
+        //     centerItem: false,
+        //     badge: readMsg.badges[1]?.count || 0,
+        // });
         // #endif
     }
 
diff --git a/components/wxAuthLogin/WxAuthLogin.vue b/components/wxAuthLogin/WxAuthLogin.vue
index 668956a..8c0ba6b 100644
--- a/components/wxAuthLogin/WxAuthLogin.vue
+++ b/components/wxAuthLogin/WxAuthLogin.vue
@@ -139,13 +139,15 @@ const validateRole = () => {
 
 const getPhoneNumber = (e) => {
     console.log('获取手机号：', e);
-    
+    console.log('userType.value', userType.value)
     // 验证角色是否已选择
-    if (!validateRole()) {
-        return;
-    }
+    
     
     if (e.detail.errMsg === 'getPhoneNumber:ok') {
+        if (userType.value === null) {
+            $api.msg('请先选择您的角色');
+            return true;
+        }
         uni.login({
 			provider: 'weixin',
 			success: (loginRes) => {
diff --git a/config.js b/config.js
index 4bdfd0c..972541c 100644
--- a/config.js
+++ b/config.js
@@ -1,16 +1,23 @@
+/*
+ * @Descripttion: 
+ * @Author: lip
+ * @Date: 2025-12-04 13:40:08
+ * @LastEditors: lip
+ */
 export default {
     // baseUrl: 'http://39.98.44.136:8080', // 测试
-    baseUrl: 'http://222.80.110.161:11111/api/ks', // 正式环境
+    baseUrl: 'https://www.xjksly.cn/api/ks', // 测试
+    // baseUrl: 'https://www.xjksly.cn/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://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',
+	LCBaseUrl:'https://www.xjksly.cn/prod-api',//内网端口
+	LCBaseUrlInner:'https://www.xjksly.cn/prod-psout-api',//招聘、培训、帮扶
+	imgBaseUrl:'https://www.xjksly.cn/images', //图片基础url
+	trainVideoImgUrl:'https://www.xjksly.cn/prod-api/file/file/minio',
     // sseAI+
     // StreamBaseURl: 'http://39.98.44.136:8000',
     StreamBaseURl: 'https://qd.zhaopinzao8dian.com/ai',
@@ -25,11 +32,11 @@ export default {
     // 只使用本地缓寸的数据
     OnlyUseCachedDB: true,
     // 使用模拟定位
-    UsingSimulatedPositioning: true,
+    UsingSimulatedPositioning: false,
     // 应用信息
     appInfo: {
         // 应用名称
-        name: "青岛市就业服务",
+        name: "喀什市就业服务",
         // 地区名
         areaName: '喀什',
         // AI名称
diff --git a/hook/useColumnCount.js b/hook/useColumnCount.js
index d7a228b..d96017e 100644
--- a/hook/useColumnCount.js
+++ b/hook/useColumnCount.js
@@ -19,37 +19,47 @@ export function useColumnCount(onChange = () => {}) {
     //         columnCount.value = count < 2 ? 2 : count
     //     }
     // }
-    const calcColumn = () => {
-        // 使用新的API替代已废弃的getSystemInfoSync
-        let width
-        // #ifdef MP-WEIXIN
-        const mpSystemInfo = uni.getWindowInfo()
-        width = mpSystemInfo.windowWidth
-        // #endif
-        // #ifndef MP-WEIXIN
-        const otherSystemInfo = uni.getSystemInfoSync()
-        width = otherSystemInfo.windowWidth
-        // #endif
-
-        let count = 2
-        if (width >= 1000) {
-            count = 5
-        } else if (width >= 750) {
-            count = 4
-        } else if (width >= 500) {
-            count = 3
-        } else {
-            count = 2
-        }
-
-        if (count !== columnCount.value) {
-            columnCount.value = count
-        }
-
-        // 计算间距：count=2 => 1，count=5 => 2，中间线性插值
-        const spacing = 2 - (count - 2) * (1 / 3)
-        // console.log('列数:', count, '间距:', spacing.toFixed(2))
-        columnSpace.value = spacing
+    const calcColumn = () => {
+        // 使用新的API替代已废弃的getSystemInfoSync
+        let width
+        // #ifdef MP-WEIXIN
+        const mpSystemInfo = uni.getWindowInfo()
+        width = mpSystemInfo.windowWidth
+        // #endif
+        // #ifndef MP-WEIXIN
+        const otherSystemInfo = uni.getSystemInfoSync()
+        width = otherSystemInfo.windowWidth
+        // #endif
+
+        let count = 2
+        if (width >= 1000) {
+            // #ifdef H5
+            count = 3 // H5端最多显示3列
+            // #endif
+            // #ifndef H5
+            count = 5
+            // #endif
+        } else if (width >= 750) {
+            // #ifdef H5
+            count = 3 // H5端最多显示3列
+            // #endif
+            // #ifndef H5
+            count = 4
+            // #endif
+        } else if (width >= 500) {
+            count = 3
+        } else {
+            count = 2
+        }
+
+        if (count !== columnCount.value) {
+            columnCount.value = count
+        }
+
+        // 计算间距：count=2 => 1，count=5 => 2，中间线性插值
+        const spacing = 2 - (count - 2) * (1 / 3)
+        // console.log('列数:', count, '间距:', spacing.toFixed(2))
+        columnSpace.value = spacing
     }
 
     onMounted(() => {
diff --git a/packageA/pages/UnitDetails/UnitDetails.vue b/packageA/pages/UnitDetails/UnitDetails.vue
index e7d4088..2cf6817 100644
--- a/packageA/pages/UnitDetails/UnitDetails.vue
+++ b/packageA/pages/UnitDetails/UnitDetails.vue
@@ -39,8 +39,8 @@
 			<scroll-view scroll-y class="Detailscroll-view">
 				<view class="views">
 				<view class="Detail-title"><text class="title">在招职位</text></view>
-				<template v-if="companyInfo.jobList && companyInfo.jobList.length != 0">
-					<view v-for="job in companyInfo.jobList" :key="job.jobId">
+				<template v-if="jobInfoList && jobInfoList.length != 0">
+					<view v-for="job in jobInfoList" :key="job.jobId">
 						<view class="cards" @click="navToJobDetail(job.jobId)">
 							<view class="card-company">
 								<text class="company">{{ job.jobTitle }}</text>
@@ -116,6 +116,7 @@
 	const companyInfo = ref({
 		jobList: [],
 	});
+	const jobInfoList = ref([]);
 	const baseUrl = config.imgBaseUrl;
 	const getItemBackgroundStyle = (imageName) => ({
 		backgroundImage: `url(${baseUrl}/jobfair/${imageName})`,
@@ -212,6 +213,10 @@
 	    
 	    if (options.job && typeof options.job === 'string') {
 	        try {
+				const job=JSON.parse(options.job)
+				if(job.jobInfoList.length > 0){
+					jobInfoList.value = job.jobInfoList
+				}
 	            companyInfo.value = JSON.parse(options.job);
 	        } catch (error) {
 	            console.error('Error parsing job data:', error);
@@ -360,6 +365,7 @@
 
 	// 跳转到职位详情页面
 	function navToJobDetail(jobId) {
+		return
 		if (jobId) {
 			navTo(`/packageA/pages/post/post?jobId=${encodeURIComponent(jobId)}`);
 		}
diff --git a/packageA/pages/collection/compare.vue b/packageA/pages/collection/compare.vue
index d4a1ecb..5080820 100644
--- a/packageA/pages/collection/compare.vue
+++ b/packageA/pages/collection/compare.vue
@@ -2,82 +2,83 @@
     <view class="job-comparison-container">
         <scroll-view class="horizontal-scroll" scroll-x="true">
             <view class="comparison-table">
-                <view class="table-row table-header">
-                    <view class="table-cell fixed-column"></view>
-                    <view v-for="(job, index) in jobs" :key="index" class="table-cell job-title-cell">
-                        <text>{{ job.jobTitle }}</text>
-                        <text class="company">{{ job.company }}</text>
-                    </view>
+            <view class="table-row table-header">
+                <view class="table-cell fixed-column"></view>
+                <view v-for="(job, index) in jobs" :key="index" class="table-cell job-title-cell">
+                    <text>{{ job?.jobTitle || '' }}</text>
+                    <text class="company">{{ job?.company || '' }}</text>
                 </view>
+            </view>
 
-                <view class="table-row">
-                    <view class="table-cell fixed-column detail-label">
-                        <text>薪资</text>
-                    </view>
-                    <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
-                        <view>
-                            <Salary-Expectation
-                                :max-salary="job.maxSalary"
-                                :min-salary="job.minSalary"
-                                :is-month="true"
-                            ></Salary-Expectation>
-                        </view>
+            <view class="table-row">
+                <view class="table-cell fixed-column detail-label">
+                    <text>薪资</text>
+                </view>
+                <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
+                    <view>
+                        <Salary-Expectation
+                            v-if="job"
+                            :max-salary="job.maxSalary"
+                            :min-salary="job.minSalary"
+                            :is-month="true"
+                        ></Salary-Expectation>
                     </view>
                 </view>
+            </view>
 
-                <view class="table-row">
-                    <view class="table-cell fixed-column detail-label">
-                        <text>公司名称</text>
-                    </view>
-                    <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
-                        <view>{{ job.companyName }}</view>
-                    </view>
+            <view class="table-row">
+                <view class="table-cell fixed-column detail-label">
+                    <text>公司名称</text>
                 </view>
+                <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
+                    <view>{{ job?.companyName || '' }}</view>
+                </view>
+            </view>
 
-                <view class="table-row">
-                    <view class="table-cell fixed-column detail-label">
-                        <text>学历</text>
-                    </view>
-                    <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
-                        <view><dict-Label dictType="education" :value="job.education"></dict-Label></view>
-                    </view>
+            <view class="table-row">
+                <view class="table-cell fixed-column detail-label">
+                    <text>学历</text>
                 </view>
+                <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
+                    <view><dict-Label dictType="education" :value="job?.education"></dict-Label></view>
+                </view>
+            </view>
 
-                <view class="table-row">
-                    <view class="table-cell fixed-column detail-label">
-                        <text>经验</text>
-                    </view>
-                    <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
-                        <view><dict-Label dictType="experience" :value="job.experience"></dict-Label></view>
-                    </view>
+            <view class="table-row">
+                <view class="table-cell fixed-column detail-label">
+                    <text>经验</text>
                 </view>
+                <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
+                    <view><dict-Label dictType="experience" :value="job?.experience"></dict-Label></view>
+                </view>
+            </view>
 
-                <view class="table-row">
-                    <view class="table-cell fixed-column detail-label">
-                        <text>工作地点</text>
-                    </view>
-                    <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
-                        <view>{{ job.jobLocation }}</view>
-                    </view>
+            <view class="table-row">
+                <view class="table-cell fixed-column detail-label">
+                    <text>工作地点</text>
                 </view>
+                <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
+                    <view>{{ job?.jobLocation || '' }}</view>
+                </view>
+            </view>
 
-                <view class="table-row">
-                    <view class="table-cell fixed-column detail-label">
-                        <text>来源</text>
-                    </view>
-                    <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
-                        <view>{{ job.dataSource }}</view>
-                    </view>
+            <view class="table-row">
+                <view class="table-cell fixed-column detail-label">
+                    <text>来源</text>
                 </view>
+                <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
+                    <view>{{ job?.dataSource || '' }}</view>
+                </view>
+            </view>
 
-                <view class="table-row">
-                    <view class="table-cell fixed-column detail-label">
-                        <text>职位描述</text>
-                    </view>
-                    <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
-                        <view>{{ job.description }}</view>
-                    </view>
+            <view class="table-row">
+                <view class="table-cell fixed-column detail-label">
+                    <text>职位描述</text>
                 </view>
+                <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
+                    <view>{{ job?.description || '' }}</view>
+                </view>
+            </view>
                 <view class="table-row">
                     <view class="table-cell fixed-column detail-label">
                         <text>工业</text>
@@ -85,9 +86,9 @@
                     <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
                         <view>
                             <dict-tree-Label
-                                v-if="jobInfo.company && jobInfo.company.industry"
+                                v-if="job.company && job.company.industry"
                                 dictType="industry"
-                                :value="jobInfo.company.industry"
+                                :value="job.company.industry"
                             ></dict-tree-Label>
                         </view>
                     </view>
@@ -98,7 +99,7 @@
                     </view>
                     <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
                         <view>
-                            <dict-Label dictType="scale" :value="jobInfo.company?.scale"></dict-Label>
+                            <dict-Label dictType="scale" :value="job.company?.scale"></dict-Label>
                         </view>
                     </view>
                 </view>
@@ -108,7 +109,7 @@
                     </view>
                     <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
                         <view>
-                            {{ job.isHot ? '是' : '否' }}
+                            {{ job?.isHot ? '是' : '否' }}
                         </view>
                     </view>
                 </view>
@@ -125,7 +126,7 @@ const jobs = ref([]);
 
 onLoad(() => {
     let compareData = uni.getStorageSync('compare');
-    jobs.value = compareData;
+    jobs.value = Array.isArray(compareData) ? compareData : [];
 });
 </script>
 
diff --git a/packageA/pages/jobExpect/jobExpect.vue b/packageA/pages/jobExpect/jobExpect.vue
index 6ec0376..7542a16 100644
--- a/packageA/pages/jobExpect/jobExpect.vue
+++ b/packageA/pages/jobExpect/jobExpect.vue
@@ -81,10 +81,16 @@ const fromValue = reactive({
     area: '',
     jobTitleId: [],
 });
-onLoad(async () => {
+const needSkill = ref(false);
+
+onLoad(async (options) => {
     // 初始化字典数据
     await getDictData();
     initLoad();
+    // 检查是否需要继续跳转到技能页面
+    if (options && options.needSkill === 'true') {
+        needSkill.value = true;
+    }
 });
 const confirm = () => {
     if (!fromValue.jobTitleId) {
@@ -94,7 +100,12 @@ const confirm = () => {
         $api.msg('完成');
         state.disbleDate = true;
         getUserResume().then(() => {
-            navBack();
+            // 如果需要继续跳转到技能页面，则跳转到个人信息页面（携带 needSkill 标记，便于返回两级）
+            if (needSkill.value) {
+                navTo('/packageA/pages/personalInfo/personalInfo?needSkill=true');
+            } else {
+                navBack();
+            }
         });
     });
 };
diff --git a/packageA/pages/personalInfo/personalInfo.vue b/packageA/pages/personalInfo/personalInfo.vue
index 10fe842..12ed6c8 100644
--- a/packageA/pages/personalInfo/personalInfo.vue
+++ b/packageA/pages/personalInfo/personalInfo.vue
@@ -17,6 +17,19 @@
                 <view class="input-titile">姓名</view>
                 <input class="input-con" v-model="fromValue.name" placeholder="请输入您的姓名" />
             </view>
+            <view class="content-input" :class="{ 'input-error': passwordError }">
+                <view class="input-titile">设置密码</view>
+                <input 
+                    class="input-con" 
+                    v-model="fromValue.ytjPassword" 
+                    placeholder="请输入密码" 
+                    type="password" 
+                    maxlength="8"
+                    @input="validatePassword"
+                />
+                <view v-if="passwordError" class="error-message">{{ passwordError }}</view>
+                <view v-if="fromValue.ytjPassword && !passwordError" class="success-message">✓ 密码格式正确</view>
+            </view>
             <view class="content-sex">
                 <view class="sex-titile">性别</view>
                 <view class="sext-ri">
@@ -150,6 +163,8 @@ const openSelectPopup = (config) => {
 };
 
 const percent = ref('0%');
+// 当从“先职位后技能”链路进入时，提交后需直接返回职业规划页
+const needGoBackTwoStep = ref(false);
 const state = reactive({
     educationText: '',
     politicalAffiliationText: '',
@@ -158,6 +173,7 @@ const state = reactive({
 });
 const fromValue = reactive({
     name: '',
+    ytjPassword: '', // 新增密码字段
     sex: 0,
     birthDate: '',
     education: '',
@@ -165,10 +181,16 @@ const fromValue = reactive({
     idCard: '',
     phone: ''
 });
+
+// 输入校验相关
+const passwordError = ref('');
 // 移除重复的onLoad定义，已在上方实现
 
 // 在onLoad中初始化数据，确保页面加载时就能获取技能信息
-onLoad(() => {
+onLoad((options = {}) => {
+    if (options.needSkill === 'true') {
+        needGoBackTwoStep.value = true;
+    }
     // 初始化页面数据
     initLoad();
 });
@@ -235,6 +257,7 @@ function initLoad() {
     const currentUserInfo = userInfo.value && Object.keys(userInfo.value).length > 0 ? userInfo.value : cachedUserInfo;
     
     fromValue.name = currentUserInfo.name || '';
+    fromValue.ytjPassword = ''; // 密码输入框默认为空，不加载已有密码
     fromValue.sex = currentUserInfo.sex !== undefined ? Number(currentUserInfo.sex) : 0;
     fromValue.phone = currentUserInfo.phone || '';
     fromValue.birthDate = currentUserInfo.birthDate || '';
@@ -351,6 +374,12 @@ const confirm = () => {
         return $api.msg('请输入正确手机号');
     }
     
+    // 密码校验
+    validatePassword();
+    if (fromValue.ytjPassword && passwordError.value) {
+        return $api.msg(passwordError.value);
+    }
+    
     // 构建appSkillsList数据结构 - 使用新的技能数据结构，包含id字段
     const appSkillsList = state.skills
         .filter(skill => skill.name && skill.name.trim() !== '')
@@ -369,7 +398,12 @@ const confirm = () => {
     $api.createRequest('/app/user/resume', params, 'post').then((resData) => {
         $api.msg('完成');
         getUserResume().then(() => {
-            navBack();
+            // 如果从“缺职位+技能”链路进入，回退两层直接返回职业规划页
+            if (needGoBackTwoStep.value) {
+                navBack({ delta: 2 });
+            } else {
+                navBack();
+            }
         });
     });
 };
@@ -603,6 +637,54 @@ const changeSex = (sex) => {
     fromValue.sex = sex;
 };
 
+// 密码实时校验
+const validatePassword = () => {
+    const password = (fromValue.ytjPassword || '').trim();
+    
+    // 如果为空，清除错误信息
+    if (!password) {
+        passwordError.value = '';
+        return;
+    }
+    
+    // 校验规则：长度8位，包含大小写字母和数字，至少各有一个
+    if (password.length !== 8) {
+        passwordError.value = '密码长度必须为8位';
+        return;
+    }
+    
+    // 检查是否包含大写字母
+    const hasUpperCase = /[A-Z]/.test(password);
+    // 检查是否包含小写字母
+    const hasLowerCase = /[a-z]/.test(password);
+    // 检查是否包含数字
+    const hasNumber = /[0-9]/.test(password);
+    
+    if (!hasUpperCase) {
+        passwordError.value = '密码必须包含至少一个大写字母';
+        return;
+    }
+    
+    if (!hasLowerCase) {
+        passwordError.value = '密码必须包含至少一个小写字母';
+        return;
+    }
+    
+    if (!hasNumber) {
+        passwordError.value = '密码必须包含至少一个数字';
+        return;
+    }
+    
+    // 检查是否只包含字母和数字
+    if (!/^[A-Za-z0-9]+$/.test(password)) {
+        passwordError.value = '密码只能包含大小写字母和数字';
+        return;
+    }
+    
+    // 校验通过
+    passwordError.value = '';
+};
+
 const changePoliticalAffiliation = () => {
     openSelectPopup({
         title: '政治面貌',
@@ -760,6 +842,19 @@ function getDatePickerIndexes(dateStr) {
         height: 80rpx;
         border-bottom: 2rpx solid #EBEBEB
         position: relative;
+    .error-message
+        color: #ff4757;
+        font-size: 24rpx;
+        margin-top: 10rpx;
+        line-height: 1.4;
+    .success-message
+        color: #2ed573;
+        font-size: 24rpx;
+        margin-top: 10rpx;
+        line-height: 1.4;
+    .input-error
+        .input-con
+            border-bottom-color: #ff4757;
     .triangle::before
         position: absolute;
         right: 20rpx;
diff --git a/packageA/pages/post/post.vue b/packageA/pages/post/post.vue
index 4060ebc..a6a4860 100644
--- a/packageA/pages/post/post.vue
+++ b/packageA/pages/post/post.vue
@@ -171,16 +171,15 @@
                     </view>
                 </view>
             </view>
-            <view class="content-card" v-else>
+            <view class="content-card" v-if="currentUserType === 0">
                 <view class="card-title">
                     <view class="title">申请人列表</view>
                 </view>
                 <view class="applicant-list">
-                    <view v-for="applicant in applicants" :key="applicant.userId" class="applicant-item">
+                    <view v-for="applicant in jobInfo.applyUsers" :key="applicant.userId" class="applicant-item">
                         <view class="item-header">
                             <view class="name">{{ applicant.name }}</view>
                             <view class="right-header">
-                                <view class="matching-degree">匹配度：{{ applicant.matchingDegree }}</view>
                                 <button class="resume-button" @click="viewResume(applicant.userId)">查看简历</button>
                             </view>
                         </view>
@@ -205,8 +204,8 @@
                                     期望薪资：
                                     <Salary-Expectation
                                         style="display: inline-block"
-                                        :max-salary="applicant.maxSalary"
-                                        :min-salary="applicant.minSalary"
+                                        :max-salary="applicant.salaryMax"
+                                        :min-salary="applicant.salaryMin"
                                         :is-month="true"
                                     ></Salary-Expectation>
                                 </view>
@@ -268,32 +267,7 @@ const raderData = ref({
 const videoPalyerRef = ref(null);
 const explainUrlRef = ref('');
 
-const applicants = ref([
-    {
-        createTime: null,
-        userId: 1,
-        name: '青岛测试账号331',
-        age: '28', // 假设年龄有值
-        sex: '1',
-        birthDate: null,
-        education: '4',
-        politicalAffiliation: '',
-        phone: '',
-        avatar: '',
-        salaryMin: '10000',
-        salaryMax: '15000',
-        area: '3',
-        status: '0',
-        loginIp: '',
-        loginDate: null,
-        jobTitleId: '157,233,373',
-        experience: '3',
-        isRecommend: 1,
-        jobTitle: ['人力资源专员/助理', 'Java', '运维工程师'],
-        applyDate: '2025-09-26',
-        matchingDegree: 1,
-    },
-]);
+// 申请人列表直接使用接口返回的applyUsers数组
 
 onLoad((option) => {
 	console.log(option, 'option');
@@ -525,6 +499,11 @@ function previewImage(url, index) {
         current: index
     });
 }
+
+// 查看简历
+function viewResume(userId) {
+    navTo(`/packageA/pages/resumeDetail/resumeDetail?userId=${userId}`);
+}
 </script>
 
 <style lang="stylus" scoped>
diff --git a/packageA/pages/resumeDetail/resumeDetail.vue b/packageA/pages/resumeDetail/resumeDetail.vue
new file mode 100644
index 0000000..50b45e9
--- /dev/null
+++ b/packageA/pages/resumeDetail/resumeDetail.vue
@@ -0,0 +1,385 @@
+<template>
+    <AppLayout backGorundColor="#F4F4F4">
+        <template #headerleft>
+            <view class="btnback">
+                <image src="@/static/icon/back.png" @click="navBack"></image>
+            </view>
+        </template>
+        <template #header>
+            <view class="title">简历详情</view>
+        </template>
+        <view class="mys-container">
+            <!-- 个人信息 -->
+            <view class="mys-tops btn-feel">
+                <view class="tops-left">
+                    <view class="name">
+                        <text>{{ userInfo.name || '暂无姓名' }}</text>
+                    </view>
+                    <view class="subName">
+                        <dict-Label class="mar_ri10" dictType="sex" :value="userInfo.sex"></dict-Label>
+                        <text class="mar_ri10">{{ userInfo.age }}岁</text>
+                        <dict-Label class="mar_ri10" dictType="education" :value="userInfo.education"></dict-Label>
+                        <dict-Label
+                            class="mar_ri10"
+                            dictType="affiliation"
+                            :value="userInfo.politicalAffiliation"
+                        ></dict-Label>
+                    </view>
+                    <view class="subName">{{ userInfo.phone }}</view>
+                </view>
+                <view class="tops-right">
+                    <view class="right-imghead">
+                        <image v-if="userInfo.sex === '0'" src="@/static/icon/boy.png"></image>
+                        <image v-else src="@/static/icon/girl.png"></image>
+                    </view>
+                    <view class="right-sex">
+                        <image v-if="userInfo.sex === '0'" src="@/static/icon/boy1.png"></image>
+                        <image v-else src="@/static/icon/girl1.png"></image>
+                    </view>
+                </view>
+            </view>
+            <!-- 求职期望 -->
+            <view class="mys-line"></view>
+            <view class="mys-info">
+                <view class="mys-h4">
+                    <text>求职期望</text>
+                </view>
+                <view class="mys-text">
+                    <text>期望薪资：</text>
+                    <text>{{ userInfo.salaryMin / 1000 }}k-{{ userInfo.salaryMax / 1000 }}k</text>
+                </view>
+                <view class="mys-text">
+                    <text>期望工作地：</text>
+                    <dict-Label dictType="area" :value="Number(userInfo.area)"></dict-Label>
+                </view>
+                <view class="mys-list">
+                    <view class="cards" v-for="(title, index) in userInfo.jobTitle" :key="index">
+                        {{ title }}
+                    </view>
+                </view>
+            </view>
+            <!-- 技能列表 -->
+            <view class="work-experience-container">
+                <view class="exp-header">
+                    <text class="exp-title">技能</text>
+                </view>
+                <view class="exp-list" v-if="userInfo.appSkillsList && userInfo.appSkillsList.length > 0">
+                    <view class="exp-item" v-for="(skill, index) in userInfo.appSkillsList" :key="skill.id">
+                        <view class="exp-company-row">
+                            <text class="exp-company">{{ skill.name }}</text>
+                            <text class="exp-position">{{ getSkillLevelText(skill.levels) }}</text>
+                        </view>
+                        <view class="exp-divider" v-if="index !== userInfo.appSkillsList.length - 1"></view>
+                    </view>
+                </view>
+                <view class="exp-empty" v-else>
+                    <image class="empty-img" src="/static/icons/empty-work.png" mode="widthFix"></image>
+                    <text class="empty-text">暂无技能信息</text>
+                </view>
+            </view>
+
+            <!-- 工作经历 -->
+            <view class="work-experience-container">
+                <!-- 标题栏：仅显示标题 -->
+                <view class="exp-header">
+                    <text class="exp-title">工作经历</text>
+                </view>
+
+                <!-- 工作经历列表 -->
+                <view class="exp-list" v-if="workExperiences.length > 0">
+                    <view class="exp-item" v-for="(item, index) in workExperiences" :key="item.id">
+                        <!-- 公司名称 + 职位 -->
+                        <view class="exp-company-row">
+                            <text class="exp-company">{{ item.companyName }}</text>
+                            <text class="exp-position">{{ item.position }}</text>
+                        </view>
+
+                        <!-- 工作时间 -->
+                        <view class="exp-date-row">
+                            <text class="exp-label">工作时间：</text>
+                            <text class="exp-date">{{ item.startDate }} - {{ item.endDate || '至今' }}</text>
+                        </view>
+
+                        <!-- 工作描述（支持多行） -->
+                        <view class="exp-desc-row" v-if="item.description">
+                            <text class="exp-label">工作描述：</text>
+                            <text class="exp-desc">{{ item.description }}</text>
+                        </view>
+
+                        <!-- 分隔线（最后一项不显示） -->
+                        <view class="exp-divider" v-if="index !== workExperiences.length - 1"></view>
+                    </view>
+                </view>
+
+                <!-- 空状态提示（无工作经历时显示） -->
+                <view class="exp-empty" v-else>
+                    <image class="empty-img" src="/static/icons/empty-work.png" mode="widthFix"></image>
+                    <text class="empty-text">暂无工作经历</text>
+                </view>
+            </view>
+        </view>
+    </AppLayout>
+</template>
+
+<script setup>
+import { reactive, inject, ref, onMounted } from 'vue';
+const { $api, navTo, navBack, config } = inject('globalFunction');
+import { onLoad } from '@dcloudio/uni-app';
+import useDictStore from '@/stores/useDictStore';
+const { getDictData } = useDictStore();
+
+const userInfo = ref({});
+const workExperiences = ref([]);
+const isLoading = ref(false);
+
+// 获取技能等级文本
+const getSkillLevelText = (level) => {
+    const levelMap = {
+        '1': '初级',
+        '2': '中级',
+        '3': '高级'
+    };
+    return levelMap[level] || level || '暂无等级';
+};
+
+// 页面加载时获取数据
+onLoad((option) => {
+    const { userId } = option;
+    if (userId) {
+        getResumeDetail(userId);
+    }
+});
+
+// 获取简历详情
+const getResumeDetail = async (userId) => {
+    try {
+        isLoading.value = true;
+        const resData = await $api.createRequest(`/app/user/userResume/${userId}`);
+        if (resData.code === 200) {
+            userInfo.value = resData.data;
+            // 从简历详情中获取工作经历，而不是单独请求
+            workExperiences.value = resData.data.experiencesList || [];
+        }
+    } catch (error) {
+        console.error('获取简历详情失败:', error);
+        $api.msg('获取简历详情失败');
+    } finally {
+        isLoading.value = false;
+    }
+};
+</script>
+
+<style lang="stylus" scoped>
+image{
+    width: 100%;
+    height: 100%
+}
+.mys-container{
+    padding-bottom: constant(safe-area-inset-bottom);
+    padding-bottom: env(safe-area-inset-bottom);
+    .mys-tops{
+        display: flex
+        justify-content: space-between
+        padding: 52rpx 48rpx
+        .tops-left{
+            .name{
+                font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
+                font-weight: 600;
+                font-size: 44rpx;
+                color: #333333;
+                display: flex
+                align-items: center
+                justify-content: flex-start
+            }
+            .subName{
+                margin-top: 12rpx
+                font-weight: 400;
+                font-size: 32rpx;
+                color: #333333;
+            }
+
+        }
+        .tops-right{
+            position: relative
+            .right-imghead{
+                width: 136rpx;
+                height: 136rpx;
+                border-radius: 50%;
+                background: #e8e8e8
+                overflow: hidden
+            }
+            .right-sex{
+                position: absolute
+                right: -10rpx
+                top: -10rpx
+                width: 50rpx
+                height: 50rpx
+            }
+        }
+    }
+    .mys-line{
+        margin: 0 28rpx
+        height: 0rpx;
+        border-radius: 0rpx 0rpx 0rpx 0rpx;
+        border: 2rpx dashed #000000;
+        opacity: 0.16;
+    }
+    .mys-info{
+        padding: 28rpx
+        .mys-h4{
+            font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
+            font-weight: 600;
+            font-size: 32rpx;
+            color: #000000;
+            margin-bottom: 8rpx
+            display: flex;
+            justify-content: space-between
+            align-items: center
+        }
+        .mys-text{
+            font-weight: 400;
+            font-size: 28rpx;
+            color: #333333;
+            margin-top: 16rpx
+        }
+        .mys-list{
+            display: flex
+            align-items: center
+            flex-wrap: wrap;
+            .cards{
+                margin: 28rpx 28rpx 0 0
+                height: 80rpx;
+                padding: 0 38rpx;
+                width: fit-content
+                display: flex
+                align-items: center
+                justify-content: center
+                border-radius: 12rpx 12rpx 12rpx 12rpx;
+                border: 2rpx solid #E8EAEE;
+            }
+        }
+    }
+}
+
+
+/* 容器样式（适配多端，用rpx做单位） */
+.work-experience-container {
+  padding: 20rpx 30rpx;
+  background-color: #fff;
+  border-radius: 16rpx;
+  margin: 20rpx;
+  box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+}
+
+/* 标题栏：两端对齐 */
+.exp-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 25rpx;
+}
+
+.exp-title {
+  font-size: 32rpx;
+  font-weight: 600;
+  color: #333;
+}
+
+/* 经历列表容器 */
+.exp-list {
+  margin-top: 10rpx;
+}
+
+/* 单个经历卡片 */
+.exp-item {
+  padding: 20rpx 0;
+}
+
+/* 公司名称 + 职位（横向排列，职位右对齐） */
+.exp-company-row {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 15rpx;
+}
+
+.exp-company {
+  font-size: 28rpx;
+  font-weight: bold;
+  color: #000000;
+}
+
+.exp-position {
+  font-size: 24rpx;
+  font-weight: bold;
+  color: #000000;
+}
+
+/* 工作时间/描述：标签+内容横向排列 */
+.exp-date-row, .exp-desc-row {
+  display: flex;
+  margin-bottom: 12rpx;
+  line-height: 1.6;
+  color: #000000;
+}
+
+/* 标签样式（固定宽度，统一对齐） */
+.exp-label {
+  font-size: 26rpx;
+  color: #000;
+  min-width: 160rpx;
+}
+
+/* 内容样式 */
+.exp-date, .exp-desc {
+  font-size: 26rpx;
+  color: #000000;
+  flex: 1; /* 内容占满剩余宽度，支持换行 */
+}
+
+/* 工作描述（支持多行换行） */
+.exp-desc {
+  word-break: break-all;
+}
+
+/* 分隔线 */
+.exp-divider {
+  height: 1rpx;
+  background-color: #f5f5f5;
+  margin-top: 20rpx;
+}
+
+/* 空状态样式 */
+.exp-empty {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding: 80rpx 0;
+  color: #999;
+}
+
+.empty-img {
+  width: 140rpx;
+  height: auto;
+  margin-bottom: 25rpx;
+  opacity: 0.6;
+}
+
+.empty-text {
+  font-size: 26rpx;
+  text-align: center;
+  line-height: 1.5;
+}
+
+.btnback{
+    width: 64rpx;
+    height: 64rpx;
+}
+
+.title {
+    font-size: 36rpx;
+    font-weight: 600;
+    color: #000000;
+    text-align: center;
+    margin-right: 64rpx;
+}
+</style>
\ No newline at end of file
diff --git a/packageA/pages/selectDate/selectDate.vue b/packageA/pages/selectDate/selectDate.vue
index 05e5c29..ff13fc7 100644
--- a/packageA/pages/selectDate/selectDate.vue
+++ b/packageA/pages/selectDate/selectDate.vue
@@ -50,7 +50,8 @@ const { $api, navTo, navBack } = inject('globalFunction');
 const weekMap = ['日', '一', '二', '三', '四', '五', '六'];
 const calendarData = ref([]);
 const current = ref({});
-import { Solar, Lunar } from '@/packageA/lib/lunar-javascript@1.7.2.js';
+import lunarModule from '@/packageA/lib/lunar-javascript@1.7.2.js';
+const { Solar, Lunar } = lunarModule;
 
 const isRecord = ref(false);
 const recordNum = ref(4);
diff --git a/packageB/apiRc/policy/index.js b/packageB/apiRc/policy/index.js
new file mode 100644
index 0000000..df350eb
--- /dev/null
+++ b/packageB/apiRc/policy/index.js
@@ -0,0 +1,9 @@
+import request from "@/utilsRc/request";
+//政策列表
+export function getPolicyList(queryParams) {
+  return request({
+    url: "/portal/policyInfo/portalList",
+    method: "get",
+    params: queryParams,
+  });
+}
\ No newline at end of file
diff --git a/packageB/login2.vue b/packageB/login2.vue
new file mode 100644
index 0000000..2c8ece3
--- /dev/null
+++ b/packageB/login2.vue
@@ -0,0 +1,301 @@
+<template>
+	<AppLayout title="" :use-scroll-view="false">
+		<view class="wrap">
+			<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"
+						v-model="form.password" />
+				</view>
+				<view class="login_yzm">
+					<input class="input" placeholder="请输入验证码" placeholder-class="inputplace" v-model="form.code" />
+					<image class="yzm" :src="codeUrl" @click="getCodeImg"></image>
+				</view>
+
+				<button class="com-btn" @click="register">登 录</button>
+			</view>
+		</view>
+	</AppLayout>
+</template>
+
+<script setup>
+	import {
+		reactive,
+		inject,
+		watch,
+		ref,
+		onMounted,
+		onUnmounted
+	} from 'vue'
+	import {
+		onLoad,
+		onShow
+	} from '@dcloudio/uni-app';
+	const {
+		$api,
+		navTo,
+		vacanciesTo,
+		navBack
+	} = inject("globalFunction");
+	const placeholderStyle = 'font-size:30rpx'
+	const checked = ref(true)
+	const codeUrl = ref('')
+	const flag=ref('nw')
+
+	const form = reactive({
+		username: '',
+		password: '',
+		rememberMe: false,
+		code: '',
+		uuid: ''
+	})
+
+	onLoad((option) => {
+		console.log("111")
+		if(option.flag){
+			flag.value=option.flag
+		}
+	})
+
+	onMounted(() => {
+		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() {
+		if (!form.username) {
+			uni.showToast({
+				icon: 'none',
+				title: '请输入用户名'
+			})
+			return
+		}
+		if (!form.password) {
+			uni.showToast({
+				icon: 'none',
+				title: '请输入密码'
+			})
+			return
+		}
+		if (!form.uuid) {
+			uni.showToast({
+				icon: 'none',
+				title: '请输入验证码'
+			})
+			return
+		}
+		uni.showLoading({
+			title: '登录中...',
+			mask: true
+		})
+		if(flag.value=='hlw'){
+			$api.myRequest('/auth/login',form,'post',10100).then((res) => {
+				uni.setStorageSync('Padmin-Token', res.data.access_token)
+				uni.reLaunch({
+					url: '/pages/index/index'
+				})
+				codeUrl.value = 'data:image/gif;base64,' + res.img
+			}).catch(() => {
+				uni.hideLoading()
+				uni.showToast({
+					icon: 'none',
+					title: '登录失败，请重试'
+				})
+			})
+		}else if(flag.value=='nw'){
+			$api.myRequest('/auth/login',form,'post',9100).then((res) => {
+				uni.setStorageSync('Padmin-Token', res.data.access_token)
+				uni.reLaunch({
+					url: '/packageB/priority/helpFilter'
+				})
+				codeUrl.value = 'data:image/gif;base64,' + res.img
+			}).catch(() => {
+				uni.hideLoading()
+				uni.showToast({
+					icon: 'none',
+					title: '登录失败，请重试'
+				})
+			})
+		}
+		
+	}
+
+	function getCodeImg() {
+		if(flag.value=='hlw'){
+			$api.myRequest('/code',{},'get',10100).then((resData) => {
+				codeUrl.value = 'data:image/gif;base64,' + resData.img
+				form.uuid = resData.uuid
+			});
+		}else if(flag.value=='nw'){
+			$api.myRequest('/code',{},'get',9100).then((resData) => {
+				codeUrl.value = 'data:image/gif;base64,' + resData.img
+				form.uuid = resData.uuid
+			});
+		}
+		
+	}
+</script>
+
+<style scoped lang="stylus">
+	.wrap {
+		background-color: #ffffff;
+		height: 100vh;
+		position: relative;
+
+		.lg-head {
+			height: 480rpx;
+			background: #46ca98;
+			position: relative;
+
+			.view_logo {
+				text-align: center;
+
+				.login_logo {
+					width: 300rpx;
+					height: 300rpx;
+					margin-top: 100rpx;
+				}
+			}
+
+			.bg-cover {
+				position: absolute;
+				bottom: -4rpx;
+				left: 0;
+				right: 0;
+				height: 30rpx;
+				background-size: 100% 100%;
+				z-index: 1;
+			}
+		}
+	}
+
+	.login_index {
+		font-size: 36rpx;
+		font-weight: 500;
+		width: 596rpx;
+		margin: 0 auto;
+
+		::v-deep .is-input-border {
+			border: 0;
+			border-bottom: 1px solid #dcdfe6 !important;
+			border-radius: 0;
+		}
+
+		::v-deep .uni-input-input {
+			font-size: 32rpx;
+			padding-left: 10rpx;
+		}
+
+		::v-deep .uniui-contact-filled:before {
+			color: #46ca98;
+			font-size: 50rpx;
+		}
+
+		::v-deep .uniui-locked-filled:before {
+			color: #46ca98;
+			font-size: 50rpx;
+		}
+
+		.login_yzm {
+			margin-top: 40rpx;
+			display: flex;
+			align-items: center;
+
+			.yzm {
+				width: 200rpx;
+				height: 80rpx;
+			}
+		}
+
+		.com-btn {
+			height: 100rpx;
+			background: #46ca98;
+			border-radius: 50rpx;
+			color: #fff;
+			margin-top: 100rpx;
+		}
+
+		.login_wt {
+			margin: 0 auto;
+			text-align: right;
+			font-size: 24rpx;
+			color: rgba(134, 134, 136, 1);
+		}
+	}
+
+	.lg-bottom {
+		position: absolute;
+		bottom: -3px;
+		left: 0;
+		width: 100%;
+
+		.bottom-svg {
+			position: absolute;
+			bottom: -3px;
+			left: 0;
+			width: 100%;
+		}
+	}
+
+	.login_tongyi {
+
+		font-size: 26rpx;
+		color: rgba(196, 196, 196, 1);
+		width: 620rpx;
+		margin: 32rpx auto;
+		text-align: center;
+
+		text {
+			color: rgba(86, 176, 236, 1);
+		}
+	}
+
+	.input {
+		padding: 0 30rpx 0 80rpx;
+		height: 80rpx;
+		background: #FFFFFF;
+		border-radius: 75rpx 75rpx 75rpx 75rpx;
+		font-size: 28rpx;
+	}
+
+	.inputplace {
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #B5B5B5;
+	}
+</style>
\ No newline at end of file
diff --git a/packageB/priority/helpFilter.vue b/packageB/priority/helpFilter.vue
index 948a7d8..1f8d495 100644
--- a/packageB/priority/helpFilter.vue
+++ b/packageB/priority/helpFilter.vue
@@ -158,7 +158,7 @@
 					<view class="form-btns">
 						<button class="mini-btn form-box-btn detail-btn"  size="mini" v-if="false">详情</button>
 						<button class="mini-btn form-box-btn follow-btn"  size="mini" @click="goFollow(item)">跟进</button>
-						<button class="mini-btn form-box-btn recommend-btn"  size="mini" >智能推荐</button>
+						<button class="mini-btn form-box-btn recommend-btn"  size="mini" @click="goRecommend(item)">智能推荐</button>
 					</view>
 				</view>
 			</view>
@@ -226,12 +226,17 @@ const handleReset = () =>{
 	 getDataList('refresh')
 }
 onMounted(async () => {
-  await loadLevelData('201');
+  // await loadLevelData('201');
 });
-onLoad(() => {
-	getDictionary()
-	// getDeptOptions()
-    getDataList('refresh');
+onLoad(async () => {
+	let token=uni.getStorageSync('fourLevelLinkage-token')
+	if(token){
+		await loadLevelData('201');
+		getDictionary()
+		getDataList('refresh');
+	}else{
+		navTo('/packageB/login2');
+	}
 });
 function getDictionary(){
 	$api.myRequest('/system/public/dict/data/type/assist_task_type').then((resData) => {
@@ -256,7 +261,7 @@ function getTaskTypeLabelByValue(value) {
  // 加载某一级的数据（parentId 为空表示根）
 async function loadLevelData(parentId) {
     let header = {
-		'Authorization': uni.getStorageSync('Padmin-Token'),
+		'Authorization': uni.getStorageSync('fourLevelLinkage-token'),
 		'Content-Type': "application/x-www-form-urlencoded"
 	};
 	let params = { parentId };
@@ -336,7 +341,7 @@ function findNodeByValue(nodes, value) {
 }
 function getDeptOptions(){
 	let header={
-		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Authorization':uni.getStorageSync('fourLevelLinkage-token'),
 		'Content-Type': "application/x-www-form-urlencoded"
 	}
 	let params={
@@ -349,7 +354,7 @@ function getDataList(type = 'add') {
 	let maxPage=Math.ceil(totalNum.value/pageSize.value)
 	let params=({...formData})
 	let header={
-		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Authorization':uni.getStorageSync('fourLevelLinkage-token'),
 		'Content-Type': "application/x-www-form-urlencoded"
 	}
     if (type === 'refresh') {
@@ -374,7 +379,11 @@ function getDataList(type = 'add') {
 	}
 }
 function goFollow(item) {
-    navTo(`/packageB/priority/helpFollow?id=${item.goal_person_id}&&name=${item.name}&&taskType=${getTaskTypeLabelByValue(item.task_type)}`);
+    navTo(`/packageB/priority/helpFollow?task_id=${item.task_id}&person_id=${item.person_id}&&name=${item.name}&&taskType=${getTaskTypeLabelByValue(item.task_type)}`);
+}
+//智能推荐
+const goRecommend = (item) => {
+  navTo('/packageB/priority/recommend');
 }
 </script>
 
diff --git a/packageB/priority/helpFollow.vue b/packageB/priority/helpFollow.vue
index f1adc0a..7546523 100644
--- a/packageB/priority/helpFollow.vue
+++ b/packageB/priority/helpFollow.vue
@@ -105,7 +105,8 @@ const formData = reactive({
 const personInfo=ref({
 	goalPersonId:'',
 	name:'',
-	taskType:''
+	taskType:'',
+	task_id:''
 })
 const followWays = ref([])
 const followList = ref([])
@@ -161,11 +162,12 @@ const onDateChange = ( e) => {
 }
 function getFollowList(){
 	let header={
-		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Authorization':uni.getStorageSync('fourLevelLinkage-token'),
 		'Content-Type': "application/x-www-form-urlencoded"
 	}
 	let params={
-		goalPersonId:personInfo.value.goalPersonId
+		personId:personInfo.value.person_id,
+		taskId:personInfo.value.task_id
 	}
 	$api.myRequest('/dispatch/assist/records/getFollowList', params,'get',9100,header).then((resData) => {
 		console.log("resData",resData)
@@ -209,7 +211,7 @@ const handleSubmit = () => {
   formRef.value?.validate()
     .then(() => {
 		let header={
-			'Authorization':uni.getStorageSync('Padmin-Token')
+			'Authorization':uni.getStorageSync('fourLevelLinkage-token')
 		}
 		formData.goalPersonId=personInfo.value.goalPersonId
 		$api.myRequest('/dispatch/assist/records/addRecords', formData,'post',9100,header).then((resData) => {
@@ -245,9 +247,10 @@ const handleReset = () => {
 	  formData.nextContactDate = '';
 }
 onLoad((options) => {
-	personInfo.value.goalPersonId=options.id
+	personInfo.value.person_id=options.person_id
 	personInfo.value.name=options.name
 	personInfo.value.taskType=options.taskType
+	personInfo.value.task_id=options.task_id
 	getDictionary()
 	getFollowList()
 });
diff --git a/packageB/priority/recommend.vue b/packageB/priority/recommend.vue
new file mode 100644
index 0000000..d9fc6f7
--- /dev/null
+++ b/packageB/priority/recommend.vue
@@ -0,0 +1,413 @@
+<template>
+  <AppLayout :title="title" :show-bg-image="false">
+    <view class="main-list" :style="getBackgroundStyle('k.png')">
+      <view class="list-top">
+        <view class="list-title">
+          <text>岗位推荐列表</text>
+          <view class="title-line" style="left: 70rpx"></view>
+        </view>
+      </view>
+      <view class="jobListBox">
+        <view class="item" v-for="(job, index) in list" :key="index">
+          <view class="falls-card">
+            <view class="falls-card-pay">
+              <view class="pay-text">
+                <Salary-Expectation
+                  :max-salary="job.maxSalary"
+                  :min-salary="job.minSalary"
+                  :is-month="true"
+                ></Salary-Expectation>
+              </view>
+              <image
+                v-if="job.isHot"
+                class="flame"
+                src="/static/icon/flame.png"
+              ></image>
+            </view>
+            <view class="falls-card-title">{{ job.jobTitle }}</view>
+            <view class="fl_box fl_warp">
+              <view class="falls-card-education mar_ri10" v-if="job.education">
+                <dict-Label
+                  dictType="education"
+                  :value="job.education"
+                ></dict-Label>
+              </view>
+              <view class="falls-card-experience" v-if="job.experience">
+                <dict-Label
+                  dictType="experience"
+                  :value="job.experience"
+                ></dict-Label>
+              </view>
+            </view>
+            <view class="falls-card-company">
+              {{ config.appInfo.areaName }}
+              <dict-Label
+                dictType="area"
+                :value="job.jobLocationAreaCode"
+              ></dict-Label>
+            </view>
+            <view class="falls-card-pepleNumber">
+              <view>
+                <image class="point2" src="/static/icon/pintDate.png"></image>
+                <view class="fl_1">
+                  {{ job.postingDate || "发布日期" }}
+                </view>
+              </view>
+              <view>
+                <image
+                  class="point3"
+                  src="/static/icon/pointpeople.png"
+                ></image>
+                <view class="fl_1">
+                  {{ vacanciesTo(job.vacancies) }}
+                </view>
+              </view>
+            </view>
+            <view class="falls-card-company2">
+              <image class="point3" src="/static/icon/point3.png"></image>
+              <view class="fl_1">
+                {{ job.companyName }}
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view class="main-list" :style="getBackgroundStyle('k.png')">
+      <view class="list-top">
+        <view class="list-title">
+          <text>政策推荐列表</text>
+          <view class="title-line" style="left: 70rpx"></view>
+        </view>
+      </view>
+      <view
+        style="margin-bottom: 24rpx; border-radius: 16rpx"
+        class="policy-list"
+        v-for="(item, index) in policyList"
+        :key="index"
+        @click="goPolicyDetail(item)"
+      >
+        <view class="sign">推荐</view>
+        <view class="title">
+          <image src="../../packageRc/static/zcLeft.png" />
+          {{ item.zcmc }}</view
+        >
+        <view class="infos">
+          <view v-if="item.zclx">{{ item.zclx }}</view>
+          <view v-if="item.zcLevel">{{ item.zcLevel }}</view>
+          <view v-if="item.sourceUnit">{{ item.sourceUnit }}</view>
+        </view>
+        <view class="bottom-line">
+          <view
+            ><uni-icons color="#A2A2A2" type="info" size="12"></uni-icons
+            >发布日期：{{ item.createTime }}</view
+          >
+          <view>
+            <!-- 浏览数<text style="color: #6aa7e8">{{ item.viewNum }}</text> -->
+          </view>
+        </view>
+      </view>
+    </view>
+  </AppLayout>
+</template>
+
+<script setup>
+import { inject, ref, reactive, onMounted } from "vue";
+const { $api, navTo, navBack, vacanciesTo } = inject("globalFunction");
+import config from "@/config.js";
+import { getPolicyList } from "@/packageB/apiRc/policy/index.js";
+import AppLayout from "@/components/AppLayout/AppLayout.vue";
+import dictLabel from "@/components/dict-Label/dict-Label.vue";
+const title = ref("");
+const baseUrl = config.imgBaseUrl;
+const list = ref([]);
+const getBackgroundStyle = (imageName) => ({
+  backgroundImage: `url(${baseUrl}/dispatch/${imageName})`,
+  backgroundSize: "cover", // 覆盖整个容器
+  backgroundPosition: "center", // 居中
+  backgroundRepeat: "no-repeat",
+});
+onMounted(() => {
+  getJobRecommend();
+  getPolicyData();
+});
+function getJobRecommend() {
+  $api
+    .createRequest(
+      "/cms/job/recommend",
+      { pageSize: 8 },
+      "GET",
+      false,
+      {},
+      false
+    )
+    .then((resData) => {
+      if (resData.code == 200) {
+        list.value = resData.data
+      }
+    });
+}
+const policyList = ref([]);
+function getPolicyData() {
+  getPolicyList({ pageNum: 1, pageSize: 8 }).then((res) => {
+    if(res.code == 200){
+      policyList.value = res.rows;
+    }
+  });
+}
+
+function goPolicyDetail(item) {
+  uni.navigateTo({
+    url: `/packageRc/pages/policy/policyDetail?id=${item.id}`
+  });
+}
+</script>
+
+<style lang="scss" scoped>
+.main-list {
+  background-color: #ffffff;
+  padding: 20rpx 25rpx 28rpx 25rpx;
+  margin: 30rpx 30rpx;
+  box-shadow: 0px 3px 20px 0px rgba(0, 105, 234, 0.1);
+  border-radius: 12px;
+}
+
+.list-top {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.list-title {
+  font-weight: bold;
+  font-size: 36rpx;
+  color: #404040;
+  position: relative;
+}
+
+.title-line {
+  position: absolute;
+  bottom: -10rpx;
+  left: 36rpx;
+  width: 70rpx;
+  height: 8rpx;
+  background: linear-gradient(90deg, #ffad58 0%, #ff7a5b 100%);
+  border-radius: 4rpx;
+}
+
+.jobListBox {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+  padding-top: 28rpx;
+  margin-top: 10rpx;
+}
+
+.item {
+  width: 48%;
+  position: relative;
+  border-radius: 6px;
+  margin-bottom: 10px;
+  background-color: #fff;
+  box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.05);
+
+  .falls-card {
+    padding: 30rpx;
+
+    .falls-card-title {
+      font-family: "PingFangSC-Medium", "PingFang SC", "Helvetica Neue",
+        Helvetica, Arial, "Microsoft YaHei", sans-serif;
+      color: #606060;
+      text-align: left;
+      word-break: break-all;
+      font-weight: 500;
+      font-size: 32rpx;
+      color: #333333;
+      margin-top: 10rpx;
+    }
+
+    .falls-card-pay {
+      // height: 50rpx;
+      word-break: break-all;
+      color: #002979;
+      text-align: left;
+      display: flex;
+      align-items: end;
+      position: relative;
+
+      .pay-text {
+        font-family: DIN-Medium;
+        color: #4c6efb;
+        padding-right: 10rpx;
+        font-weight: 500;
+        font-size: 28rpx;
+        color: #4c6efb;
+        line-height: 45rpx;
+        text-align: left;
+      }
+
+      .flame {
+        position: absolute;
+        bottom: 0;
+        right: -10rpx;
+        transform: translate(0, -30%);
+        width: 24rpx;
+        height: 31rpx;
+      }
+    }
+
+    .falls-card-education,
+    .falls-card-experience {
+      width: fit-content;
+      height: 30rpx;
+      background: #f4f4f4;
+      border-radius: 4rpx;
+      padding: 6rpx 20rpx;
+      line-height: 30rpx;
+      font-weight: 400;
+      font-size: 24rpx;
+      color: #6c7282;
+      text-align: center;
+      margin-top: 20rpx;
+      white-space: nowrap;
+    }
+
+    .falls-card-company,
+    .falls-card-pepleNumber {
+      margin-top: 20rpx;
+      font-size: 24rpx;
+      color: #999999;
+      line-height: 25rpx;
+      text-align: left;
+    }
+
+    .falls-card-pepleNumber {
+      display: flex;
+      justify-content: space-between;
+      flex-wrap: wrap;
+      margin-top: 10rpx;
+      font-weight: 400;
+      font-size: 24rpx;
+      color: #999999;
+      line-height: 46rpx;
+
+      view {
+        display: flex;
+        align-items: center;
+        white-space: nowrap;
+
+        .point2 {
+          margin: 0rpx 6rpx 0 2rpx;
+          height: 22rpx;
+          width: 22rpx;
+        }
+
+        .point3 {
+          margin: 0rpx 4rpx 0 0;
+          height: 28rpx;
+          width: 28rpx;
+        }
+      }
+    }
+
+    .falls-card-matchingrate {
+      margin-top: 10rpx;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      font-size: 21rpx;
+      color: #4778ec;
+      text-align: left;
+    }
+
+    .falls-card-company2 {
+      margin-top: 4rpx;
+      font-size: 24rpx;
+      color: #999999;
+      text-align: left;
+      display: flex;
+
+      .point3 {
+        margin: 4rpx 4rpx 0 0;
+        height: 26rpx;
+        width: 26rpx;
+      }
+    }
+  }
+}
+
+.policy-list {
+  width: 100%;
+  margin: 0 auto;
+  color: #333333;
+  border-radius: 24rpx;
+  background: #ffffff;
+  padding: 28rpx 22rpx;
+  margin-top: 24rpx;
+  box-sizing: border-box;
+  position: relative;
+
+  .sign {
+    position: absolute;
+    font-size: 24rpx;
+    right: 0;
+    top: 0;
+    padding: 4rpx 14rpx;
+    border: 1rpx solid #ec4827;
+    background: rgba(227, 79, 49, 0.09);
+    border-top-right-radius: 24rpx;
+    border-bottom-left-radius: 24rpx;
+    color: #ec4827;
+  }
+
+  .top-line {
+    display: flex;
+    justify-content: space-between;
+    font-size: 24rpx;
+    color: #a2a2a2;
+    margin-bottom: 16rpx;
+
+    .salary {
+      font-size: 32rpx;
+      color: #4c6efb;
+      font-weight: bold;
+    }
+  }
+
+  .title {
+    font-size: 32rpx;
+    font-weight: bold;
+    color: #282828;
+    margin-bottom: 16rpx;
+    display: flex;
+
+    image {
+      width: 46rpx;
+      height: 46rpx;
+      margin-right: 11rpx;
+    }
+  }
+
+  .infos {
+    display: flex;
+    flex-wrap: wrap;
+    font-size: 24rpx;
+    margin-bottom: 16rpx;
+    line-height: 42rpx;
+
+    view {
+      padding: 0 16rpx;
+      margin-right: 10rpx;
+      background: #f2f2f2;
+    }
+  }
+
+  .bottom-line {
+    display: flex;
+    justify-content: space-between;
+    font-size: 24rpx;
+    color: #a2a2a2;
+    margin-top: 12rpx;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/packageB/train/index.vue b/packageB/train/index.vue
index 4703b17..578970f 100644
--- a/packageB/train/index.vue
+++ b/packageB/train/index.vue
@@ -58,8 +58,57 @@ const { $api, navTo, vacanciesTo, formatTotal, config } = inject('globalFunction
 import useUserStore from '@/stores/useUserStore';
 import useDictStore from '@/stores/useDictStore';
 
-function jumps(url){
-	navTo(url);
+onLoad(() => {
+    thirdLogin()
+});
+
+async function jumps(url){
+	if(await thirdLogin()){
+		navTo(url);
+	}
+}
+
+
+async function thirdLogin(){
+	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: ""
+		}
+	}else{
+		uni.showToast({
+			icon: 'none',
+			title: '请先登录'
+		})
+		return false;
+	}
+	var resLogin = await $api.myRequest('/auth/login2/ks',form,'post',10100);
+	if (resLogin.code=='200') {
+		uni.setStorageSync('Padmin-Token', resLogin.data.access_token)
+		return true;
+	}else{
+		uni.showToast({
+			icon: 'none',
+			title: '单点异常'
+		})
+		return false;
+	}
 }
 </script>
 
diff --git a/packageB/train/video/videoDetail.vue b/packageB/train/video/videoDetail.vue
index 2b42d83..85b6b9a 100644
--- a/packageB/train/video/videoDetail.vue
+++ b/packageB/train/video/videoDetail.vue
@@ -9,8 +9,20 @@
 			<view class="video-detail-container">
 			    <!-- 视频播放组件 -->
 			    <view class="video-wrapper">
-					<video id="myVideo" :src="videoInfo.currentUrl" :poster="trainVideoImgUrl+ videoInfo.cover" @seeked="onSeeked"
-						 enable-danmu controls style="width: 100%;" @pause="onPause" @timeupdate="onTimeupdate" @ended="onEnded"></video>
+					<video 
+						v-if="videoInfo && videoInfo.cover && isVideoReady" 
+						id="myVideo" 
+						:src="videoInfo.currentUrl" 
+						:poster="trainVideoImgUrl+ videoInfo.cover"
+						:initial-time="initialTime"
+						:autoplay="shouldAutoPlay"
+						enable-danmu 
+						controls 
+						style="width: 100%;" 
+						@pause="onPause" 
+						@timeupdate="onTimeupdate" 
+						@ended="onEnded">
+					</video>
 			    </view>
 			</view>
 			<view class="video-info" :style="getItemBackgroundStyle('video-bj2.png')">
@@ -132,7 +144,7 @@
 </template>
 
 <script setup>
-import { inject, reactive,ref, onMounted, onUnmounted, nextTick } from 'vue';
+import { inject, reactive,ref, onMounted, onUnmounted, nextTick ,watch} from 'vue';
 import { onLoad,onHide,onUnload } from '@dcloudio/uni-app';
 const { $api, navTo, navBack } = inject('globalFunction');
 import config from "@/config.js"
@@ -146,10 +158,13 @@ const trainVideoImgUrl=config.trainVideoImgUrl
 const categories=ref([])
 const levalLabels=ref([])
 const latestTime = ref(0)
+const initialTime = ref(0)
 const totalTime=ref(0)
 const baseUrl = config.imgBaseUrl
 const pageEnterTime = ref(0)
 const currentChapter = ref(0)
+const isVideoReady = ref(false)
+const shouldAutoPlay = ref(false)
 const getItemBackgroundStyle = (imageName) => ({
     backgroundImage: `url(${baseUrl}/train/${imageName})`,
     backgroundSize: '100% 100%',      // 覆盖整个容器
@@ -166,18 +181,38 @@ const params = reactive({
 	videoId: '',
 	userId: ''
 })
+// 监听 initialTime 变化，确保设置完成后再渲染
+watch(initialTime, (newVal) => {
+	if (newVal >= 0 && videoInfo.value && videoInfo.value.cover) {
+		// 延迟渲染，确保初始时间设置生效
+		nextTick(() => {
+			isVideoReady.value = true
+			shouldAutoPlay.value = newVal > 0
+		})
+	}
+})
+// 监听 videoInfo 变化
+watch([videoInfo, initialTime], ([newVideoInfo, newInitialTime]) => {
+	if (newVideoInfo && newVideoInfo.cover && newInitialTime >= 0) {
+		nextTick(() => {
+			isVideoReady.value = true
+			shouldAutoPlay.value = newInitialTime > 0
+		})
+	}
+}, { deep: true })
 onLoad((options) => {
 	getHeart()
 	pageEnterTime.value = Date.now() // 记录毫秒时间戳
 	videoId.value=options.id
 	getDictionary()
 });
-onHide(() => {
-    updateVideoInfo() // 用缓存值，不要调 getCurrentTime
-	reportPageDuration()
-})
+// onHide(() => {
+//     updateVideoInfo() // 用缓存值，不要调 getCurrentTime
+// 	reportPageDuration()
+// })
 onUnload(() => {
-    updateVideoInfo()
+    //updateVideoInfo()
+	saveCurrentChapterProgress()
 	reportPageDuration()
 })
 function getData() {
@@ -195,17 +230,22 @@ function getData() {
 		videoInfo.value.currentUrl=trainVideoImgUrl+videoInfo.value.trainClassList[0].url
 		videoInfo.value.percentage=((videoInfo.value.process/(videoInfo.value.hour*60))*100).toFixed(2)
 		videoInfo.value.uploadTime=videoInfo.value.uploadTime.split(' ')[0]
+		if(videoInfo.value.process !=null){
+			queryModelUserPlay(videoInfo.value.trainClassList[0].classId)
+		} else {
+			// 如果没有历史进度，直接准备渲染
+			initialTime.value = 0
+		}
+		updateVideoInfo()
 	});
 }
 function getHeart() {
 	const raw = uni.getStorageSync("Padmin-Token");
 	const token = typeof raw === "string" ? raw.trim() : "";
-	const headers = token ? { Authorization: raw.startsWith("Bearer ") ? raw : `Bearer ${token}` }: {}
+	const headers = token ? { Authorization: raw.startsWith("Bearer ") ? raw : `Bearer ${token}` }: {};
 	$api.myRequest("/dashboard/auth/heart", {}, "POST", 10100, headers).then((resData) => {
       if (resData.code == 200) {
         getUserInfo();
-      } else {
-		  navTo('/packageB/login')
       }
     });
 }
@@ -244,16 +284,18 @@ function getLevelLabelByValue(value) {
 }
 function onPause(e){
 	updateVideoInfo()
+	saveCurrentChapterProgress()
 }
 function onEnded(e){
 	updateVideoInfo()
+	saveCurrentChapterProgress()
 }
 function onTimeupdate(e){
 	latestTime.value = e.detail.currentTime
 }
-function onSeeked(){
-	updateVideoInfo()
-}
+// function onSeeked(){
+// 	updateVideoInfo()
+// }
 // 更新播放时长
 function updateVideoInfo(){
 	totalTime.value=0
@@ -275,15 +317,20 @@ function updateVideoInfo(){
 		'Authorization':uni.getStorageSync('Padmin-Token'),
 		'Content-Type': "application/x-www-form-urlencoded"
 	}
-	if(videoInfo.value.isCollect===null && videoInfo.value.process ===null){
-		$api.myRequest('/train/public/videoUser/add', paramsData,'post',9100,header).then((resData) => {
-			console.log("视频播放时长更新成功")
-		});
-	}else{
-		$api.myRequest('/train/public/videoUser/update', paramsData,'post',9100,header).then((resData) => {
-			console.log("视频播放时长更新成功")
-		});
-	}
+	
+	$api.myRequest("/dashboard/auth/heart", {}, "POST", 10100, header).then((resData) => {
+	  if (resData.code == 200) {
+		if(videoInfo.value.isCollect===null && videoInfo.value.process ===null && paramsData.process ==0 ){
+			$api.myRequest('/train/public/videoUser/add', paramsData,'post',9100,header).then((resData) => {
+				console.log("视频播放时长更新成功")
+			});
+		}else{
+			$api.myRequest('/train/public/videoUser/update', paramsData,'post',9100,header).then((resData) => {
+				console.log("视频播放时长更新成功")
+			});
+		}
+	  }
+	})
 }
 // 计算并上报停留时长
 function reportPageDuration() {
@@ -307,8 +354,58 @@ function reportPageDuration() {
 	}
 }
 function chapterChange(video,index){
+	saveCurrentChapterProgress()
 	currentChapter.value=index
 	videoInfo.value.currentUrl=trainVideoImgUrl+video.url
+	isVideoReady.value = false
+	shouldAutoPlay.value = false
+	queryModelUserPlay(video.classId)
+}
+const updateUserPlayClassHousr = (classId,hour) => {
+	let paramsData={
+		userId:userId.value,
+		classId:classId,
+		hour:hour,
+		dqHour:latestTime.value
+	}
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	$api.myRequest('/train/public/videoUser/updateUserPlayClassHousr', paramsData,'post',9100,header).then((resData) => {
+		if(resData.code == 200){
+			console.log("学习时长更新成功")
+		}
+	});
+}
+const queryModelUserPlay = (classId) => {
+	let queryParams = {
+		classId: classId,
+		userId: userId.value,
+	};
+	let header = {
+		Authorization: uni.getStorageSync("Padmin-Token"),
+		"Content-Type": "application/x-www-form-urlencoded",
+	};
+	$api.myRequest("/train/public/videoUser/modelUserPlay", queryParams, "post", 9100, header).then((resData) => {
+		if(resData.code == 200){
+			initialTime.value=Number(resData?.data?.dqHour ?? 0)
+		}else {
+			initialTime.value = 0
+		}
+	}).catch(() => {
+		initialTime.value = 0
+	});
+}
+
+// 保存当前章节进度
+function saveCurrentChapterProgress() {
+	if (videoInfo.value.trainClassList && videoInfo.value.trainClassList.length > 0) {
+		const currentVideo = videoInfo.value.trainClassList[currentChapter.value];
+		if (currentVideo) {
+			updateUserPlayClassHousr(currentVideo.classId, currentVideo.hour);
+		}
+	}
 }
 onUnmounted(() => {
 
@@ -489,4 +586,4 @@ onUnmounted(() => {
     font-size: 28rpx;
     color: #303133;
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/packageB/train/video/videoList.vue b/packageB/train/video/videoList.vue
index 90996a5..5efd2d0 100644
--- a/packageB/train/video/videoList.vue
+++ b/packageB/train/video/videoList.vue
@@ -80,7 +80,8 @@ const getItemBackgroundStyle = (imageName) => ({
 });
 const trainVideoImgUrl=config.trainVideoImgUrl
 
-onLoad(() => {
+onLoad(async () => {
+    await thirdLogin()
     getDataList('refresh');
 });
 
@@ -135,8 +136,53 @@ function getDataList(type = 'add') {
 	
 
 // 播放视频
-function playVideo(video) {
-    navTo(`/packageB/train/video/videoDetail?id=${video.videoId}`);
+async function playVideo(video) {
+	if(await thirdLogin()){
+		navTo(`/packageB/train/video/videoDetail?id=${video.videoId}`);
+	}
+}
+
+
+async function thirdLogin(){
+	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: ""
+		}
+	}else{
+		uni.showToast({
+			icon: 'none',
+			title: '请先登录'
+		})
+		return false;
+	}
+	var resLogin = await $api.myRequest('/auth/login2/ks',form,'post',10100);
+	if (resLogin.code=='200') {
+		uni.setStorageSync('Padmin-Token', resLogin.data.access_token)
+		return true;
+	}else{
+		uni.showToast({
+			icon: 'none',
+			title: '单点异常'
+		})
+		return false;
+	}
 }
 </script>
 
diff --git a/packageRc/pages/daiban/daibandetail.vue b/packageRc/pages/daiban/daibandetail.vue
index 7e9f3c0..3fc4d5e 100644
--- a/packageRc/pages/daiban/daibandetail.vue
+++ b/packageRc/pages/daiban/daibandetail.vue
@@ -412,7 +412,7 @@
       @close="showTime = false"
     ></u-datetime-picker> -->
     <!-- 社区端 - 显示隐藏退出组件 -->
-    <exitPopup />
+    <!-- <exitPopup /> -->
     <DealDone ref="dealDone" @finished="getListPersonDemand();"/>
     <!-- <uni-popup background-color="#fff" type="bottom"
       ref="openDeal"
diff --git a/packageRc/pages/demand/demandail.vue b/packageRc/pages/demand/demandail.vue
index a2176f2..afb36de 100644
--- a/packageRc/pages/demand/demandail.vue
+++ b/packageRc/pages/demand/demandail.vue
@@ -1,7 +1,7 @@
 <!--
  * @Date: 2024-10-08 14:29:36
  * @LastEditors: shirlwang
- * @LastEditTime: 2025-11-04 16:16:45
+ * @LastEditTime: 2025-12-16 17:50:45
 -->
 <template>
 	<view class="page" style="background-image: url('../../../packageRc/static/pageBg.png');">
@@ -25,7 +25,7 @@
 		<trainService v-if="activeType == 4" :needId="id" :name="name" ref="type4" />
 		<otherService v-if="activeType == 5" :needId="id" :name="name" ref="type5" />
 		<!-- 社区端 - 显示隐藏退出组件 -->
-		<exitPopup />
+		<!-- <exitPopup /> -->
 	</view>
 </template>
 
diff --git a/packageRc/pages/index/index.vue b/packageRc/pages/index/index.vue
index d7a1f3d..6d9ff81 100644
--- a/packageRc/pages/index/index.vue
+++ b/packageRc/pages/index/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Date: 2025-10-16 15:15:47
- * @LastEditors: lip
- * @LastEditTime: 2025-11-19 18:22:34
+ * @LastEditors: shirlwang
+ * @LastEditTime: 2025-12-08 16:10:47
 -->
 <template>
   <!-- @scroll="handleScroll" @scrolltolower="scrollBottom" -->
@@ -66,7 +66,7 @@
         <view class="title-item active"><view>政策专区</view></view>
         <view @click="toPolicyList">{{'查看更多 >'}}</view>
       </view>
-      <view v-for="(item, index) in policyList" :key="index" class="job-list" @click="toPolicyDetail">
+      <view v-for="(item, index) in policyList" :key="index" class="job-list" @click="toPolicyDetail(item)">
         <view class="sign">推荐</view>
         <view class="title">
           <image src="../../../packageRc/static/zcLeft.png"/>
@@ -100,7 +100,7 @@ function getPolicy() {
 function toPolicyList() {
   navTo(`/packageRc/pages/policy/policyList`)
 }
-function toPolicyDetail() {
+function toPolicyDetail(item) {
   navTo(`/packageRc/pages/policy/policyDetail?id=${item.id}`)
 }
 let activeTab = ref(1)
diff --git a/packageRc/pages/needs/needDetail.vue b/packageRc/pages/needs/needDetail.vue
index 4291010..0b00eef 100644
--- a/packageRc/pages/needs/needDetail.vue
+++ b/packageRc/pages/needs/needDetail.vue
@@ -1,7 +1,7 @@
 <!--
  * @Date: 2024-10-08 14:29:36
  * @LastEditors: shirlwang
- * @LastEditTime: 2025-11-04 17:16:49
+ * @LastEditTime: 2025-12-16 17:50:03
 -->
 <template>
 	<view class="page" style="background-image: url('../../../packageRc/static/pageBg.png');">
@@ -21,7 +21,7 @@
 		<trainService v-if="activeType == 4" :needId="id" :name="name" ref="type4" />
 		<otherService v-if="activeType == 5" :needId="id" :name="name" ref="type5" />
 		<!-- 社区端 - 显示隐藏退出组件 -->
-		<exitPopup />
+		<!-- <exitPopup /> -->
 	</view>
 </template>
 
diff --git a/packageRc/pages/needs/needsList.vue b/packageRc/pages/needs/needsList.vue
index a636ab1..ae9d9fe 100644
--- a/packageRc/pages/needs/needsList.vue
+++ b/packageRc/pages/needs/needsList.vue
@@ -153,7 +153,7 @@
 
 
 			<!-- 社区端 - 显示隐藏退出组件 -->
-			<exitPopup />
+			<!-- <exitPopup /> -->
 	</view>
 </template>
 <script>
diff --git a/packageRc/pages/personalList/personalList.vue b/packageRc/pages/personalList/personalList.vue
index 8602c46..919495d 100644
--- a/packageRc/pages/personalList/personalList.vue
+++ b/packageRc/pages/personalList/personalList.vue
@@ -273,14 +273,14 @@ import {
   returnPerson,
   updatePersonInfo,
 } from "../../api/company/index.js";
-import exitPopup from "../../components/exitPopup.vue";
+// import exitPopup from "../../components/exitPopup.vue";
 import {
 	getDicts
 } from '@/packageRc/apiRc/system/dict.js'
 export default {
   name: "personnelList",
   components: {
-    exitPopup,
+    // exitPopup,
   },
   data() {
     return {
diff --git a/pages.json b/pages.json
index c2827e1..47cb4c9 100644
--- a/pages.json
+++ b/pages.json
@@ -143,6 +143,12 @@
         "style": {
           "navigationBarTitleText": "薪酬信息"
         }
+      },
+      {
+        "path": "pages/service/guidance",
+        "style": {
+          "navigationBarTitleText": "服务指导"
+        }
       }
     ],
     "subpackages": [
@@ -292,6 +298,14 @@
               "navigationBarTitleText": " 企业详情",
               "navigationBarBackgroundColor": "#FFFFFF"
             }
+          },
+          {
+            "path": "pages/resumeDetail/resumeDetail",
+            "style": {
+              "navigationBarTitleText": "简历详情",
+              "navigationBarBackgroundColor": "#4778EC",
+              "navigationBarTextStyle": "white"
+            }
           }
         ]
       },
@@ -316,6 +330,12 @@
               "navigationBarTitleText": "登录"
             }
           },
+		  {
+		    "path": "login2",
+		    "style": {
+		      "navigationBarTitleText": "登录"
+		    }
+		  },
           {
             "path": "train/index",
             "style": {
@@ -375,6 +395,12 @@
             "style": {
               "navigationBarTitleText": "跟进"
             }
+          },
+          {
+            "path": "priority/recommend",
+            "style": {
+              "navigationBarTitleText": "推荐"
+            }
           },
 		  {
 		    "path": "train/wrongAnswer/mistakeNotebook",
diff --git a/pages/careerfair/careerfair.vue b/pages/careerfair/careerfair.vue
index a816058..f6f9e7d 100644
--- a/pages/careerfair/careerfair.vue
+++ b/pages/careerfair/careerfair.vue
@@ -132,7 +132,7 @@
 	});
 	const baseUrl = config.imgBaseUrl;
 
-	onLoad(() => {
+	onLoad(async () => {
 		// const today = new Date();
 		// const year = today.getFullYear();
 		// const month = String(today.getMonth() + 1).padStart(2, '0');
@@ -149,7 +149,53 @@
 	onShow(() => {
 		// 更新自定义tabbar选中状态
 		tabbarManager.updateSelected(1);
-	});
+	});//
+	
+	
+	
+	async function thirdLogin(needToast){
+		let form={}
+		if (uni.getStorageSync('userInfo') && 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') && uni.getStorageSync('userInfo').isCompanyUser=='0') {
+			form={
+				usertype: "2",
+				enterprisecode: uni.getStorageSync('userInfo').idCard,
+				enterprisename: uni.getStorageSync('userInfo').name,
+				contactperson: "",
+				contactphone: "",
+				idno: "",
+				name: ""
+			}
+		}else{
+			if(needToast){
+				uni.showToast({
+					icon: 'none',
+					title: '请先登录'
+				})
+			}
+			return false;
+		}
+		var resLogin = await $api.myRequest('/auth/login2/ks',form,'post',10100);
+		if (resLogin.code=='200') {
+			uni.setStorageSync('Padmin-Token', resLogin.data.access_token)
+			return true;
+		}else{
+			uni.showToast({
+				icon: 'none',
+				title: '单点异常'
+			})
+			return false;
+		}
+	}
 
 	onMounted(() => {
 		// 监听退出登录事件，显示微信登录弹窗
@@ -168,19 +214,21 @@
 		// 可以在这里添加登录成功后的处理逻辑
 	};
 
-	function goDetail(jobFairId){
-		if(state.current != 3){
-			navTo('/packageA/pages/exhibitors/exhibitors?jobFairId=' + jobFairId)
-		}else{
-			console.log(userInfo.value, 'userInfo');
-			if(userInfo.value){
-				if(userInfo.value.userType=='ent'){
-					navTo('/packageB/jobFair/detailCom?jobFairId=' + jobFairId)
-				}else{
-					navTo('/packageB/jobFair/detailPerson?jobFairId=' + jobFairId)
+	async function goDetail(jobFairId){
+		if(await thirdLogin('1')){
+			if(state.current != 3){
+				navTo('/packageA/pages/exhibitors/exhibitors?jobFairId=' + jobFairId)
+			}else{
+				console.log(userInfo.value, 'userInfo');
+				if(userInfo.value){
+					if(userInfo.value.userType=='ent'){
+						navTo('/packageB/jobFair/detailCom?jobFairId=' + jobFairId)
+					}else{
+						navTo('/packageB/jobFair/detailPerson?jobFairId=' + jobFairId)
+					}
 				}
 			}
-		}
+		}	
 	}
 
 	function toSelectDate() {
@@ -210,23 +258,28 @@
 		state.current = currented;
 	}
 
-	function seemsg(index) {
+	async function seemsg(index) {
+		
 		state.current = index;
 		if (index != 3) {
 			getFair("refresh");
 		} else {
-			if (!isLogin.value) {
-				getHeart();
-				return;
-			}
-			// 确保获取到用户信息后再请求“我参与的”列表
-			if (!userInfo.value?.info?.userId) {
-				getUser().then(() => {
+			
+			if(await thirdLogin('1')){
+				if (!isLogin.value) {
+					getHeart();
+					return;
+				}
+				// 确保获取到用户信息后再请求“我参与的”列表
+				if (!userInfo.value?.info?.userId) {
+					getUser().then(() => {
+						getMyFair("refresh");
+					});
+				} else {
 					getMyFair("refresh");
-				});
-			} else {
-				getMyFair("refresh");
+				}
 			}
+			
 		}
 	}
 
@@ -244,20 +297,25 @@
 		}
 	};
 
-	function getHeart() {
+	async function getHeart() {
+		
+		
 		const raw = uni.getStorageSync("Padmin-Token");
 		const token = typeof raw === "string" ? raw.trim() : "";
+		
+		var isLogins = await thirdLogin();
+		
 		const headers = token ? {
 			Authorization: raw.startsWith("Bearer ") ? raw : `Bearer ${token}`
 		} : {};
-
+		
+		
 		$api.myRequest("/dashboard/auth/heart", {}, "POST", 10100, headers).then((resData) => {
-			if (resData.code == 200) {
+			if (isLogins) {
 				isLogin.value = true;
 				getUser();
 			} else {
 				isLogin.value = false;
-				$api.msg('请先登录')
 				getFair("refresh");
 			}
 		});
diff --git a/pages/index/components/index-one.vue b/pages/index/components/index-one.vue
index 05559a7..308c480 100644
--- a/pages/index/components/index-one.vue
+++ b/pages/index/components/index-one.vue
@@ -25,9 +25,7 @@
                 <view class="company-info">
                     <view class="company-name">{{ companyInfo.name || '企业名称' }}</view>
                     <view class="company-details">
-                        <text class="industry">{{ companyInfo.industry || '互联网' }}</text>
-                        <text class="separator">·</text>
-                        <text class="size">{{ companyInfo.scale || '100-999人' }}</text>
+                        <text class="size">企业规模: {{ getDictLabel('scale', companyInfo.scale) || '暂无规模数据' }}</text>
                     </view>
                 </view>
                 
@@ -95,12 +93,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" />
@@ -111,7 +104,7 @@
                     <view class="service-icon service-icon-4">
                         <IconfontIcon name="zhengce" :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-training')">
                     <view class="service-icon service-icon-5">
@@ -161,6 +154,18 @@
                     </view>
                     <view class="service-title">薪酬信息</view>
                 </view>
+                <view class="service-item press-button" @click="handleJobFairClick">
+                    <view class="service-icon service-icon-1">
+                        <uni-icons type="shop" size="32" color="#FFFFFF"></uni-icons>
+                    </view>
+                    <view class="service-title">招聘会</view>
+                </view>
+				<view class="service-item press-button" v-if="isFourLevelLinkagePurview" @click="helpClick">
+				    <view class="service-icon service-icon-1">
+				        <uni-icons type="shop" size="32" color="#FFFFFF"></uni-icons>
+				    </view>
+				    <view class="service-title">帮扶</view>
+				</view>
             </view>
             <!-- #endif -->
         </view>
@@ -521,7 +526,7 @@ const shouldShowCompanyContent = computed(() => {
 });
 
 import useDictStore from '@/stores/useDictStore';
-const { getTransformChildren, oneDictData } = useDictStore();
+const { getTransformChildren, oneDictData, dictLabel: getDictLabel, industryLabel } = useDictStore();
 import useLocationStore from '@/stores/useLocationStore';
 import selectFilter from '@/components/selectFilter/selectFilter.vue';
 import { useRecommedIndexedDBStore, jobRecommender } from '@/stores/useRecommedIndexedDBStore.js';
@@ -677,10 +682,11 @@ const goToCompanyInfo = () => {
 onMounted(() => {
     // 获取企业信息
     getCompanyInfo();
-    
+    // pageNull.value = 0;
     // 监听退出登录事件，显示微信登录弹窗
     uni.$on('showLoginModal', () => {
         wxAuthLoginRef.value?.open();
+        pageNull.value = 0;
     });
 });
 
@@ -691,6 +697,8 @@ onUnmounted(() => {
 onShow(() => {
     // 获取最新的企业信息
     getCompanyInfo();
+    //四级联动单点及权限
+    getIsFourLevelLinkagePurview()
 });
 
 // 监听用户信息变化，当登录状态改变时重新获取企业信息
@@ -718,6 +726,8 @@ const handleLoginSuccess = () => {
     
     // 重新获取企业信息
     getCompanyInfo();
+    //四级联动单点及权限
+    getIsFourLevelLinkagePurview()
 };
 
 // 处理附近工作点击
@@ -767,11 +777,17 @@ const handleLiveClick = () => {
 const handleSalaryInfoClick = () => {
     navTo('/pages/service/salary-info');
 };
+const handleJobFairClick = () => {
+    navTo('/pages/careerfair/careerfair');
+};
 const handleH5SalaryClick = () => {
     const salaryUrl = "https://www.mohrss.gov.cn/SYrlzyhshbzb/laodongguanxi_/fwyd/202506/t20250627_544623.html";
     window.location.assign(salaryUrl);
 };
-
+// 处理帮扶
+const helpClick = () => {
+    navTo('/packageB/priority/helpFilter');
+};
 async function loadData() {
     try {
         if (isLoaded.value) return;
@@ -781,12 +797,14 @@ async function loadData() {
         throw err;
     }
 }
-
+const pageNull = ref(0);
 function scrollBottom() {
+    console.log('scrollBottom------')
     if (loadmoreRef.value && typeof loadmoreRef.value.change === 'function') {
         loadmoreRef.value.change('loading');
     }
     if (state.tabIndex === 'all') {
+		pageNull.value++;
         getJobRecommend();
     } else {
         getJobList();
@@ -861,7 +879,7 @@ function navToService(serviceType) {
         'service-guidance': '/pages/service/guidance',
         'public-recruitment': '/pages/service/public-recruitment', 
         'resume-creation': '/pages/resume-guide/resume-guide',
-        'labor-policy': '/pages/service/labor-policy',
+        'labor-policy': '/packageRc/pages/policy/policyList',
         'skill-training': '/packageB/train/video/videoList',
         'skill-evaluation': '/packageB/train/index',
         // 'skill-evaluation': '/pages/service/skill-evaluation',
@@ -968,6 +986,16 @@ function getJobRecommend(type = 'add') {
         ...conditionSearch.value,
         isPublish: 1,
     };
+    // 优先从store获取，如果为空则从缓存获取
+    const storeIsCompanyUser = userInfo.value?.isCompanyUser;
+    const cachedUserInfo = uni.getStorageSync('userInfo') || {};
+    const cachedIsCompanyUser = cachedUserInfo.isCompanyUser;
+    const userType = storeIsCompanyUser !== undefined ? Number(storeIsCompanyUser) : Number(cachedIsCompanyUser);
+    console.log('---------userType-----', userType)
+    // 只有企业用户(isCompanyUser=0)才添加current字段
+    if (userType === 0) {
+        params.current = pageNull.value;
+    }
     let comd = { recommend: true, jobCategory: '', tip: '确认你的兴趣，为您推荐更多合适的岗位' };
     $api.createRequest('/app/job/recommend', params).then((resData) => {
         const { data, total } = resData;
@@ -999,6 +1027,11 @@ function getJobRecommend(type = 'add') {
             const reslist = dataToImg(data);
             list.value = reslist;
         }
+        if (data.length > 0) {
+            pageNull.value++;
+        } else {
+            $api.msg('没有更多岗位了');
+        }
         // 切换状态
         if (loadmoreRef.value && typeof loadmoreRef.value.change === 'function') {
             if (data.length < pageState.pageSize) {
@@ -1025,8 +1058,8 @@ function getJobList(type = 'add') {
         // waterfallsFlowRef.value.refresh();
         if (waterfallsFlowRef.value) waterfallsFlowRef.value.refresh();
     }
+    
     let params = {
-        current: pageState.page,
         pageSize: pageState.pageSize,
         ...pageState.search,
         // ...conditionSearch.value,
@@ -1054,7 +1087,21 @@ function getJobList(type = 'add') {
         }
     });
 }
-
+const isFourLevelLinkagePurview=ref(false)
+const getIsFourLevelLinkagePurview=()=>{
+    let userInfo = uni.getStorageSync('userInfo')
+    if(userInfo){
+        $api.myRequest('/auth/login2/ks',{userid: userInfo.dwUserid, idcardno: userInfo.idCard},"POST",9100,{}).then(res=>{
+            if(res.code == 200){
+                uni.setStorageSync('fourLevelLinkage-token',res.data.access_token)
+                let roleIdList= ['103','106','107']
+                if(res.data.roleIdList.some(item=>roleIdList.includes(item))){
+                    isFourLevelLinkagePurview.value=true
+                }
+            }
+        })
+    }
+}
 function dataToImg(data) {
     const result = data.map((item) => ({
         ...item,
@@ -1070,11 +1117,24 @@ import storeRc from '@/utilsRc/store/index.js';
 function goRc(){
     if (checkLogin()) {
         let userInfo = uni.getStorageSync('userInfo')
-        console.log(uni.getStorageSync('userInfo'), "uni.getStorageSync('userInfo')");
-        storeRc.dispatch('LoginByUserInfo', userInfo).then(res => {
-            // console.log(res, "'res");
-            navTo('/packageRc/pages/index/index');
-        });
+        if(userInfo.isCompanyUser == 2){
+            storeRc.dispatch('LoginByID', userInfo.userId).then(res => {
+            // storeRc.dispatch('LoginByID', 2025111679160750).then(res => {
+                storeRc.dispatch('GetInfo').then(res => {
+                    navTo('/packageRc/pages/daiban/daiban');
+                });
+            });
+//             test0001  202511491561998
+// test0002  202511381669113
+// test0003  2025111679160750
+        }else if(userInfo.isCompanyUser == 1){
+            storeRc.dispatch('LoginByUserInfo', userInfo).then(res => {
+                navTo('/packageRc/pages/index/index');
+            })
+        }else{
+            showToast('企业账号无法查看此模块～');
+        }
+        // storeRc.dispatch('LoginByID', userInfo.userId).then(res => {
     }
 }
 // 跳转到素质测评
diff --git a/pages/job/publishJob.vue b/pages/job/publishJob.vue
index 2395dd2..9e5bc1d 100644
--- a/pages/job/publishJob.vue
+++ b/pages/job/publishJob.vue
@@ -216,6 +216,14 @@
                                 v-model="contact.name"
                             />
                         </view>
+                        <view class="form-group">
+                            <view class="label">职位</view>
+                            <input 
+                                class="input" 
+                                placeholder="请输入职位" 
+                                v-model="contact.position"
+                            />
+                        </view>
                         <view class="form-group">
                             <view class="label">联系电话</view>
                             <input 
@@ -280,6 +288,7 @@ const formData = reactive({
     contacts: [
         {
             name: '',
+            position: '',
             phone: ''
         }
     ]
@@ -504,6 +513,7 @@ const addContact = () => {
     if (formData.contacts.length < 3) {
         formData.contacts.push({
             name: '',
+            position: '',
             phone: ''
         });
     }
@@ -653,7 +663,11 @@ 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()).map(contact => ({
+                contactPerson: contact.name,
+                contactPersonPhone: contact.phone,
+                position: contact.position
+            })),
             filesList: formData.images.map(image => ({ bussinessid: image.bussinessid })) // 新增：岗位图片列表，使用bussinessid
         };
         
diff --git a/pages/login/h5-login.vue b/pages/login/h5-login.vue
index 7b10e8a..cd58ace 100644
--- a/pages/login/h5-login.vue
+++ b/pages/login/h5-login.vue
@@ -193,7 +193,8 @@ const handleLogin = async () => {
 				title: '登录成功',
 				icon: 'success'
 			})
-			window.location.assign('http://222.80.110.161:11111/mechine-dual-vue/login')
+			// window.location.assign('http://222.80.110.161:11111/mechine-dual-vue/login')
+			window.location.assign('https://www.xjksly.cn/mechine-single-vue/login')
 			// // 跳转到首页
 			// uni.reLaunch({
 			// 	url: '/pages/index/index'
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>
diff --git a/pages/service/career-planning.vue b/pages/service/career-planning.vue
index 89a48c5..c3abf8d 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>
@@ -66,8 +64,7 @@
 
 <script setup>
 import { ref, inject, nextTick, onMounted } from 'vue';
-import { onLoad } from '@dcloudio/uni-app';
-import { getJobSkillDetail } from '@/apiRc/jobSkill.js';
+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';
@@ -146,6 +143,11 @@ function openRemindPopup() {
 
 // 检查用户是否完善了个人信息（调用接口获取）
 let hasCheckedRemindInfo = false;
+// 保存缺失信息的标识
+const missingInfo = ref({
+    hasJobInfo: false,
+    hasSkills: false
+});
 
 async function getRemindInfo() {
     if (hasCheckedRemindInfo) {
@@ -158,53 +160,72 @@ 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;
         }
-        
-        // 优先从接口数据中获取职位信息
-        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() !== '';
+        });
+        
+        // 保存缺失信息标识（只保存职位信息和技能标签，身份证信息跳转到个人信息页面）
+        missingInfo.value.hasJobInfo = hasJobInfo;
+        missingInfo.value.hasSkills = hasSkills;
+        
+        // 判断信息是否完整（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(() => {
@@ -213,28 +234,66 @@ 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 !== '';
         
-        // 从缓存中获取职位信息
-        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 cachedJobTitles = Array.isArray(cachedUserInfo?.jobTitles) ? cachedUserInfo.jobTitles : [];
+        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() !== '';
+        });
+        
+        // 保存缺失信息标识
+        missingInfo.value.hasJobInfo = hasJobInfo;
+        missingInfo.value.hasSkills = hasSkills;
+        
+        // 判断信息是否完整（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(() => {
@@ -253,44 +312,25 @@ function handleCancel() {
 async function handleConfirm() {
     remindPopup.value?.close();
     
-    // 直接从缓存中读取 idCard（因为接口返回的数据中没有 idCard）
-    const cachedUserInfo = uni.getStorageSync('userInfo') || {};
-    let idCard = cachedUserInfo?.resume?.idCard ?? cachedUserInfo?.idCard ?? null;
+    const { hasJobInfo, hasSkills } = missingInfo.value;
     
-    // 如果缓存中也没有，尝试从接口获取（虽然接口通常也没有）
-    if (!idCard || idCard === null || idCard === '') {
-        try {
-            const response = await appUserInfo();
-            const userInfo = response?.data || {};
-            idCard = userInfo?.resume?.idCard ?? userInfo?.idCard ?? null;
-        } catch (error) {
-            // 接口调用失败，继续使用缓存数据
-        }
+    // 如果同时缺少职位信息和技能标签：先跳转到职位信息页面，并传递参数表示完成后需要继续跳转到技能页面
+    if (!hasJobInfo && !hasSkills) {
+        // 跳转到职位信息页面，传递参数表示完成后需要继续跳转到技能页面
+        navTo('/packageA/pages/jobExpect/jobExpect?needSkill=true');
+    } 
+    // 如果只缺少技能标签：直接跳转到技能页面（个人信息页面的技能部分）
+    else if (!hasSkills) {
+        navTo('/packageA/pages/personalInfo/personalInfo');
+    } 
+    // 如果只缺少职位信息：直接跳转到职位信息页面
+    else if (!hasJobInfo) {
+        navTo('/packageA/pages/jobExpect/jobExpect');
     }
-    
-    // 如果 idCard 为空，才跳转到完善信息页面
-    if (!idCard || idCard === null || idCard === '') {
-        navTo('/pages/complete-info/complete-info');
-        return;
+    // 如果只缺少身份证信息：跳转到个人信息页面
+    else {
+        navTo('/packageA/pages/personalInfo/personalInfo');
     }
-    
-    // 如果 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 = '市场专员';
-    }
-    
-    showContent.value = true;
 }
 
 // 切换tab
@@ -300,19 +340,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 +432,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?.name || item?.nameStr || '',
+            skillScore: item?.levels || 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 +465,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;
@@ -462,6 +513,14 @@ onLoad(() => {
     getRemindInfo();
 });
 
+onShow(() => {
+    // 返回本页后，如果之前因为信息缺失未展示内容，则重新检查
+    if (!showContent.value) {
+        hasCheckedRemindInfo = false;
+        getRemindInfo();
+    }
+});
+
 onMounted(() => {
     if (remindList.value.length > 0 && !showContent.value) {
         setTimeout(() => {
diff --git a/pages/service/components/CareerRecommend.vue b/pages/service/components/CareerRecommend.vue
index c35d7cb..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>
@@ -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,14 @@ const isLoadingRecommend = ref(false);
 // 计算属性
 const currentJobDisplay = computed(() => props.currentJobName || '市场专员');
 
-// 从技能列表中提取技能名称用于显示
+// 从 appSkillsList 中提取技能名称
+function extractSkillsFromAppSkillsList(appSkillsList = []) {
+    return (Array.isArray(appSkillsList) ? appSkillsList : [])
+        .map(item => item?.name || item?.nameStr || '')
+        .filter(name => !!name && name.trim().length > 0);
+}
+
+// 从技能列表中提取技能名称用于显示（用于推荐职位数据）
 function extractSkillNames(skillList = []) {
     return (Array.isArray(skillList) ? skillList : [])
         .map(item => item?.skillName || '')
@@ -88,38 +95,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 +111,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 +127,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 = [];
         }
@@ -221,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);
 }
@@ -315,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/pages/service/guidance.vue b/pages/service/guidance.vue
new file mode 100644
index 0000000..a9ba2f3
--- /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
diff --git a/stores/useDictStore.js b/stores/useDictStore.js
index 5cf02ce..eeead1d 100644
--- a/stores/useDictStore.js
+++ b/stores/useDictStore.js
@@ -97,31 +97,31 @@ const useDictStore = defineStore("dict", () => {
         return null
     }
 
-    function dictLabel(dictType, value) {
-        if (state[dictType] && Array.isArray(state[dictType])) {
-            for (let i = 0; i < state[dictType].length; i++) {
-                let element = state[dictType][i];
-                if (element.value === value) {
-                    return element.label
-                }
-            }
-        }
-        return ''
+    function dictLabel(dictType, value) {
+        if (state[dictType] && Array.isArray(state[dictType])) {
+            for (let i = 0; i < state[dictType].length; i++) {
+                let element = state[dictType][i];
+                if (element.value === value) {
+                    return element.label
+                }
+            }
+        }
+        return ''
     }
 
-    function oneDictData(dictType, value) {
-        if (!value) {
-            return state[dictType]
-        }
-        if (state[dictType]) {
-            for (let i = 0; i < state[dictType].length; i++) {
-                let element = state[dictType][i];
-                if (element.value === value) {
-                    return element
-                }
-            }
-        }
-        return null
+    function oneDictData(dictType, value) {
+        if (!value) {
+            return state[dictType]
+        }
+        if (state[dictType]) {
+            for (let i = 0; i < state[dictType].length; i++) {
+                let element = state[dictType][i];
+                if (element.value === value) {
+                    return element
+                }
+            }
+        }
+        return null
     }
 
     function getTransformChildren(dictType, title = '', key = '') {
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/test-idcard-login.html b/test-idcard-login.html
deleted file mode 100644
index 6c394b9..0000000
--- a/test-idcard-login.html
+++ /dev/null
@@ -1,247 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh-CN">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>社保登录流程测试</title>
-    <style>
-        body {
-            font-family: Arial, sans-serif;
-            max-width: 800px;
-            margin: 0 auto;
-            padding: 20px;
-            background-color: #f5f5f5;
-        }
-        .container {
-            background: white;
-            padding: 30px;
-            border-radius: 8px;
-            box-shadow: 0 2px 10px rgba(0,0,0,0.1);
-        }
-        h1 {
-            color: #333;
-            text-align: center;
-        }
-        .test-case {
-            margin: 20px 0;
-            padding: 15px;
-            border: 1px solid #ddd;
-            border-radius: 5px;
-            background: #f9f9f9;
-        }
-        .test-case h3 {
-            margin-top: 0;
-            color: #4778EC;
-        }
-        .code {
-            background: #f4f4f4;
-            padding: 10px;
-            border-radius: 4px;
-            font-family: monospace;
-            overflow-x: auto;
-        }
-        .btn {
-            background: #4778EC;
-            color: white;
-            padding: 10px 20px;
-            border: none;
-            border-radius: 4px;
-            cursor: pointer;
-            margin: 10px 5px;
-        }
-        .btn:hover {
-            background: #256BFA;
-        }
-        .result {
-            margin-top: 10px;
-            padding: 10px;
-            border-radius: 4px;
-            display: none;
-        }
-        .success {
-            background: #d4edda;
-            color: #155724;
-            border: 1px solid #c3e6cb;
-        }
-        .error {
-            background: #f8d7da;
-            color: #721c24;
-            border: 1px solid #f5c6cb;
-        }
-    </style>
-</head>
-<body>
-    <div class="container">
-        <h1>社保登录流程测试</h1>
-        
-        <div class="test-case">
-            <h3>测试用例 1: Base64 解码测试</h3>
-            <p>测试 Base64 解码功能是否正常工作</p>
-            <div class="code">
-                // 测试数据: "142634199305163418" 的 Base64 编码<br>
-                // 原始身份证号: 142634199305163418<br>
-                // Base64 编码: MTQyNjM0MTk5MzA1MTYzNDE4
-            </div>
-            <button class="btn" onclick="testBase64Decode()">测试 Base64 解码</button>
-            <div id="base64Result" class="result"></div>
-        </div>
-
-        <div class="test-case">
-            <h3>测试用例 2: URL 参数解析测试</h3>
-            <p>测试从 URL 中获取 idCard 参数的功能</p>
-            <div class="code">
-                // 测试 URL: http://localhost:5173/ks_app/#/pages/login/id-card-login?idCard=MTQyNjM0MTk5MzA1MTYzNDE4<br>
-                // 预期结果: 成功获取到 idCard 参数值
-            </div>
-            <button class="btn" onclick="testUrlParams()">测试 URL 参数解析</button>
-            <div id="urlResult" class="result"></div>
-        </div>
-
-        <div class="test-case">
-            <h3>测试用例 3: 完整登录流程测试</h3>
-            <p>模拟完整的社保登录流程</p>
-            <div class="code">
-                1. 从 URL 获取 idCard 参数 (Base64 编码)<br>
-                2. Base64 解码得到明文身份证号<br>
-                3. 调用 /app/idCardLogin 接口<br>
-                4. 处理登录结果
-            </div>
-            <button class="btn" onclick="testFullLoginFlow()">测试完整登录流程</button>
-            <div id="loginResult" class="result"></div>
-        </div>
-
-        <div class="test-case">
-            <h3>测试用例 4: 生成测试链接</h3>
-            <p>生成用于测试的社保登录链接</p>
-            <div class="code">
-                身份证号: <input type="text" id="testIdCard" value="142634199305163418" style="width: 200px; padding: 5px;">
-            </div>
-            <button class="btn" onclick="generateTestLink()">生成测试链接</button>
-            <div id="linkResult" class="result"></div>
-        </div>
-    </div>
-
-    <script>
-        // Base64 解码函数 (与前端代码保持一致)
-        function decodeBase64(base64Str) {
-            try {
-                return atob(base64Str);
-            } catch (error) {
-                console.error('Base64解码失败:', error);
-                throw new Error('身份证号码解码失败');
-            }
-        }
-
-        // 测试 Base64 解码
-        function testBase64Decode() {
-            const base64Str = "MTQyNjM0MTk5MzA1MTYzNDE4";
-            const resultDiv = document.getElementById('base64Result');
-            
-            try {
-                const decoded = decodeBase64(base64Str);
-                resultDiv.innerHTML = `<strong>成功!</strong><br>
-                    Base64 编码: ${base64Str}<br>
-                    解码结果: ${decoded}<br>
-                    预期结果: 142634199305163418<br>
-                    匹配: ${decoded === "142634199305163418" ? "✓" : "✗"}`;
-                resultDiv.className = 'result success';
-                resultDiv.style.display = 'block';
-            } catch (error) {
-                resultDiv.innerHTML = `<strong>失败!</strong><br>错误信息: ${error.message}`;
-                resultDiv.className = 'result error';
-                resultDiv.style.display = 'block';
-            }
-        }
-
-        // 测试 URL 参数解析
-        function testUrlParams() {
-            const testUrl = "http://localhost:5173/ks_app/#/pages/login/id-card-login?idCard=MTQyNjM0MTk5MzA1MTYzNDE4";
-            const resultDiv = document.getElementById('urlResult');
-            
-            try {
-                const urlObj = new URL(testUrl);
-                const idCardParam = urlObj.searchParams.get('idCard');
-                
-                resultDiv.innerHTML = `<strong>成功!</strong><br>
-                    URL: ${testUrl}<br>
-                    获取到的 idCard 参数: ${idCardParam}<br>
-                    参数存在: ${idCardParam ? "✓" : "✗"}`;
-                resultDiv.className = 'result success';
-                resultDiv.style.display = 'block';
-            } catch (error) {
-                resultDiv.innerHTML = `<strong>失败!</strong><br>错误信息: ${error.message}`;
-                resultDiv.className = 'result error';
-                resultDiv.style.display = 'block';
-            }
-        }
-
-        // 测试完整登录流程
-        function testFullLoginFlow() {
-            const resultDiv = document.getElementById('loginResult');
-            resultDiv.innerHTML = '<strong>测试中...</strong>';
-            resultDiv.className = 'result';
-            resultDiv.style.display = 'block';
-            
-            setTimeout(() => {
-                try {
-                    // 模拟登录流程
-                    const base64IdCard = "MTQyNjM0MTk5MzA1MTYzNDE4";
-                    const decodedIdCard = decodeBase64(base64IdCard);
-                    
-                    // 验证身份证格式
-                    if (!decodedIdCard || decodedIdCard.length < 15) {
-                        throw new Error('身份证号码格式不正确');
-                    }
-                    
-                    resultDiv.innerHTML = `<strong>成功!</strong><br>
-                        完整登录流程测试通过:<br>
-                        1. Base64 参数获取: ✓<br>
-                        2. Base64 解码: ✓ (${decodedIdCard})<br>
-                        3. 身份证格式验证: ✓<br>
-                        4. 接口调用准备: ✓<br>
-                        <br>
-                        <em>注意: 实际接口调用需要在真实环境中测试</em>`;
-                    resultDiv.className = 'result success';
-                } catch (error) {
-                    resultDiv.innerHTML = `<strong>失败!</strong><br>错误信息: ${error.message}`;
-                    resultDiv.className = 'result error';
-                }
-            }, 1000);
-        }
-
-        // 生成测试链接
-        function generateTestLink() {
-            const idCardInput = document.getElementById('testIdCard');
-            const idCard = idCardInput.value.trim();
-            const resultDiv = document.getElementById('linkResult');
-            
-            if (!idCard) {
-                resultDiv.innerHTML = '<strong>错误!</strong><br>请输入身份证号码';
-                resultDiv.className = 'result error';
-                resultDiv.style.display = 'block';
-                return;
-            }
-            
-            try {
-                const base64IdCard = btoa(idCard);
-                const testLink = `http://localhost:5173/ks_app/#/pages/login/id-card-login?idCard=${base64IdCard}`;
-                
-                resultDiv.innerHTML = `<strong>测试链接已生成!</strong><br>
-                    原始身份证号: ${idCard}<br>
-                    Base64 编码: ${base64IdCard}<br>
-                    <br>
-                    <strong>测试链接:</strong><br>
-                    <a href="${testLink}" target="_blank" style="word-break: break-all;">${testLink}</a><br>
-                    <br>
-                    <em>复制此链接在开发环境中测试社保登录功能</em>`;
-                resultDiv.className = 'result success';
-                resultDiv.style.display = 'block';
-            } catch (error) {
-                resultDiv.innerHTML = `<strong>生成失败!</strong><br>错误信息: ${error.message}`;
-                resultDiv.className = 'result error';
-                resultDiv.style.display = 'block';
-            }
-        }
-    </script>
-</body>
-</html>
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
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..c41e10a 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -73,7 +73,7 @@ export function request({
  * @param header  Object，headers，默认：{}
  * @returns promise
  **/
-export function createRequest(url, data = {}, method = 'GET', loading = false, headers = {}) {
+export function createRequest(url, data = {}, method = 'GET', loading = false, headers = {},needHeader = true) {
 	if (loading) {
 		uni.showLoading({
 			title: '请稍后',
@@ -86,7 +86,9 @@ export function createRequest(url, data = {}, method = 'GET', loading = false, h
 	}
 
 	const header = headers || {};
-	header["Authorization"] = encodeURIComponent(Authorization);
+	if(needHeader){
+		header["Authorization"] = encodeURIComponent(Authorization);
+	}
 	return new Promise((resolve, reject) => {
 		uni.request({
 			url: config.baseUrl + url,
@@ -217,19 +219,39 @@ export function myRequest(url, data = {}, method = 'GET', port = 9100, headers =
 						}
 						// 处理业务错误
 						if (resData.data?.code === 401 || resData.data?.code === 402) {
-							uni.navigateTo({
-								url:'/packageB/login?flag=nw'
-							})
-							// navTo('/packageB/login?flag=nw');
+							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 || '请求出现异常，请联系工作人员'
-						uni.showToast({
-							title: errorMsg,
-							icon: 'none'
-						})
+						// uni.showToast({
+						// 	title: errorMsg,
+						// 	icon: 'none'
+						// })
 						const err = new Error(errorMsg)
 						err.error = resData
 						reject(err)
diff --git a/utilsRc/config.js b/utilsRc/config.js
index 94697f0..6862c2b 100644
--- a/utilsRc/config.js
+++ b/utilsRc/config.js
@@ -2,7 +2,7 @@
  * @Descripttion:
  * @Author: lip
  * @Date: 2022-12-28 13:59:09
- * @LastEditors: lip
+ * @LastEditors: shirlwang
  */
 // 应用全局配置
 import config from '@/config.js'
@@ -10,7 +10,7 @@ import config from '@/config.js'
 let exports = {
 	// ========== baseUrl 配置方式选择 ==========
 	// 方式1：硬编码baseUrl（main分支使用，合并到main时不会影响现有功能）
-	baseUrl: 'http://222.80.110.161:11111/sdrc-api', // 正式环境在济南人才上部署（不要轻易连接）
+	baseUrl: 'https://www.xjksly.cn/sdrc-api', // 正式环境在济南人才上部署（不要轻易连接）
 	
 	// 方式2：引用根目录config.js的baseUrl（CareerMap分支可选方式，如需使用请注释掉方式1，取消注释此方式）
 	// baseUrl: config.baseUrl, // 引用根目录config.js的baseUrl，避免重复配置
@@ -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: 'https://www.xjksly.cn/career-map/api/ks_zytp/admin-api/zytp',
 	
-	// ========== 用户接口专用baseUrl（appUserInfo等接口使用） ==========
+	// ========== 用户接口专用baseUrl（其他用户接口使用） ==========
 	userBaseUrl: 'http://ks.zhaopinzao8dian.com/api/ks', // 用户相关接口使用根目录config.js的baseUrl
+	
+	// ========== appUserInfo接口专用baseUrl ==========
+	appUserInfoBaseUrl: 'https://www.xjksly.cn/api/ks', // appUserInfo接口专用，与其他接口路径不一致
 
 
 
diff --git a/utilsRc/request.js b/utilsRc/request.js
index 5a915ad..de40339 100644
--- a/utilsRc/request.js
+++ b/utilsRc/request.js
@@ -14,23 +14,28 @@ let timeout = 10000
 const baseUrl = configRc.baseUrl
 const zytpBaseUrl = configRc.zytpBaseUrl || ''
 const userBaseUrl = configRc.userBaseUrl || ''
+const appUserInfoBaseUrl = configRc.appUserInfoBaseUrl || ''
 
 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
   } else if (baseType === 'user' && userBaseUrl) {
     requestBaseUrl = userBaseUrl
+  } else if (baseType === 'appUserInfo' && appUserInfoBaseUrl) {
+    requestBaseUrl = appUserInfoBaseUrl
   }
   let requestUrl = config.fullUrl ? config.fullUrl : (requestBaseUrl + (config.url || ''))
 
diff --git a/utilsRc/store/modules/user.js b/utilsRc/store/modules/user.js
index b3a0f55..1b39a00 100644
--- a/utilsRc/store/modules/user.js
+++ b/utilsRc/store/modules/user.js
@@ -4,6 +4,7 @@ import constant from '@/utilsRc/constant'
 import {
 	login,
 	// logout,
+	loginByUserId,
 	getInfo,
 	register,
 	smsLogin,
@@ -107,6 +108,25 @@ const user = {
 				})
 			})
 		},
+		// 网格员登录
+		LoginByID({
+			commit,
+			// state
+		}, userInfo) {
+
+			return new Promise((resolve, reject) => {
+				// const info = JSON.parse(JSON.stringify(userInfo))
+				// info.password = '04' + sm2.doEncrypt(info.password, state.publicKey, 0)
+				// info.username = '04' + sm2.doEncrypt(info.username, state.publicKey, 0)
+				loginByUserId(userInfo).then(res => {
+					setToken(res.token)
+					commit('SET_TOKEN', res.token)
+					resolve(res)
+				}).catch(error => {
+					reject(error)
+				})
+			})
+		},
 		// 登录
 		Login({
 			commit,