From abda6ae90e97c1f66b10c7fa4fcee88dcbd71c02 Mon Sep 17 00:00:00 2001 From: huliyong <2783385703@qq.com> Date: Mon, 30 Dec 2024 23:13:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/api.js | 12 - api/model/company.js | 11 +- api/model/contact.js | 10 +- api/model/login.js | 8 +- api/model/resume.js | 1 + api/model/vip.js | 1 + api/model/work.js | 24 +- components/list/bossList/bossItem.vue | 16 +- components/list/bossList/index.vue | 4 +- components/list/userList/index.vue | 7 +- components/list/userList/userItem.vue | 18 +- components/list/userList/userListSwipe.vue | 2 +- components/list/workList/workListSwipe.vue | 2 +- components/screen/screenWork.vue | 66 ++-- config.js | 2 +- pages.json | 4 +- pages/index/center.vue | 24 +- pages/index/index.vue | 5 +- pages_order/auth/certificationEnterprise.vue | 11 + pages_order/kepp/AnnualExpenditure.vue | 22 +- pages_order/mine/MemberRecharge.vue | 8 +- pages_order/mine/collect.vue | 33 ++ pages_order/mine/contactRecord.vue | 2 +- pages_order/mine/enterpriseInfo.vue | 442 ++++++++++++++++++++++++++- pages_order/mine/releaseWork.vue | 20 ++ pages_order/mine/setting.vue | 14 +- pages_order/work/addResume.vue | 24 +- pages_order/work/bossDetail.vue | 36 +-- pages_order/work/jobPosting.vue | 55 +++- pages_order/work/userDetail.vue | 54 ++-- pages_order/work/workDetail.vue | 10 +- store/store.js | 2 +- 32 files changed, 802 insertions(+), 148 deletions(-) diff --git a/api/api.js b/api/api.js index 56f6b44..8e4810f 100644 --- a/api/api.js +++ b/api/api.js @@ -99,18 +99,6 @@ const config = { - //我的找活 - employeeQueryResumeByUserId: { - url: '/api/employee/queryResumeByUserId', - method: 'GET', - auth: true, - }, - //联系记录-我看过谁 - employeeQueryWatchWho: { - url: '/api/employee/queryWatchWho', - method: 'GET', - auth: true, - }, //电子合同-获取电子合同列表 employeeQueryContractList: { url: '/api/employee/queryContractList', diff --git a/api/model/company.js b/api/model/company.js index 612d870..ce2e585 100644 --- a/api/model/company.js +++ b/api/model/company.js @@ -2,17 +2,18 @@ // 企业相关接口 const api = { - // 查看企业信息 - getCompany: { - url: '/company/updateUser', + // 根据企业id查看企业信息 + queryCompany: { + url: '/employ/company/queryCompany', method: 'GET', }, // 修改企业信息 - getCompany: { - url: '/company/updateUser', + updateCompany: { + url: '/employ/company/updateCompany', method: 'POST', auth : true, limit : 1500, + showLoading : true, }, } diff --git a/api/model/contact.js b/api/model/contact.js index e49c6b4..d034542 100644 --- a/api/model/contact.js +++ b/api/model/contact.js @@ -14,9 +14,15 @@ const api = { method: 'GET', auth: true, }, - //会员中心-联系记录-我看过谁 + //会员中心-联系记录-我看过谁（我看过谁的简历） bossQueryWatchWho: { - url: '/api/boss/queryWatchWho', + url: '/employ/check/queryWatchWhoBoss',// queryWatchWhoBoss + method: 'GET', + auth: true, + }, + //会员中心-联系记录-我看过谁 （我看过谁的招工） + queryWatchWhoEmployee: { + url: '/employ/check/queryWatchWhoEmployee', method: 'GET', auth: true, }, diff --git a/api/model/login.js b/api/model/login.js index 0faaaab..a2514ef 100644 --- a/api/model/login.js +++ b/api/model/login.js @@ -35,7 +35,7 @@ const api = { auth: true, limit : 500, }, - // 获取个人信息 + // 获取绑定手机号 bindPhone: { url: '/api/login/bindPhone', method: 'GET', @@ -43,6 +43,12 @@ const api = { limit : 500, showLoading : true, }, + // 获取个人信息 + getDataByUserId: { + url: '/employ/user/getDataByUserId', + method: 'GET', + auth: true, + }, } export default api \ No newline at end of file diff --git a/api/model/resume.js b/api/model/resume.js index 641d887..bd91318 100644 --- a/api/model/resume.js +++ b/api/model/resume.js @@ -8,6 +8,7 @@ const api = { method: 'POST', auth : true, limit : 1500, + showLoading : true, }, // 我的简历 queryResumeByUserId: { diff --git a/api/model/vip.js b/api/model/vip.js index 0968f1b..a6946c5 100644 --- a/api/model/vip.js +++ b/api/model/vip.js @@ -8,6 +8,7 @@ const api = { method: 'POST', auth : true, limit : 1500, + showLoading : true, }, } diff --git a/api/model/work.js b/api/model/work.js index 65fada2..e941332 100644 --- a/api/model/work.js +++ b/api/model/work.js @@ -8,11 +8,29 @@ const api = { method: 'POST', auth : true, limit : 1500, + showLoading : true, + }, + // 删除工作信息 + deleteJob: { + url: '/employ/job/deleteJob', + method: 'POST', + auth : true, + limit : 1500, + showLoading : true, + }, + // 修改工作信息 + updateJob: { + url: '/employ/job/updateJob', + method: 'POST', + auth : true, + limit : 1500, + showLoading : true, }, // 首页-根据Id查看工作详情 employeeQueryJobList: { url: '/employ/job/queryJobList', method: 'GET', + auth : true, }, // 首页-查询工作信息列表 employeeQueryJobById: { @@ -25,12 +43,6 @@ const api = { method: 'GET', auth : true, }, - // 首页-修改工作信息 - updateJob: { - url: '/employ/job/updateJob', - method: 'GET', - auth : true, - }, } export default api \ No newline at end of file diff --git a/components/list/bossList/bossItem.vue b/components/list/bossList/bossItem.vue index 059bcb3..ee9fb68 100644 --- a/components/list/bossList/bossItem.vue +++ b/components/list/bossList/bossItem.vue @@ -12,15 +12,18 @@ - 湖南江海国际经济技术合作有限公司 + + {{ item.employAhthenticationCompany.companyName }} - 一个小时前 + @@ -45,15 +48,16 @@ - 长沙 | 经验不限 | 学历不限 + 长沙 | {{ t.workAge }} | {{ t.qulification }} - 09月23日 16：20 + {{ $dayjs(t.createTime).format('YYYY-MM-DD') }} - - 查看全部5个职位 + + 查看全部{{ item.jobNum }}个职位 diff --git a/components/list/bossList/index.vue b/components/list/bossList/index.vue index 8825a64..564de08 100644 --- a/components/list/bossList/index.vue +++ b/components/list/bossList/index.vue @@ -5,11 +5,13 @@ @scrolltolower="loadMoreData"> + + diff --git a/components/list/userList/index.vue b/components/list/userList/index.vue index a3ab4c3..aabc4a8 100644 --- a/components/list/userList/index.vue +++ b/components/list/userList/index.vue @@ -20,6 +20,11 @@ diff --git a/components/list/userList/userListSwipe.vue b/components/list/userList/userListSwipe.vue index f933b94..2100c9d 100644 --- a/components/list/userList/userListSwipe.vue +++ b/components/list/userList/userListSwipe.vue @@ -3,7 +3,7 @@ + :key="item.type"> - {{ item.title }} + {{ role ? item.bossTitle : item.title }} + :key="t.label"> {{ t.label }} @@ -96,10 +96,10 @@ color: '#333', activeColor: '#3796F8', child: [ - { - label: '全国', - value: 0, - }, + // { + // label: '全国', + // value: 0, + // }, ] }, typeId: { @@ -136,13 +136,24 @@ // }, { title : '您希望从事的工种', - tag : ['电工', '焊工', '叉车', '其他'], + bossTitle : '您希望招工的工种', + tag : [], index : 0, + type : 'typeId', }, { title : '您希望从事的工作性质', - tag : ['全职', '临时工',], + bossTitle : '您希望招工的工作性质', + tag : [], + index : 0, + type : 'natureId', + }, + { + title : '您希望从事的工作地区', + bossTitle : '您希望招工的工作地区', + tag : [], index : 0, + type : 'areaId', }, ] } @@ -169,10 +180,15 @@ ...mapState(['jobTypeList', 'natureList', 'addressList']), }, mounted() { - setTimeout(this.initData, 300) + setTimeout(this.initData, 500) }, methods: { initData(){ + + if(this.addressList.length == 0){ + setTimeout(this.initData, 500) + } + // 工种 this.jobTypeList.forEach(n => { this.typeId.child.push({ @@ -191,13 +207,13 @@ }) this.list[1].tag = this.natureId.child - // if(this.addressList[0]){ - // this.areaId.value = this.addressList[0].id - // this.areaId.label = this.addressList[0].name + if(this.addressList[0]){ + this.areaId.value = this.addressList[0].id + this.areaId.label = this.addressList[0].adress - // this.defaultValue[0] = this.addressList[0].id - // this.$forceUpdate() - // } + this.defaultValue.slice(0, 1, this.addressList[0].id) + this.$forceUpdate() + } // 地址 this.addressList.forEach(n => { @@ -206,10 +222,10 @@ value: n.id, }) }) + this.list[2].tag = this.areaId.child }, clickTag(item, i){ - console.log(i); item.index = i }, @@ -280,6 +296,22 @@ }, submit(){ + this.result = [] + + this.list.forEach(n => { + let t = n.tag[n.index] + this.result.push({ + name: n.type, + label : t.label, + value : t.value + }) + }) + + this.result = this.result.filter(item => this.defaultValue.indexOf(item.value) == -1); + + this.$emit('clickItem', this.result) + + this.$refs.popup.close() }, } } diff --git a/config.js b/config.js index 03ac722..2ca1da3 100644 --- a/config.js +++ b/config.js @@ -7,7 +7,7 @@ import uvUI from '@/uni_modules/uv-ui-tools' Vue.use(uvUI); // 当前环境 -const type = 'prod' +const type = 'dev' // 环境配置 diff --git a/pages.json b/pages.json index 0baf623..acb7805 100644 --- a/pages.json +++ b/pages.json @@ -80,8 +80,8 @@ { "path": "mine/releaseWork", "style": { - - "navigationBarTextStyle": "white" + "navigationBarTextStyle": "white", + "enablePullDownRefresh": true } }, { diff --git a/pages/index/center.vue b/pages/index/center.vue index d30a22c..44c21c5 100644 --- a/pages/index/center.vue +++ b/pages/index/center.vue @@ -9,7 +9,7 @@ + @click="$utils.navigateTo('/pages_order/mine/updateUser?back=true')"> {{username}} @@ -84,8 +84,13 @@ - - {{UserExtensionInfo.scNum || 0}} + + {{UserExtensionInfo.resumeCollectionNum || 0 }} + + + {{ UserExtensionInfo.jobCollectionNum || 0 }} 我的收藏 @@ -94,8 +99,17 @@ - - {{UserExtensionInfo.lxNum || 0}} + + {{ (UserExtensionInfo.resumecheckNumBoss || 0) + + (UserExtensionInfo.jobCheckNumBoss || 0) + }} + + + {{ (UserExtensionInfo.jobcheckNumEmployee || 0) + + (UserExtensionInfo.resumecheckNumEmployee || 0) + }} 联系记录 diff --git a/pages/index/index.vue b/pages/index/index.vue index 19b4b10..2f16c82 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -12,7 +12,7 @@ { + if(!e.confirm){ + return + } this.$store.commit('setRole', !this.role) this.$nextTick(() => { this.$refs.workList.getData(this.screenWorkList) diff --git a/pages_order/auth/certificationEnterprise.vue b/pages_order/auth/certificationEnterprise.vue index a2e5ef8..6b5e84d 100644 --- a/pages_order/auth/certificationEnterprise.vue +++ b/pages_order/auth/certificationEnterprise.vue @@ -16,6 +16,15 @@ + + + 职位名称 + + + + 企业名称 @@ -138,6 +147,7 @@ checkboxValue : [], form : { companyAddress : '', + career : '',//职位 }, fileList: [], status : 0, @@ -188,6 +198,7 @@ } this.form.businessLicense = this.fileList.map((item) => item.url).join(",") if(this.$utils.verificationAll(this.form,{ + career : '请输入您的职位', companyName : '请输入企业名称', companyAddress : '请选择企业地址', legalPerson : '请输入企业法人', diff --git a/pages_order/kepp/AnnualExpenditure.vue b/pages_order/kepp/AnnualExpenditure.vue index debe94d..816585b 100644 --- a/pages_order/kepp/AnnualExpenditure.vue +++ b/pages_order/kepp/AnnualExpenditure.vue @@ -10,8 +10,8 @@ - 2024 + @click="$refs.datetimePicker.open()"> + {{ $dayjs(date).format('YYYY') }} @@ -39,12 +39,20 @@ :value="`${bill.typeNo[item.type]}${item.amount}`"> + + + + @@ -60,6 +68,7 @@ typeNo : ['+', '-'], typeTitle : ['收入', '支出'], }, + date : new Date().getTime(), countNumber : {}, notebookList : [], notebook : { @@ -70,6 +79,9 @@ onLoad({apiType}) { this.apiType = apiType this.mixinsListApi += apiType || '' + + this.queryParams.year = this.$dayjs(this.date).format('YYYY') + this.getCommonQueryNotebookList() }, onShow() { @@ -103,6 +115,12 @@ this.getData() this.notebookQueryBillAmount() }, + confirmDate(e){ + this.date = e.value + this.queryParams.year = this.$dayjs(this.date).format('YYYY') + this.getData() + this.notebookQueryBillAmount() + }, } } diff --git a/pages_order/mine/MemberRecharge.vue b/pages_order/mine/MemberRecharge.vue index 0d6589c..297bc38 100644 --- a/pages_order/mine/MemberRecharge.vue +++ b/pages_order/mine/MemberRecharge.vue @@ -74,7 +74,7 @@ 开通前请阅读《会员服务协议》 @@ -138,16 +138,16 @@ }, }, methods: { - submit(id) { + submit(vipTypeId) { if(!this.checkboxValue.length){ return uni.showToast({ title: '请先同意会员服务协议', icon:'none' }) } - console.log("当前标识:" + id) + console.log("当前标识:" + vipTypeId) this.$api('addVIP', { - id: id + vipTypeId }, res => { if(res.code == 200){ uni.requestPayment({ diff --git a/pages_order/mine/collect.vue b/pages_order/mine/collect.vue index 64eeaec..f1b956c 100644 --- a/pages_order/mine/collect.vue +++ b/pages_order/mine/collect.vue @@ -61,6 +61,39 @@ methods: { clickSwipeAction({e, item}){ console.log(e, item); + if(this.role){ + this.addResumeCollection(item.employResume.id) + }else{ + this.addJobCollection(item.employJob.id) + } + }, + addJobCollection(jobId) { + let data = { + jobId + } + this.$api('addJobCollection', data, res => { + if (res.code == 200) { + uni.showToast({ + title: res.message, + icon: 'none' + }) + } + this.getData(); + }) + }, + addResumeCollection(resumeId){ + let data = { + resumeId + } + this.$api('addResumeCollection', data, res => { + this.getData(); + if(res.code == 200){ + uni.showToast({ + title: res.message, + icon: 'none' + }) + } + }) }, // getDataThen(list, total, result){ // let l = [] diff --git a/pages_order/mine/contactRecord.vue b/pages_order/mine/contactRecord.vue index 8924456..b625f86 100644 --- a/pages_order/mine/contactRecord.vue +++ b/pages_order/mine/contactRecord.vue @@ -96,7 +96,7 @@ if(this.role){ this.api = ['bossQueryWatchWho', 'bossQueryWatchMe'][this.type] }else{ - this.api = ['employeeQueryWatchWho', 'employeeQueryWatchMe'][this.type] + this.api = ['queryWatchWhoEmployee', 'employeeQueryWatchMe'][this.type] } }, } diff --git a/pages_order/mine/enterpriseInfo.vue b/pages_order/mine/enterpriseInfo.vue index 8183fd0..1aad292 100644 --- a/pages_order/mine/enterpriseInfo.vue +++ b/pages_order/mine/enterpriseInfo.vue @@ -1,22 +1,450 @@ - + \ No newline at end of file diff --git a/pages_order/mine/releaseWork.vue b/pages_order/mine/releaseWork.vue index 1209b91..6f08d4f 100644 --- a/pages_order/mine/releaseWork.vue +++ b/pages_order/mine/releaseWork.vue @@ -70,6 +70,26 @@ methods: { clickSwipeAction({e, item}){ console.log(e, item); + this[['update', 'del'][e.index]](item) + }, + update(item){ + uni.navigateTo({ + url: '/pages_order/work/jobPosting?jobId=' + item.id + }) + }, + del(item){ + uni.showModal({ + title: '确认删除该招工吗', + success : (r) => { + if(r.confirm){ + this.$api('deleteJob', { + jobId : item.id + }, res => { + this.getData(); + }) + } + } + }) }, } } diff --git a/pages_order/mine/setting.vue b/pages_order/mine/setting.vue index 0db5fb0..1b7e789 100644 --- a/pages_order/mine/setting.vue +++ b/pages_order/mine/setting.vue @@ -24,7 +24,7 @@ icon="coupon" title="切换身份" isLink - @click="$utils.navigateTo('/pages_order/auth/switchIdentity')" + @click="switchIdentity" iconStyle="font-size: 34rpx;" rightIconStyle="font-size: 34rpx;">