fix:培训视频播放时长接口调用异常导致重复添加同一组数据bug

Merge branch 'main' of http://124.243.245.42:3000/sdz/ks-app-employment-service
H5端显示三列岗位列表
2025-12-10 18:45:43 +08:00 · 2025-12-09 17:53:46 +08:00 · 2025-12-09 17:53:45 +08:00 · 2025-12-09 17:48:07 +08:00 · 2025-12-09 16:24:41 +08:00 · 2025-12-09 16:23:32 +08:00
39 changed files with 2335 additions and 966 deletions
--- 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) {
--- a/apiRc/user/user.js
+++ b/apiRc/user/user.js
@@ -8,8 +8,7 @@ import request from '@/utilsRc/request'
 // 获取用户信息（职业规划推荐用）
 export function appUserInfo() {
  return request({
-    url: '/app/user/appUserInfo',
-    method: 'get',
-    baseUrlType: 'user' // 使用用户接口专用baseUrl
+    fullUrl: 'http://222.80.110.161:11111/api/ks/app/user/appUserInfo',
+    method: 'get'
  })
 }
--- a/common/globalFunction.js
+++ b/common/globalFunction.js
@@ -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({
--- 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) => {
--- a/config.js
+++ b/config.js
@@ -1,6 +1,6 @@
 export default {
    // baseUrl: 'http://39.98.44.136:8080', // 测试
-    baseUrl: 'http://222.80.110.161:11111/api/ks', // 正式环境
+    baseUrl: 'http://222.80.110.161:11111/api/ks', // 测试
    // baseUrl: 'http://ks.zhaopinzao8dian.com/api/ks', // 测试

 	// LCBaseUrl:'http://10.110.145.145:9100',//内网端口
@@ -25,7 +25,7 @@ export default {
    // 只使用本地缓寸的数据
    OnlyUseCachedDB: true,
    // 使用模拟定位
-    UsingSimulatedPositioning: true,
+    UsingSimulatedPositioning: false,
    // 应用信息
    appInfo: {
        // 应用名称
--- a/hook/useColumnCount.js
+++ b/hook/useColumnCount.js
@@ -33,9 +33,19 @@ export function useColumnCount(onChange = () => {}) {

        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 {
--- a/packageA/pages/collection/compare.vue
+++ b/packageA/pages/collection/compare.vue
@@ -5,8 +5,8 @@
            <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>
+                    <text>{{ job?.jobTitle || '' }}</text>
+                    <text class="company">{{ job?.company || '' }}</text>
                </view>
            </view>

@@ -17,6 +17,7 @@
                <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"
@@ -30,7 +31,7 @@
                    <text>公司名称</text>
                </view>
                <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
-                        <view>{{ job.companyName }}</view>
+                    <view>{{ job?.companyName || '' }}</view>
                </view>
            </view>

@@ -39,7 +40,7 @@
                    <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><dict-Label dictType="education" :value="job?.education"></dict-Label></view>
                </view>
            </view>

@@ -48,7 +49,7 @@
                    <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><dict-Label dictType="experience" :value="job?.experience"></dict-Label></view>
                </view>
            </view>

@@ -57,7 +58,7 @@
                    <text>工作地点</text>
                </view>
                <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
-                        <view>{{ job.jobLocation }}</view>
+                    <view>{{ job?.jobLocation || '' }}</view>
                </view>
            </view>

@@ -66,7 +67,7 @@
                    <text>来源</text>
                </view>
                <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
-                        <view>{{ job.dataSource }}</view>
+                    <view>{{ job?.dataSource || '' }}</view>
                </view>
            </view>

@@ -75,7 +76,7 @@
                    <text>职位描述</text>
                </view>
                <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
-                        <view>{{ job.description }}</view>
+                    <view>{{ job?.description || '' }}</view>
                </view>
            </view>
                <view class="table-row">
@@ -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>

--- 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(() => {
+            // 如果需要继续跳转到技能页面，则跳转到个人信息页面（携带 needSkill 标记，便于返回两级）
+            if (needSkill.value) {
+                navTo('/packageA/pages/personalInfo/personalInfo?needSkill=true');
+            } else {
                navBack();
+            }
        });
    });
 };
--- 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(() => {
+            // 如果从“缺职位+技能”链路进入，回退两层直接返回职业规划页
+            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;
--- a/packageA/pages/post/post.vue
+++ b/packageA/pages/post/post.vue
@@ -171,7 +171,7 @@
                    </view>
                </view>
            </view>
-            <view class="content-card" v-else>
+            <!-- <view class="content-card" v-if="false">
                <view class="card-title">
                    <view class="title">申请人列表</view>
                </view>
@@ -214,7 +214,7 @@
                        </view>
                    </view>
                </view>
-            </view>
+            </view> -->
        </view>
        <view style="height: 34px"></view>
        <template #footer>
@@ -525,6 +525,11 @@ function previewImage(url, index) {
        current: index
    });
 }
+
+// 查看简历
+function viewResume(userId) {
+    navTo(`/packageA/pages/myResume/myResume?userId=${userId}`);
+}
 </script>

 <style lang="stylus" scoped>
--- 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){
+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>

--- a/packageB/train/video/videoDetail.vue
+++ b/packageB/train/video/videoDetail.vue
@@ -9,7 +9,9 @@
 			<view class="video-detail-container">
 			    <!-- 视频播放组件 -->
 			    <view class="video-wrapper">
-					<video id="myVideo" :src="videoInfo.currentUrl" :poster="trainVideoImgUrl+ videoInfo.cover" @seeked="onSeeked"
+					<video v-if="videoInfo && videoInfo.cover" id="myVideo" :src="videoInfo.currentUrl" :poster="trainVideoImgUrl+ videoInfo.cover" @seeked="onSeeked"
+					:initial-time="initialTime"
+                preload="metadata"
 						 enable-danmu controls style="width: 100%;" @pause="onPause" @timeupdate="onTimeupdate" @ended="onEnded"></video>
 			    </view>
 			</view>
@@ -146,6 +148,7 @@ 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)
@@ -172,12 +175,12 @@ onLoad((options) => {
 	videoId.value=options.id
 	getDictionary()
 });
-onHide(() => {
-    updateVideoInfo() // 用缓存值，不要调 getCurrentTime
-	reportPageDuration()
-})
+// onHide(() => {
+//     updateVideoInfo() // 用缓存值，不要调 getCurrentTime
+// 	reportPageDuration()
+// })
 onUnload(() => {
-    updateVideoInfo()
+    // updateVideoInfo()
 	reportPageDuration()
 })
 function getData() {
@@ -195,17 +198,20 @@ 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){
+			latestTime.value=videoInfo.value.process
+			initialTime.value=videoInfo.value.process
+		}
+		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')
      }
    });
 }
