diff --git a/components/renderCompanys/renderCompanys.vue b/components/renderCompanys/renderCompanys.vue index 5a1456d..0310e6f 100644 --- a/components/renderCompanys/renderCompanys.vue +++ b/components/renderCompanys/renderCompanys.vue @@ -2,17 +2,18 @@ - {{ job.name }} + {{ job.gsmc }} - - - - + + + + {{job.gsxy}} - + 在招职位· - {{ job.totalRecruitment || '-' }} + {{ job.zzgwsl || '-' }} 个 @@ -20,10 +21,14 @@ + {{ vacanciesTo(job.vacancies) }} + + {{job.qyxz}} + @@ -51,6 +56,10 @@ const props = defineProps({ type: String, default: '', }, + zphId: { + type: String, + default: '', + }, }); const listData = computed(() => { @@ -58,7 +67,7 @@ const listData = computed(() => { }); function nextDetail(company) { - navTo(`/packageA/pages/UnitDetails/UnitDetails?companyId=${company.companyId}`); + navTo(`/packageA/pages/UnitDetails/UnitDetails?companyId=${company.gsID}&companyName=${company.gsmc}&zphId=${props.zphId}`); } @@ -119,7 +128,7 @@ function nextDetail(company) { } } .card-bottom{ - margin-top: 4rpx + margin-top: 15rpx margin-bottom: 10rpx display: flex justify-content: space-between diff --git a/components/renderJobs/renderJobs.vue b/components/renderJobs/renderJobs.vue index 08372b6..1f67ae3 100644 --- a/components/renderJobs/renderJobs.vue +++ b/components/renderJobs/renderJobs.vue @@ -2,33 +2,33 @@ - {{ job.jobTitle }} + {{ job.gwmc }} - {{ job.companyName }} + {{ job.gsmc }} - + {{job.xlyq == '不限' ? '学历不限' : job.xlyq}} - + {{job.gwgzjy == '不限' ? '经验不限' : job.gwgzjy}} - {{ vacanciesTo(job.vacancies) }} + {{ vacanciesTo(job.zprs) }} - {{ job.postingDate }} + {{ parseDateTime(job.createTime).date }} - - + --> @@ -77,7 +77,25 @@ function nextDetail(job) { const recordData = recommedIndexDb.JobParameter(job); recommedIndexDb.addRecord(recordData); } - navTo(`/packageA/pages/post/post?jobId=${btoa(job.jobId)}`); + navTo(`/packageA/pages/post/post?jobId=${btoa(job.id)}`); +} +function parseDateTime(datetimeStr) { + if (!datetimeStr) return { time: '', date: '' }; + + const dateObj = new Date(datetimeStr); + + if (isNaN(dateObj.getTime())) return { time: '', date: '' }; // 无效时间 + + const year = dateObj.getFullYear(); + const month = String(dateObj.getMonth() + 1).padStart(2, '0'); + const day = String(dateObj.getDate()).padStart(2, '0'); + const hours = String(dateObj.getHours()).padStart(2, '0'); + const minutes = String(dateObj.getMinutes()).padStart(2, '0'); + + return { + time: `${hours}:${minutes}`, + date: `${year}-${month}-${day}`, + }; } diff --git a/packageA/pages/UnitDetails/UnitDetails.vue b/packageA/pages/UnitDetails/UnitDetails.vue index 633857a..f1b92b1 100644 --- a/packageA/pages/UnitDetails/UnitDetails.vue +++ b/packageA/pages/UnitDetails/UnitDetails.vue @@ -21,7 +21,7 @@ - {{ companyInfo?.name }} + {{ companyInfo?.gsmc }}   + {{companyInfo.gsxy}} 公司介绍 - {{ companyInfo.description }} + {{ companyInfo.qyxz }} @@ -47,7 +48,8 @@ src="@/static/icon/downs.png" > - + + 在招职位 { console.log(options); - getCompanyInfo(options.companyId || options.bussinessId); + getCompanyInfo(options.companyId,options.companyName,options.zphId); }); function companyCollection() { - const companyId = companyInfo.value.companyId; + const companyId = companyInfo.value.gsID; if (companyInfo.value.isCollection) { $api.createRequest(`/app/company/collection/${companyId}`, {}, 'DELETE').then((resData) => { - getCompanyInfo(companyId); + // getCompanyInfo(companyId); $api.msg('取消收藏成功'); }); } else { $api.createRequest(`/app/company/collection/${companyId}`, {}, 'POST').then((resData) => { - getCompanyInfo(companyId); + // getCompanyInfo(companyId); $api.msg('收藏成功'); }); } } -function getCompanyInfo(id) { - $api.createRequest(`/app/company/${id}`).then((resData) => { +function getCompanyInfo(companyId,companyName,zphId) { + $api.createRequest(`/app/internal/companyThirdPart/${companyId}`).then((resData) => { companyInfo.value = resData.data; - getJobsList(); + getJobsList(companyId,companyName,zphId); }); } -function getJobsList(type = 'add') { +function getJobsList(companyId,companyName,zphId,type='add') { if (type === 'refresh') { pageState.page = 1; pageState.maxPage = 1; @@ -122,13 +124,14 @@ function getJobsList(type = 'add') { current: pageState.page, pageSize: pageState.pageSize, }; - $api.createRequest(`/app/company/job/${companyInfo.value.companyId}`, params).then((resData) => { + $api.createRequest(`/app/internal/jobThirdPart?gsID=${companyId}&gsmc=${companyName}&zphID=${zphId}`, ).then((resData) => { const { rows, total } = resData; if (type === 'add') { - const str = pageState.pageSize * (pageState.page - 1); - const end = pageState.list.length; - const reslist = rows; - pageState.list.splice(str, end, ...reslist); + // const str = pageState.pageSize * (pageState.page - 1); + // const end = pageState.list.length; + // const reslist = rows; + // pageState.list.splice(str, end, ...reslist); + pageState.list = rows } else { pageState.list = rows; } diff --git a/packageA/pages/exhibitors/exhibitors.vue b/packageA/pages/exhibitors/exhibitors.vue index e6872cb..82a649b 100644 --- a/packageA/pages/exhibitors/exhibitors.vue +++ b/packageA/pages/exhibitors/exhibitors.vue @@ -11,15 +11,15 @@ - {{ fairInfo?.name }} + {{ fairInfo?.zphmc }} - {{ fairInfo.location }} - {{ fairInfo.jbf }} + @@ -27,36 +27,36 @@ - {{ fairInfo.address }} - 位置 + {{ fairInfo.zphdz }} + 内容描述 - {{ fairInfo.description }} + {{ fairInfo.zphjj }} 内容描述 - {{ parseDateTime(fairInfo.startTime).time }} - {{ parseDateTime(fairInfo.startTime).date }} + {{ parseDateTime(fairInfo.zphjbsj).time }} + {{ parseDateTime(fairInfo.zphjbsj).date }} - {{ getTimeStatus(fairInfo.startTime, fairInfo.endTime).statusText }} + {{ getTimeStatus(fairInfo.zphjbsj, fairInfo.zphjzsj).statusText }} - {{ getHoursBetween(fairInfo.startTime, fairInfo.endTime) }}小时 + {{ getHoursBetween(fairInfo.zphjbsj, fairInfo.zphjzsj) }}小时 - {{ parseDateTime(fairInfo.endTime).time }} - {{ parseDateTime(fairInfo.endTime).date }} + {{ parseDateTime(fairInfo.zphjzsj).time }} + {{ parseDateTime(fairInfo.zphjzsj).date }} @@ -76,6 +76,7 @@ { - getCompanyInfo(options.jobFairId); + zphId.value = options.jobFairId + getJobFairInfo(options.jobFairId, options.jobFairName); + getCompanyInfo(options.jobFairId, options.jobFairName); }); -function getCompanyInfo(id) { - $api.createRequest(`/app/fair/${id}`).then((resData) => { +function getJobFairInfo(id,name) { + $api.createRequest(`/app/internal/jobFairThirdPart/${id}`).then((resData) => { fairInfo.value = resData.data; - companyList.value = resData.data.companyList; hasAppointment(); }); } +function getCompanyInfo(id,name) { + $api.createRequest(`/app/internal/companyThirdPart/?zphID=${id}&zphmc=${name}`).then((resData) => { + companyList.value = resData.rows; + }); +} const hasAppointment = () => { const isTimePassed = (timeStr) => { diff --git a/packageA/pages/post/post.vue b/packageA/pages/post/post.vue index 5551afb..d593bae 100644 --- a/packageA/pages/post/post.vue +++ b/packageA/pages/post/post.vue @@ -23,20 +23,26 @@ :is-month="true" > - {{ jobInfo.jobTitle }} + {{ jobInfo.gwmc }} - + + + {{jobInfo.xlyq == '不限' ? '学历不限' : jobInfo.xlyq}} - + + + {{jobInfo.gwgzjy == '不限' ? '经验不限' : jobInfo.gwgzjy}} 来源  - {{ jobInfo.dataSource }} + 青岛人才网 @@ -53,7 +59,7 @@ 职位描述 - {{ jobInfo.description }} + {{ jobInfo.gwms }} @@ -61,7 +67,7 @@ 公司信息 单位详情 @@ -71,7 +77,7 @@ - {{ jobInfo.company?.name }} + {{ jobInfo.gsmc }}   + {{jobInfo.qyxz}} 在招 @@ -187,12 +194,13 @@ function seeExplain() { function getDetail(jobId) { return new Promise((reslove, reject) => { - $api.createRequest(`/app/job/${jobId}`).then((resData) => { - const { latitude, longitude, companyName, companyId } = resData.data; + $api.createRequest(`/app/internal/jobThirdPart/${jobId}`).then((resData) => { + const { gsID, gsmc, zphID} = resData.data; jobInfo.value = resData.data; reslove(resData.data); - getCompanyIsAJobs(companyId); - getCompetivetuveness(jobId); + getCompanyIsAJobs(gsID, gsmc, zphID); + // getCompetivetuveness(jobId); + return if (latitude && longitude) { mapCovers.value = [ { @@ -216,9 +224,9 @@ function getDetail(jobId) { }); } -function getCompanyIsAJobs(companyId) { - $api.createRequest(`/app/company/count/${companyId}`).then((resData) => { - companyCount.value = resData.data; +function getCompanyIsAJobs(gsID, gsmc, zphID) { + $api.createRequest(`/app/internal/jobThirdPart?gsID=${gsID}&gsmc=${gsmc}&zphID=${zphID}`).then((resData) => { + companyCount.value = resData.total; }); } @@ -238,7 +246,7 @@ function getCompetivetuveness(jobId) { // 申请岗位 function jobApply() { - const jobId = jobInfo.value.jobId; + const jobId = jobInfo.value.id; if (jobInfo.value.isApply) { const jobUrl = jobInfo.value.jobUrl; return window.open(jobUrl); diff --git a/pages/careerfair/careerfair copy.vue b/pages/careerfair/careerfair copy.vue new file mode 100644 index 0000000..0abc265 --- /dev/null +++ b/pages/careerfair/careerfair copy.vue @@ -0,0 +1,545 @@ + + + + + diff --git a/pages/careerfair/careerfair.vue b/pages/careerfair/careerfair.vue index a6754a7..4fe0789 100644 --- a/pages/careerfair/careerfair.vue +++ b/pages/careerfair/careerfair.vue @@ -13,7 +13,7 @@ - + @@ -42,42 +42,42 @@ class="card press-button" v-for="(item, index) in fairList" :key="index" - @click="navTo('/packageA/pages/exhibitors/exhibitors?jobFairId=' + item.jobFairId)" + @click="navTo('/packageA/pages/exhibitors/exhibitors?jobFairId=' + item.zphID + '&jobFairName=' + item.zphmc)" > - {{ item.name }} + {{ item.zphmc }} - {{ item.location }} + {{ item.jbf }} - + > --> - {{ parseDateTime(item.startTime).time }} - {{ parseDateTime(item.startTime).date }} + {{ parseDateTime(item.zphjbsj).time }} + {{ parseDateTime(item.zphjbsj).date }} - {{ getTimeStatus(item.startTime, item.endTime).statusText }} + {{ getTimeStatus(item.zphjbsj, item.zphjzsj).statusText }} - {{ getHoursBetween(item.startTime, item.endTime) }}小时 + {{ getHoursBetween(item.zphjbsj, item.zphjzsj) }}小时 - {{ parseDateTime(item.endTime).time }} - {{ parseDateTime(item.endTime).date }} + {{ parseDateTime(item.zphjzsj).time }} + {{ parseDateTime(item.zphjzsj).date }} - 内容简介：{{ item.description }} + 内容简介：{{ item.zphjj }} @@ -95,7 +95,7 @@ import Tabbar from '@/components/tabbar/midell-box.vue'; import useLocationStore from '@/stores/useLocationStore'; import { storeToRefs } from 'pinia'; const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore()); -const { $api, navTo, cloneDeep } = inject('globalFunction'); +const { $api, navTo, cloneDeep,debounce } = inject('globalFunction'); const weekList = ref([]); const fairList = ref([]); const currentDay = ref({}); @@ -108,7 +108,7 @@ const pageState = reactive({ total: 0, maxPage: 2, pageSize: 10, - search: {}, + zphmc:'' }); onLoad(() => { @@ -122,6 +122,7 @@ onLoad(() => { startDate: currentDate, }); weekList.value = result; + currentDay.value.fullDate = result[0].fullDate getFair('refresh'); }); @@ -161,10 +162,12 @@ function seemsg(index) { } const handleScrollToLower = () => { + return getFair(); console.log('触底'); }; + function getFair(type = 'add') { if (type === 'refresh') { pageState.page = 1; @@ -174,21 +177,24 @@ function getFair(type = 'add') { pageState.page += 1; } let params = { - ...pageState.search, - current: pageState.page, - pageSize: pageState.pageSize, + zphmc:pageState.zphmc, + // current: pageState.page, + // pageSize: pageState.pageSize, }; + // if (currentDay.value?.fullDate) { + // params.queryDate = currentDay.value.fullDate; + // } if (currentDay.value?.fullDate) { - params.queryDate = currentDay.value.fullDate; + params.zphjbsj = currentDay.value.fullDate.replace(/-/g, ''); } - $api.createRequest('/app/fair', params).then((resData) => { + $api.createRequest('/app/internal/jobFairThirdPart', params).then((resData) => { const { rows, total } = resData; - console.log(rows); if (type === 'add') { - const str = pageState.pageSize * (pageState.page - 1); - const end = fairList.value.length; - const reslist = rows; - fairList.value.splice(str, end, ...reslist); + // const str = pageState.pageSize * (pageState.page - 1); + // const end = fairList.value.length; + // const reslist = rows; + // fairList.value.splice(str, end, ...reslist); + fairList.value = rows } else { fairList.value = rows; }