diff --git a/components/renderJobs/renderJobs.vue b/components/renderJobs/renderJobs.vue index 29ff2e8..3354ce2 100644 --- a/components/renderJobs/renderJobs.vue +++ b/components/renderJobs/renderJobs.vue @@ -77,7 +77,7 @@ function nextDetail(job) { const recordData = recommedIndexDb.JobParameter(job); recommedIndexDb.addRecord(recordData); } - navTo(`/packageA/pages/post/post?jobId=${encodeURIComponent(job.jobId)}`); + navTo(`/packageA/pages/post/post?jobId=${encodeURIComponent(job.jobId)}&encryptJobId=${encodeURIComponent(job.encryptJobId)}`); } diff --git a/components/renderJobs/renderJobsCheckBox.vue b/components/renderJobs/renderJobsCheckBox.vue index c45a053..f163442 100644 --- a/components/renderJobs/renderJobsCheckBox.vue +++ b/components/renderJobs/renderJobsCheckBox.vue @@ -103,7 +103,7 @@ function nextDetail(job) { const recordData = recommedIndexDb.JobParameter(job); recommedIndexDb.addRecord(recordData); } - navTo(`/packageA/pages/post/post?jobId=${encodeURIComponent(job.jobId)}`); + navTo(`/packageA/pages/post/post?jobId=${encodeURIComponent(job.jobId)}&encryptJobId=${encodeURIComponent(job.encryptJobId)}`); } function toggleSelect(jobId) { @@ -122,7 +122,7 @@ function handleCardClick(job, e) { const recordData = recommedIndexDb.JobParameter(job); recommedIndexDb.addRecord(recordData); } - navTo(`/packageA/pages/post/post?jobId=${encodeURIComponent(job.jobId)}`); + navTo(`/packageA/pages/post/post?jobId=${encodeURIComponent(job.jobId)}&encryptJobId=${encodeURIComponent(job.encryptJobId)}`); } // 新增:提供选中状态和切换方法给父组件 diff --git a/packageA/pages/Intendedposition/Intendedposition.vue b/packageA/pages/Intendedposition/Intendedposition.vue index d70d315..a1dedbb 100644 --- a/packageA/pages/Intendedposition/Intendedposition.vue +++ b/packageA/pages/Intendedposition/Intendedposition.vue @@ -41,8 +41,8 @@ onReachBottom(() => { getJobList(); }); -function navToPost(jobId) { - navTo(`/packageA/pages/post/post?jobId=${encodeURIComponent(jobId)}`); +function navToPost(job) { + navTo(`/packageA/pages/post/post?jobId=${encodeURIComponent(job.jobId)}&encryptJobId=${encodeURIComponent(job.encryptJobId)}`); } function getJobList(type = 'add') { diff --git a/packageA/pages/browseJob/browseJob.vue b/packageA/pages/browseJob/browseJob.vue index a130eb8..744f31d 100644 --- a/packageA/pages/browseJob/browseJob.vue +++ b/packageA/pages/browseJob/browseJob.vue @@ -83,8 +83,8 @@ function toSelectDate() { }); } -function navToPost(jobId) { - navTo(`/packageA/pages/post/post?jobId=${encodeURIComponent(jobId)}`); +function navToPost(job) { + navTo(`/packageA/pages/post/post?jobId=${encodeURIComponent(job.jobId)}&encryptJobId=${encodeURIComponent(job.encryptJobId)}`); } function searchCollection(e) { diff --git a/packageA/pages/cancelApplication/cancelApplication.vue b/packageA/pages/cancelApplication/cancelApplication.vue index d2a45d1..b590770 100644 --- a/packageA/pages/cancelApplication/cancelApplication.vue +++ b/packageA/pages/cancelApplication/cancelApplication.vue @@ -47,8 +47,8 @@ onReachBottom(() => { getJobList(); }); -function navToPost(jobId) { - navTo(`/packageA/pages/post/post?jobId=${encodeURIComponent(jobId)}`); +function navToPost(job) { + navTo(`/packageA/pages/post/post?jobId=${encodeURIComponent(job.jobId)}&encryptJobId=${encodeURIComponent(job.encryptJobId)}`); } function getJobList(type = 'add') { diff --git a/packageA/pages/post/component/radarMap.vue b/packageA/pages/post/component/radarMap.vue index 012a53f..2cfa317 100644 --- a/packageA/pages/post/component/radarMap.vue +++ b/packageA/pages/post/component/radarMap.vue @@ -1,13 +1,12 @@ - + diff --git a/packageA/pages/post/post.vue b/packageA/pages/post/post.vue index 82d3f5e..62ee99b 100644 --- a/packageA/pages/post/post.vue +++ b/packageA/pages/post/post.vue @@ -271,6 +271,7 @@ const jobInfo = ref({}); const state = reactive({}); const mapCovers = ref([]); const jobIdRef = ref(); +const jobId = ref(); // 竞争力分析数据,初始化为包含默认值的完整结构,确保雷达图能正常渲染 const raderData = ref({ matchScore: 0, @@ -293,7 +294,7 @@ const showConfirmDialog = ref(false); onLoad((option) => { console.log(option, 'option'); - if (option.jobId) { + if (option.encryptJobId) { initLoad(option); } }); @@ -303,7 +304,7 @@ onShow(() => { // #ifdef H5 try { const option = parseQueryParams(); // 兼容微信内置浏览器 - if (option.jobId) { + if (option.encryptJobId) { initLoad(option); } } catch (e) { @@ -312,10 +313,13 @@ onShow(() => { // #endif }); function initLoad(option) { - const jobId = decodeURIComponent(option.jobId); - if (jobId !== jobIdRef.value) { - jobIdRef.value = jobId; - getDetail(jobId); + const encryptJobId = decodeURIComponent(option.encryptJobId); + if (option.jobId) { + jobId.value = decodeURIComponent(option.jobId); + } + if (encryptJobId !== jobIdRef.value) { + jobIdRef.value = encryptJobId; + getDetail(encryptJobId); } } @@ -327,17 +331,17 @@ function seeExplain() { } } -function getDetail(jobId) { +function getDetail(encryptJobId) { return new Promise((reslove, reject) => { - $api.createRequest(`/app/job/${jobId}`).then((resData) => { + $api.createRequest(`/app/job/${encryptJobId}`).then((resData) => { const { latitude, longitude, companyName, companyId } = resData.data; jobInfo.value = resData.data; reslove(resData.data); getCompanyIsAJobs(companyId); if (currentUserType.value !== 0) { - getCompetivetuveness(jobId); + getCompetivetuveness(encryptJobId); } - // getCompetivetuveness(jobId); + // getCompetivetuveness(encryptJobId); if (latitude && longitude) { mapCovers.value = [ { @@ -379,8 +383,8 @@ function getTextWidth(text, size = 12) { return -(estimatedWidth / 2) - 20; // 计算文字中心点 } -function getCompetivetuveness(jobId) { - $api.createRequest(`/app/job/competitiveness/${jobId}`, {}, 'GET').then((resData) => { +function getCompetivetuveness(encryptJobId) { + $api.createRequest(`/app/job/competitiveness/${encryptJobId}`, {}, 'GET').then((resData) => { // 如果接口返回的数据为 null 或空,使用默认值0 if (resData && resData.data) { // 确保 radarChart 字段存在,如果不存在则使用默认值 @@ -455,19 +459,20 @@ function hideDialog() { // 确认操作 function confirmAction() { - const jobId = jobInfo.value.jobId; + const encryptJobId = jobIdRef.value; if (jobInfo.value.isApply === 1) { // 取消投递 - $api.createRequest(`/app/job/applyJobCencal`, { jobId }, 'DELETE').then((resData) => { + const cancelJobId = jobId.value || jobInfo.value.jobId; + $api.createRequest(`/app/job/applyJobCencal`, { jobId: cancelJobId }, 'DELETE').then((resData) => { $api.msg('取消投递成功'); - getDetail(jobId); // 刷新职位信息 + getDetail(encryptJobId); // 刷新职位信息 showConfirmDialog.value = false; }); } else { // 确认投递 - $api.createRequest(`/app/job/apply/${jobId}`, {}, 'GET').then((resData) => { + $api.createRequest(`/app/job/apply/${encryptJobId}`, {}, 'GET').then((resData) => { $api.msg('申请成功'); - getDetail(jobId); // 刷新职位信息 + getDetail(encryptJobId); // 刷新职位信息 showConfirmDialog.value = false; }); } @@ -475,8 +480,8 @@ function confirmAction() { // 确认投递 function confirmApply() { - const jobId = jobInfo.value.jobId; - $api.createRequest(`/app/job/apply/${jobId}`, {}, 'GET').then((resData) => { + const encryptJobId = jobIdRef.value; + $api.createRequest(`/app/job/apply/${encryptJobId}`, {}, 'GET').then((resData) => { $api.msg('申请成功'); const jobUrl = jobInfo.value.jobUrl; // return window.open(jobUrl); @@ -486,8 +491,8 @@ function confirmApply() { // 取消投递 function cancelApply() { - const jobId = jobInfo.value.jobId; - $api.createRequest(`/app/job/applyJobCencal`, { jobId }, 'DELETE').then((resData) => { + const cancelJobId = jobId.value || jobInfo.value.jobId; + $api.createRequest(`/app/job/applyJobCencal`, { jobId: cancelJobId }, 'DELETE').then((resData) => { $api.msg('取消投递成功'); showConfirmDialog.value = false; }); @@ -495,15 +500,15 @@ function cancelApply() { // 取消/收藏岗位 function jobCollection() { - const jobId = jobInfo.value.jobId; + const encryptJobId = jobIdRef.value; if (jobInfo.value.isCollection) { - $api.createRequest(`/app/job/collection/${jobId}`, {}, 'DELETE').then((resData) => { - getDetail(jobId); + $api.createRequest(`/app/job/collection/${encryptJobId}`, {}, 'DELETE').then((resData) => { + getDetail(encryptJobId); $api.msg('取消收藏成功'); }); } else { - $api.createRequest(`/app/job/collection/${jobId}`, {}, 'POST').then((resData) => { - getDetail(jobId); + $api.createRequest(`/app/job/collection/${encryptJobId}`, {}, 'POST').then((resData) => { + getDetail(encryptJobId); $api.msg('收藏成功'); }); } diff --git a/packageB/login2.vue b/packageB/login2.vue index e861618..7f9c4d6 100644 --- a/packageB/login2.vue +++ b/packageB/login2.vue @@ -1,18 +1,64 @@