@@ -275,7 +281,10 @@ 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("/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("视频播放时长更新成功")
 			});
@@ -284,6 +293,8 @@ function updateVideoInfo(){
 				console.log("视频播放时长更新成功")
 			});
 		}
+	  }
+	})
 }
 // 计算并上报停留时长
 function reportPageDuration() {
--- 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) {
+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>

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

 	onMounted(() => {
 		// 监听退出登录事件，显示微信登录弹窗
@@ -168,7 +212,8 @@
 		// 可以在这里添加登录成功后的处理逻辑
 	};

-	function goDetail(jobFairId){
+	async function goDetail(jobFairId){
+		if(await thirdLogin()){
 			if(state.current != 3){
 				navTo('/packageA/pages/exhibitors/exhibitors?jobFairId=' + jobFairId)
 			}else{
@@ -182,6 +227,7 @@
 				}
 			}
 		}	
+	}

 	function toSelectDate() {
 		navTo("/packageA/pages/selectDate/selectDate", {
@@ -257,7 +303,6 @@
 				getUser();
 			} else {
 				isLogin.value = false;
-				$api.msg('请先登录')
 				getFair("refresh");
 			}
 		});
--- 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">
@@ -521,7 +514,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';
@@ -861,7 +854,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',
@@ -1070,7 +1063,6 @@ 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');
--- 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
        };
        
--- 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('http://222.80.110.161:11111/mechine-single-vue/login')
 			// // 跳转到首页
 			// uni.reLaunch({
 			// 	url: '/pages/index/index'
--- 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,6 +11,7 @@
                {{ item.commercialAreaName }}
            </view>
        </view>
+        <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">
@@ -68,9 +69,10 @@
                    <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;
--- 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,12 +27,9 @@
                        </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">
@@ -73,6 +75,16 @@
                </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"
@@ -84,9 +96,10 @@
                    <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,22 +385,41 @@ defineExpose({ loadData, handleFilterConfirm });
        }
    }
 }
