diff --git a/packageB/jobFair/detailPerson.vue b/packageB/jobFair/detailPerson.vue index f9e8557..1c44d63 100644 --- a/packageB/jobFair/detailPerson.vue +++ b/packageB/jobFair/detailPerson.vue @@ -323,46 +323,59 @@ const deliveringJobs = reactive({}); // 岗位投递 function deliverResume(job) { - if(deliveringJobs[job.jobId]) return - deliveringJobs[job.jobId] = true - const raw = uni.getStorageSync("Padmin-Token"); - const token = typeof raw === "string" ? raw.trim() : ""; - const headers = token ? { - Authorization: raw.startsWith("Bearer ") ? raw : `Bearer ${token}` - } : {}; - - $api.myRequest("/dashboard/auth/heart", {}, "POST", 10100, headers).then((resData1) => { - if (resData1.code == 200) { - $api.myRequest("/system/user/login/user/info", {}, "GET", 10100, headers).then((resData) => { - $api.myRequest("/jobfair/public/job-fair-person-job/insert", { - jobFairId: job.jobFairId, // 招聘会id - personId: resData.info.userId, // 当前登录用户id - enterpriseId: job.companyId, // 企业id - jobId: job.jobId, // 岗位id - idCard:resData.info.personCardNo - }, "post", 9100, { - "Content-Type": "application/json" - }).then((data) => { - if (data && data.code === 200) { - $api.msg("简历投递成功"); - if (!job.jobFairPersonJob) { - job.jobFairPersonJob = {}; - } - job.jobFairPersonJob.status = "1"; - getList(false); + uni.showModal({ + title: "提示", + content: "请确认是否投递简历？", + showCancel: true, + confirmText: "确定", + cancelText: "取消", + success: (res) => { + if(res.confirm){ + if(deliveringJobs[job.jobId]) return + deliveringJobs[job.jobId] = true + const raw = uni.getStorageSync("Padmin-Token"); + const token = typeof raw === "string" ? raw.trim() : ""; + const headers = token ? { + Authorization: raw.startsWith("Bearer ") ? raw : `Bearer ${token}` + } : {}; + + $api.myRequest("/dashboard/auth/heart", {}, "POST", 10100, headers).then((resData1) => { + if (resData1.code == 200) { + $api.myRequest("/system/user/login/user/info", {}, "GET", 10100, headers).then((resData) => { + $api.myRequest("/jobfair/public/job-fair-person-job/insert", { + jobFairId: job.jobFairId, // 招聘会id + personId: resData.info.userId, // 当前登录用户id + enterpriseId: job.companyId, // 企业id + jobId: job.jobId, // 岗位id + idCard:resData.info.personCardNo + }, "post", 9100, { + "Content-Type": "application/json" + }).then((data) => { + if (data && data.code === 200) { + $api.msg("简历投递成功"); + if (!job.jobFairPersonJob) { + job.jobFairPersonJob = {}; + } + job.jobFairPersonJob.status = "1"; + getList(false); + } else { + $api.msg((data && data.msg) || "简历投递失败"); + } + deliveringJobs[job.jobId] = false + }); + }); } else { - $api.msg((data && data.msg) || "简历投递失败"); + $api.msg('请先登录'); + deliveringJobs[job.jobId] =false } - deliveringJobs[job.jobId] = false + }).catch(() => { + deliveringJobs[job.jobId] =false; }); - }); - } else { - $api.msg('请先登录'); - deliveringJobs[job.jobId] =false + } + } - }).catch(() => { - deliveringJobs[job.jobId] =false; - }); + }) + } // 提交面试邀请 diff --git a/packageB/train/practice/startPracticing.vue b/packageB/train/practice/startPracticing.vue index 76ee4dc..7b722c2 100644 --- a/packageB/train/practice/startPracticing.vue +++ b/packageB/train/practice/startPracticing.vue @@ -109,7 +109,7 @@
题号
×
-
+
{{index+1}}
diff --git a/packageB/train/practice/startPracticingList.vue b/packageB/train/practice/startPracticingList.vue index 1c11977..8013433 100644 --- a/packageB/train/practice/startPracticingList.vue +++ b/packageB/train/practice/startPracticingList.vue @@ -126,10 +126,11 @@ function getDataList(type = 'add') { pageSize:pageSize.value, pageNum:pageNum.value } - $api.myRequest('/train/public/trainVideo/trainVideoList', params).then((resData) => { + $api.myRequest('/train/public/trainQuestion/getQuestionTypes', params).then((resData) => { dataList.value=dataList.value.concat(resData.rows) totalNum.value=resData.total }); + } } diff --git a/packageCa/utilCa/config.js b/packageCa/utilCa/config.js index 8e26f3e..19f84d5 100644 --- a/packageCa/utilCa/config.js +++ b/packageCa/utilCa/config.js @@ -1,10 +1,10 @@ -let baseUrl = "" -// #ifdef MP-WEIXIN -// 编译项目，因为使用插件lime-echart，echart文件过大，需要非压缩代码方式编译，不然会很慢，发布的时候才压缩代码方式编译 +// let baseUrl = "" +// // #ifdef MP-WEIXIN +// // 编译项目，因为使用插件lime-echart，echart文件过大，需要非压缩代码方式编译，不然会很慢，发布的时候才压缩代码方式编译 -baseUrl = 'https://www.xjksly.cn/career' // 生产环境 -// #endif +// baseUrl = 'https://www.xjksly.cn/career' // 生产环境 +// // #endif -export { - baseUrl -} +// export { +// baseUrl +// } diff --git a/packageCa/utilCa/request.js b/packageCa/utilCa/request.js index db0294a..b5dd4f7 100644 --- a/packageCa/utilCa/request.js +++ b/packageCa/utilCa/request.js @@ -1,5 +1,5 @@ -import { baseUrl} from './config.js' - +// const baseUrl = "https://localhost:7026/career"; +const baseUrl = "https://www.xjksly.cn/career"; const request = {} const headers = {} diff --git a/pages/careerfair/careerfair.vue b/pages/careerfair/careerfair.vue index db9a562..32d3274 100644 --- a/pages/careerfair/careerfair.vue +++ b/pages/careerfair/careerfair.vue @@ -22,9 +22,65 @@ @click="getFair('refresh')"> + 筛选 + + + + + + + + + + + {{ item.label }} + + + + + + + + + + 重置 + 确认 + + + @@ -151,10 +207,57 @@ onShow(() => { // 更新自定义tabbar选中状态 tabbarManager.updateSelected(1); + getoptions(); });// - - - + //筛选 + const filterOptions = ref([]); + const activeTab = ref(''); + const selectFilterModel = ref(null); + const selectedValues = ref(null); + function openFilter() { + selectFilterModel.value?.open(); + } + const scrollTo = (key) => { + activeTab.value = key; + }; + + const handleSelect = (e) => { + selectedValues.value = e.detail.value + }; + function cleanup(){ + selectedValues.value = null + confirm() + } + function confirm(){ + getFair("refresh"); + selectFilterModel.value?.close(); + } + function getoptions() { + let headers = { + 'Content-Type': 'application/x-www-form-urlencoded', + } + let params = { + dictType:'administrative_division', + dictParentValue:'653100000000', + childFlag:'1', + } + filterOptions.value = [{ + label: '所在区域', + key: 'area', + options: [] + }]; + $api.myRequest('/system/public/dict/data/getByParentValue',params,'POST',9100,headers).then(res=>{ + if (res.code == 200) { + filterOptions.value[0].options = res.data.map(item=>{ + return { + label: item.dictLabel, + value: item.dictValue, + } + }) + } + }) + activeTab.value = 'area'; + } async function thirdLogin(needToast){ let form={} if (uni.getStorageSync('userInfo') && (uni.getStorageSync('userInfo').isCompanyUser=='1' || uni.getStorageSync('userInfo').isCompanyUser=='2')) { @@ -339,11 +442,27 @@ // 正确映射响应为用户信息（优先使用 data 字段） const data = resData?.data ?? resData; userInfo.value = data || {}; + if(data?.info?.entCreditCode && data?.info?.userId){ + updateEnterpriseId({ + unifiedSocialCreditCode: data?.info?.entCreditCode, + userId: data?.info?.userId, + }) + } getFair("refresh"); return userInfo.value; }); } - + function updateEnterpriseId(params){ + const headers = { + 'Content-Type':'application/json' + } + return $api.myRequest("/jobfair/public/job-fair-sign-up-enterprise/update-enterprise-id", params, "POST", 9100, headers).then((resData) => { + if(resData.code == 200 && resData.data !=0){ + state.current = 3 + getMyFair("refresh"); + } + }); + } function getMyFair(type = "add") { if (type === "refresh") { pageState.pageNum = 1; @@ -404,6 +523,7 @@ pageSize: pageState.pageSize, jobFairTitle: pageState.jobFairTitle, jobFairType: state.current, + dictValue: selectedValues.value, }; if (isLogin.value) { if (userInfo.value.userType == "ent") { @@ -561,7 +681,168 @@ return dates; } +