-.nearby-scroll
+.nearby-container
+    // 确保容器占据整个可用视口高度，包括安全区域
+    height: calc(100vh - var(--window-top));
+    display: flex;
+    flex-direction: column;
    overflow: hidden;
-    .nearby-map
+    
+.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
+
+// 筛选条件样式 - 顶级选择器
+.nav-filter
    padding: 16rpx 28rpx 0 28rpx
+    background: #ffffff
    .filter-top
        display: flex
        justify-content: space-between;
--- 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,7 +48,7 @@
                </view>
            </scroll-view>
        </view>
-        <view class="nearby-list">
+        <!-- 筛选项移到scroll-view外面 -->
        <view class="nav-filter" @touchmove.stop.prevent>
            <view class="filter-top">
                <scroll-view :scroll-x="true" :show-scrollbar="false" class="tab-scroll">
@@ -94,6 +94,8 @@
                </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"
@@ -105,9 +107,10 @@
                    <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,15 +494,16 @@ 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
+.nav-filter
+    border-top: 2rpx solid #EBEBEB;
+    padding: 16rpx 28rpx 0 28rpx;
+    margin-top: 125rpx;
    .filter-top
        display: flex
        justify-content: space-between;
--- 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,7 +22,7 @@
                不限区域
            </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">
@@ -64,20 +68,26 @@
                </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>
+                    <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,8 +334,11 @@ defineExpose({ loadData, handleFilterConfirm });
        padding: 0 20rpx 20rpx 20rpx;
        background: #f4f4f4
    }
-    .nav-filter
+
+// 筛选条件样式 - 顶级选择器
+.nav-filter
    padding: 16rpx 28rpx 0 28rpx
+    background: #ffffff
    .filter-top
        display: flex
        justify-content: space-between;
--- 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>
--- 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;
        }
+        const hasIdCard = idCard !== null && idCard !== undefined && idCard !== '';
        
-        // 优先从接口数据中获取职位信息
+        // 检查职位信息：优先从 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 {
+            // 信息完整，设置职位信息
+            if (hasJobTitle) {
+                currentJobName.value = jobTitles[0];
+            } else {
+                currentJobName.value = jobName;
                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 = ['请完善个人信息'];
-        } else {
-            remindList.value = ['暂无待完善信息'];
+            // 信息完整，直接显示页面内容
+            showContent.value = true;
+            return;
        }
        
        setTimeout(() => {
@@ -213,28 +234,66 @@ async function getRemindInfo() {
    } catch (error) {
        // 接口调用失败时，使用缓存作为降级方案
        const cachedUserInfo = uni.getStorageSync('userInfo') || {};
-        const idCard = cachedUserInfo?.resume?.idCard ?? cachedUserInfo?.idCard ?? null;
        
-        // 从缓存中获取职位信息
+        // 检查 idCard
+        const idCard = cachedUserInfo?.resume?.idCard ?? cachedUserInfo?.idCard ?? null;
+        const hasIdCard = idCard !== null && idCard !== undefined && idCard !== '';
+        
+        // 检查职位信息
+        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() !== '');
+        
+        // 检查技能标签
+        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 {
+            // 信息完整，设置职位信息
+            if (hasJobTitle) {
+                currentJobName.value = cachedJobTitles[0];
+            } else {
+                currentJobName.value = jobName;
                currentJobId.value = cachedUserInfo?.jobId ?? 
                                   cachedUserInfo?.currentJobId ?? 
                                   cachedUserInfo?.resume?.jobId ?? 
                                   cachedUserInfo?.resume?.currentJobId ?? 
                                   null;
-        currentJobName.value = cachedUserInfo?.jobName ?? 
-                               cachedUserInfo?.currentJobName ?? 
-                               cachedUserInfo?.resume?.jobName ?? 
-                               cachedUserInfo?.resume?.currentJobName ?? 
-                               '';
-        // 如果缓存中没有职位信息，使用默认值
-        if (!currentJobName.value) {
-            currentJobName.value = '市场专员';
            }
-        
-        if (!idCard || idCard === null || idCard === '') {
-            remindList.value = ['请完善个人信息'];
-        } else {
-            remindList.value = ['暂无待完善信息'];
+            // 信息完整，直接显示页面内容
+            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');
    } 
-    
-    // 如果 idCard 为空，才跳转到完善信息页面
-    if (!idCard || idCard === null || idCard === '') {
-        navTo('/pages/complete-info/complete-info');
-        return;
+    // 如果只缺少职位信息：直接跳转到职位信息页面
+    else if (!hasJobInfo) {
+        navTo('/packageA/pages/jobExpect/jobExpect');
    }
-    
-    // 如果 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 = '市场专员';
+    // 如果只缺少身份证信息：跳转到个人信息页面
+    else {
+        navTo('/packageA/pages/personalInfo/personalInfo');
    }
-    
-    showContent.value = true;
 }

 // 切换tab
@@ -300,18 +340,27 @@ function switchTab(index) {
    if (index === 0 && !currentJobId.value) {
        const cachedUserInfo = uni.getStorageSync('userInfo') || {};
        
-        const newJobId = cachedUserInfo?.jobId ?? 
-                         cachedUserInfo?.currentJobId ?? 
-                         cachedUserInfo?.resume?.jobId ?? 
-                         cachedUserInfo?.resume?.currentJobId ?? 
-                         null;
+        // 优先从缓存中的 jobTitles 数组获取职位信息（取第一个）
+        const cachedJobTitles = Array.isArray(cachedUserInfo?.jobTitles) ? cachedUserInfo.jobTitles : [];
+        let newJobName = '';
        
-        const newJobName = currentJobName.value || 
+        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;
        
        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(() => {
--- 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],
    () => {
+        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 {
--- 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 {
--- 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>
+                        <view class="skill-info">
+                            <text class="skill-score">技能分数: {{ skill.score }}</text>
                            <text class="skill-weight">权重: {{ skill.weight }}</text>
                        </view>
-                    <view class="skill-tags">
+                    </view>
+                    <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();
+const emit = defineEmits(['path-data-updated']);

-    // 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);
+// 当前职位（从父组件获取）
+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 [];
    }
+    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
        });
        
-    // 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);
+        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'
        });
    }
-    });
+}

-    // 3. 收集职业路径中的技能（发展路径技能，权重最高）
-    const pathSkills = [];
-    if (props.pathData.start && Array.isArray(props.pathData.start.skills)) {
-        pathSkills.push(...props.pathData.start.skills);
+async function fetchPathCount() {
+    try {
+        const response = await getJobPathNum();
+        totalPathCount.value = response?.data ?? 0;
+    } catch (error) {
+        totalPathCount.value = 0;
    }
-    if (Array.isArray(props.pathData.steps)) {
-        props.pathData.steps.forEach(step => {
-            if (Array.isArray(step.skills)) {
-                pathSkills.push(...step.skills);
+}
+
+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;
    }
+    
+    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: ''
        });
    }
-    if (props.pathData.end && Array.isArray(props.pathData.end.skills)) {
-        pathSkills.push(...props.pathData.end.skills);
+}
+
+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;
    }

-    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('路径技能');
+    const option = targetCareerOptions.value[selectedTargetIndex.value];
+    if (!option) {
+        uni.showToast({
+            title: '目标职业数据异常',
+            icon: 'none'
+        });
+        return;
    }
-            skillMap.set(skill, existing);
+
+    // 获取技能权重数据
+    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)); // 按权重降序
+    try {
+        const response = await getJobSkillWeight({
+            currentJobName: currentJob,
+            targetJobName: targetCareer
+        });
        
-    return result;
+        // 标记已经查询过
+        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 {
--- a/pages/service/guidance.vue
+++ 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>
--- 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
--- a/unpackage/dist/dev/mp-weixin/project.config.json
+++ b/unpackage/dist/dev/mp-weixin/project.config.json
@@ -21,8 +21,7 @@
    "disableUseStrict": false,
    "condition": false,
    "swc": false,
-        "disableSWC": true,
-        "ignoreUploadUnusedFiles": false
+    "disableSWC": true
  },
  "compileType": "miniprogram",
  "simulatorPluginLibVersion": {},
@@ -31,10 +30,6 @@
    "include": []
  },
  "appid": "wx4aa34488b965a331",
-    "editorSetting": {
-        "tabIndent": "insertSpaces",
-        "tabSize": 4
-    },
-    "libVersion": "3.11.1",
-    "condition": {}
+  "editorSetting": {},
+  "libVersion": "3.11.1"
 }
--- 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);
+                        }
+                    });
+                }
+            });
+        }
    }
 }

--- a/utils/request.js
+++ b/utils/request.js
@@ -217,19 +217,39 @@ export function myRequest(url, data = {}, method = 'GET', port = 9100, headers =
 						}
 						// 处理业务错误
 						if (resData.data?.code === 401 || resData.data?.code === 402) {
+							const pages = getCurrentPages();
+							if (pages.length >= 10) {
+								// 页面栈已满，使用redirectTo替代
+								uni.redirectTo({
+									url:'/packageB/login?flag=nw',
+									fail: (err) => {
+										console.error('页面跳转失败:', err);
+									}
+								});
+							} else {
 								uni.navigateTo({
-								url:'/packageB/login?flag=nw'
-							})
-							// navTo('/packageB/login?flag=nw');
+									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)
--- a/utilsRc/config.js
+++ b/utilsRc/config.js
@@ -26,11 +26,14 @@ let exports = {
 	// baseUrl: 'http://ks.zhaopinzao8dian.com/api/ks', // 已从根目录config.js引用，不再重复配置
 	
 	// ========== 职业图谱专用baseUrl ==========
-	zytpBaseUrl: 'http://ks.zhaopinzao8dian.com/api/ks_zytp/admin-api/zytp',
+	zytpBaseUrl: 'http://222.80.110.161:11111/career-map/api/ks_zytp/admin-api/zytp',
 	
-	// ========== 用户接口专用baseUrl（appUserInfo等接口使用） ==========
+	// ========== 用户接口专用baseUrl（其他用户接口使用） ==========
 	userBaseUrl: 'http://ks.zhaopinzao8dian.com/api/ks', // 用户相关接口使用根目录config.js的baseUrl
 	
+	// ========== appUserInfo接口专用baseUrl ==========
+	appUserInfoBaseUrl: 'http://222.80.110.161:11111/api/ks', // appUserInfo接口专用，与其他接口路径不一致
+


 	// 应用信息
--- 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 || ''))
Author	SHA1	Message	Date
xuchao	844ff8c582	fix:培训视频播放时长接口调用异常导致重复添加同一组数据bug	2025-12-10 18:45:43 +08:00
francis_fh	f5bd523985	Merge branch 'main' of http://124.243.245.42:3000/sdz/ks-app-employment-service	2025-12-09 17:53:46 +08:00
francis_fh	be47e94196	H5端显示三列岗位列表	2025-12-09 17:53:45 +08:00
hanguangpu01	99aea9e243	feat(careerfair): 优化招聘会页面加载逻辑 - 异步加载招聘会数据 - 移除调试代码 - 简化登录状态检查逻辑 - 优化 exhibitors 页面跳转条件判断 - 移除冗余的登录提示信息	2025-12-09 17:48:07 +08:00
francis_fh	aa4b185aa2	优化展示	2025-12-09 16:24:41 +08:00
francis_fh	92c6488d18	字典映射修改	2025-12-09 16:23:32 +08:00
francis_fh	f1c8d0457b	111	2025-12-09 16:16:21 +08:00
francis_fh	5378031a58	设置密码	2025-12-08 21:54:30 +08:00
francis_fh	d2f61bcc45	岗位对比修改	2025-12-08 21:38:38 +08:00
francis_fh	d79d79f750	111	2025-12-08 21:31:18 +08:00
francis_fh	40127060b8	Merge branch 'main' of http://124.243.245.42:3000/sdz/ks-app-employment-service	2025-12-08 21:20:34 +08:00
francis_fh	16d1e50c85	bug修复	2025-12-08 21:20:33 +08:00
hanguangpu01	6006f5cd28	feat(auth): 实现第三方登录集成 - 在 careerfair.vue 中新增 thirdLogin 方法处理单点登录逻辑 - 修改 goDetail 方法，在跳转前执行第三方登录验证 - 在 packageB/train/index.vue 中增加 onLoad 钩子调用 thirdLogin - 修改 jumps 方法，确保页面跳转前完成登录验证 - 在 request.js 中注释掉全局错误提示，避免重复提示 - 优化 videoDetail.vue 中的 getHeart 方法，移除冗余跳转逻辑 - 在 videoList.vue 中新增 playVideo 前的登录校验 - 统一多个页面中的 thirdLogin 实现，确保登录态一致性	2025-12-08 21:17:05 +08:00
佳	d78382ba08	Merge remote-tracking branch 'origin/main' into CareerMap	2025-12-08 20:24:39 +08:00
佳	a74cdcc850	Fix career map missing info redirect flow	2025-12-08 20:22:40 +08:00
shirlwang	d89b566ad3	修改政策	2025-12-08 16:11:01 +08:00
shirlwang	3c66e16e49	Merge branch 'main' of http://124.243.245.42:3000/sdz/ks-app-employment-service	2025-12-08 16:02:20 +08:00
shirlwang	ccbb5008bd	修改跳转	2025-12-08 16:01:34 +08:00
佳	bc48d7fff0	fix:修改跳转逻辑	2025-12-05 17:59:37 +08:00
francis_fh	6baacfcf20	Merge branch 'main' of http://124.243.245.42:3000/sdz/ks-app-employment-service	2025-12-05 17:11:56 +08:00
sh	e290340b8c	Merge branch 'CareerMap' # Conflicts: # config.js	2025-12-05 17:07:38 +08:00
francis_fh	c4f7d6d998	服务指导页面优化	2025-12-05 17:06:22 +08:00
佳	fa7749da9d	fix: 更新 appUserInfo 完整地址	2025-12-05 17:02:44 +08:00
francis_fh	b2016378fb	服务指导页面开发	2025-12-05 17:01:50 +08:00
francis_fh	a812c7b1d6	Merge branch 'main' of http://124.243.245.42:3000/sdz/ks-app-employment-service	2025-12-05 16:29:49 +08:00
francis_fh	85a6066494	优化页面栈	2025-12-05 16:29:47 +08:00
hanguangpu01	ad69929666	Merge branch 'main' of http://124.243.245.42:3000/sdz/ks-app-employment-service	2025-12-05 16:21:00 +08:00
hanguangpu01	75a8edad10	feat(video): 优化视频详情页加载逻辑 - 添加 v-if 条件渲染确保视频封面存在时才加载视频组件 - 设置 preload="metadata" 提高页面初始加载性能 - 保留原有事件监听器和样式配置	2025-12-05 16:20:56 +08:00
francis_fh	27b2b721d3	Merge branch 'CareerMap'	2025-12-05 16:11:22 +08:00
francis_fh	0fbba1d868	附近页面滚动问题修复	2025-12-05 13:31:15 +08:00
francis_fh	ed077fd93c	Merge branch 'main' of http://124.243.245.42:3000/sdz/ks-app-employment-service	2025-12-05 11:26:08 +08:00
francis_fh	d76b8b664e	1	2025-12-05 11:26:05 +08:00
lintiantian	2880e674a2	Merge branch 'main' of http://124.243.245.42:3000/sdz/ks-app-employment-service	2025-12-04 19:51:00 +08:00
lintiantian	f20efdaa0a	优化素质测评功能体验	2025-12-04 19:50:47 +08:00
佳	f8b9d3730b	feat: 完善职业图谱功能	2025-12-04 14:38:54 +08:00
佳	7ae6d8f340	feat: 更新职业图谱接口配置和appUserInfo接口路径	2025-11-27 19:10:42 +08:00
佳	7f00dc69a8	merge: 合并 main 分支最新代码到 careermap	2025-11-13 10:52:38 +08:00