From 2adaf1659c3baad047a848df8034d587dbb11f9f Mon Sep 17 00:00:00 2001 From: lijingyu007 <904564792@qq.com> Date: Tue, 28 May 2024 20:18:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B5=81=E7=A8=8B+=E6=96=B0?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 119 ++--- pages/index/index.vue | 14 +- pages/index/outsourcing/cloudUserPage.vue | 246 +++++++++++ pages/index/outsourcing/cloudUserdetail.vue | 245 +++++++++++ pages/index/outsourcing/moreCloud.vue | 262 +++++++++++ pages/index/outsourcing/outsourcing.vue | 10 +- pages/personal/personalresume/advantage.vue | 276 +++++++++--- pages/personal/personalresume/basicinform.vue | 412 +++++++++--------- pages/personal/personalresume/education.vue | 203 +++++++++ .../personalresume/personalresume.vue | 271 ++++++------ .../personalresume/projectexperience.vue | 199 +++++---- .../personalresume/workexperience.vue | 206 ++++++--- 12 files changed, 1826 insertions(+), 637 deletions(-) create mode 100644 pages/index/outsourcing/cloudUserPage.vue create mode 100644 pages/index/outsourcing/cloudUserdetail.vue create mode 100644 pages/index/outsourcing/moreCloud.vue create mode 100644 pages/personal/personalresume/education.vue diff --git a/pages.json b/pages.json index 1f702cd..ad1ca25 100644 --- a/pages.json +++ b/pages.json @@ -2,7 +2,7 @@ "easycom": { "^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue" }, - "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages + "pages": [ { "path": "pages/index/index", "style": { @@ -45,6 +45,15 @@ "navigationBarBackgroundColor": "#284CD1" } },{ + "path" : "pages/personal/personalresume/education", + "style" : + { + "navigationBarTitleText" : "", + "navigationBarBackgroundColor": "#284CD1" + } + } + + ,{ "path" : "pages/personal/privacy", "style" : { @@ -73,41 +82,12 @@ "navigationBarTitleText" : "设置", "navigationBarBackgroundColor": "#284CD1" } - },{ - // "path": "pages/all/all", - // "style": { - // "navigationBarTitleText": "全部", - // "navigationBarBackgroundColor": "#284CD1" - // } - },{ - // "path": "pages/shoppingtrolley/shoppingtrolley", - // "style": { - // "navigationBarTitleText": "购物车", - // "navigationBarBackgroundColor": "#284CD1" - // } },{ "path": "pages/personal/personal", "style": { "navigationBarTitleText": "我的", "navigationBarBackgroundColor": "#284CD1" } - }, - { - // "path" : "pages/index/searchfor", - // "style" : - // { - // "navigationBarTitleText" : "搜索", - // "navigationBarBackgroundColor": "#284CD1" - // } - }, - - { - // "path" : "pages/index/addshoppingcart", - // "style" : - // { - // "navigationBarTitleText" : "加入购物车", - // "navigationBarBackgroundColor": "#284CD1" - // } },{ "path" : "pages/personal/mysignup/notice", "style" : @@ -140,6 +120,30 @@ "navigationBarBackgroundColor": "#284CD1" } }, + { + "path" : "pages/index/outsourcing/cloudUserPage", + "style" : + { + "navigationBarTitleText" : "人力服务", + "navigationBarBackgroundColor": "#284CD1" + } + }, + { + "path" : "pages/index/outsourcing/moreCloud", + "style" : + { + "navigationBarTitleText" : "人力服务", + "navigationBarBackgroundColor": "#284CD1" + } + }, + { + "path" : "pages/index/outsourcing/cloudUserdetail", + "style" : + { + "navigationBarTitleText" : "人力服务", + "navigationBarBackgroundColor": "#284CD1" + } + }, { "path" : "pages/index/toolleasing/toolleasing", "style" : @@ -165,8 +169,6 @@ { "navigationBarTitleText" : "众包服务", "navigationBarBackgroundColor": "#284CD1" - // "enablePullDownRefresh": true, //设置参数为true - // "onReachBottomDistance":100 //距离底部多远时触发 单位为px } }, { @@ -184,13 +186,6 @@ "navigationBarTitleText" : "客服", "navigationBarBackgroundColor": "#284CD1" } - },{ - // "path" : "pages/all/dynamicdetails", - // "style" : - // { - // "navigationBarTitleText" : "动态详情", - // "navigationBarBackgroundColor": "#284CD1" - // } },{ "path" : "pages/personal/login", "style" : @@ -303,7 +298,7 @@ "path" : "pages/personal/personalresume/basicinform", "style" : { - "navigationBarTitleText" : "基本信息", + "navigationBarTitleText" : "新增资格证书", "navigationBarBackgroundColor": "#284CD1" } }, @@ -371,29 +366,7 @@ } } - - - - - - - - - - - - - - - - - - - - - - - + ], "globalStyle": { "navigationBarTextStyle": "white", @@ -403,7 +376,6 @@ }, "tabBar": { "color" : "#7A7E83", - // "selectedColor" : "#7A7E83", "selectedColor" : "#1578ED", "borderStyle" : "black", "backgroundColor" : "#F8F8F8", @@ -414,31 +386,12 @@ "selectedIconPath" : "static/index/activeindex.png", "text" : "首页" }, - // { - // "pagePath" : "pages/message/message", - // "iconPath" : "static/index/message.png", - // "selectedIconPath" : "static/index/activemessage.png", - // "text" : "消息" - // }, { "pagePath" : "pages/index/testcrowdsourc/testcrowdsourc", "iconPath" : "static/index/cedt.png", "selectedIconPath" : "static/index/actcedt.png", "text" : "众包大厅" }, - // { - // "pagePath" : "pages/all/all", - // "iconPath" : "static/index/all.png", - // "selectedIconPath" : "static/index/activeall.png", - // "text" : "全部" - // }, - - // { - // "pagePath" : "pages/shoppingtrolley/shoppingtrolley", - // "iconPath" : "static/index/shopping.png", - // "selectedIconPath" : "static/index/activeshopping.png", - // "text" : "购物车" - // }, { "pagePath" : "pages/personal/personal", "iconPath" : "static/index/person.png", diff --git a/pages/index/index.vue b/pages/index/index.vue index db9b2e7..f909132 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -421,9 +421,17 @@ }) } else { // uni.showToast({ title: '功能即将上线，敬请期待', icon: 'none', duration: 1000 }); - uni.navigateTo({ - url: './outsourcing/outsourcing' - }) + const userinform = uni.getStorageSync('wxUserInfo'); + if (userinform.companyStatus == 2) { + uni.navigateTo({ + url: '/pages/index/outsourcing/outsourcing' + }) + } else { + uni.navigateTo({ + url: '/pages/index/outsourcing/cloudUserPage' + }) + } + } }, // 培训学校 diff --git a/pages/index/outsourcing/cloudUserPage.vue b/pages/index/outsourcing/cloudUserPage.vue new file mode 100644 index 0000000..9d4c96b --- /dev/null +++ b/pages/index/outsourcing/cloudUserPage.vue @@ -0,0 +1,246 @@ + + + + + \ No newline at end of file diff --git a/pages/index/outsourcing/cloudUserdetail.vue b/pages/index/outsourcing/cloudUserdetail.vue new file mode 100644 index 0000000..f7118a9 --- /dev/null +++ b/pages/index/outsourcing/cloudUserdetail.vue @@ -0,0 +1,245 @@ + + + + + \ No newline at end of file diff --git a/pages/index/outsourcing/moreCloud.vue b/pages/index/outsourcing/moreCloud.vue new file mode 100644 index 0000000..494f19e --- /dev/null +++ b/pages/index/outsourcing/moreCloud.vue @@ -0,0 +1,262 @@ + + + + + \ No newline at end of file diff --git a/pages/index/outsourcing/outsourcing.vue b/pages/index/outsourcing/outsourcing.vue index 8a66734..19106e2 100644 --- a/pages/index/outsourcing/outsourcing.vue +++ b/pages/index/outsourcing/outsourcing.vue @@ -163,7 +163,7 @@ -

IT软件人才库

+

关键云员工

 @@ -193,7 +193,7 @@ - 查看更多简历 + 查看更多 @@ -623,6 +623,12 @@ url: '/pages/personal/login' }) }, + lookMoreFn() { + uni.navigateTo({ + url: '/pages/index/outsourcing/moreCloud' + }) + }, + //用人时没有认证的让跳去认证 certifconfirm() { this.certifshow = false; diff --git a/pages/personal/personalresume/advantage.vue b/pages/personal/personalresume/advantage.vue index 7963561..92f50f8 100644 --- a/pages/personal/personalresume/advantage.vue +++ b/pages/personal/personalresume/advantage.vue @@ -1,8 +1,35 @@ @@ -11,41 +38,72 @@ export default { data() { return { - advantage:'' + cityshow: false, + basicobj: {}, + wxUserInfo: null, + testerdata: null, + cityList: [], + + certRules: { + city: [{ + required: true, + message: '请选择城市', + trigger: 'change' + }], + testSkills: [{ + required: true, + message: '输入技能方向', + trigger: 'blur', + }], + personalAdvantage: [{ + required: true, + message: '输入个人优势', + trigger: 'blur', + }], + }, } }, + onShow() { + this.http.quickGet(`/common/city`, ).then(res => { + this.cityList = res.data + }) + }, + onReady() { + this.$refs.basicobj.setRules(this.certRules); + }, onLoad() { - let wxUserInfo = uni.getStorageSync('wxUserInfo'); - this.http.quickGet(`/tester/TesterInfo/resume/${wxUserInfo.userId}`,true).then(res=>{ - this.advantage=res.data.personalAdvantage - console.log('简历信息---',res) + this.wxUserInfo = uni.getStorageSync('wxUserInfo'); + let userId = this.wxUserInfo.userId + this.http.quickGet(`/tester/TesterInfo/resume/${this.wxUserInfo.userId}`, true).then(res => { + this.basicobj = { + city: res.data.city, + testSkills: res.data.testSkills, + personalAdvantage: res.data.personalAdvantage + } }) + }, + computed: { + }, methods: { - resource(){ - let wxUserInfo = uni.getStorageSync('wxUserInfo'); - if(!this.advantage){ - uni.showToast({ title: '请输入我的优势', icon: 'none', duration: 1000 }); - return; - } - if(this.advantage.length>3000){ - uni.showToast({ title: '最多可输入3000字', icon: 'none', duration: 1000 }); - return; - } - let data={ - userId:wxUserInfo.userId, - personalAdvantage:this.advantage, - } - this.http.quickPost(`/tester/TesterInfo/advantage`,data,true).then(res=>{ - if(res.data.code==200){ - uni.showToast({ title: '我的优势编辑成功', icon: 'success', duration: 2000 }); - setTimeout(()=>{ - uni.navigateBack({ - delta:1 - }) - },1000) - - } + citychange(e) { + this.basicobj.city = e[0].label + '-' + e[1].label + }, + resource() { + this.$refs.basicobj.validate(valid => { + if (valid) { + this.http.quickPost(`/tester/cert/profile`, this.basicobj, true).then(res => { + if (res.data.code == 200) { + this.$refs.uToast.show({ + title: '保存成功', + type: 'success', + url: 'pages/personal/personalresume/personalresume' + }) + } else { + + } + }) + } else {} }) } } @@ -53,25 +111,145 @@ + \ No newline at end of file diff --git a/pages/personal/personalresume/basicinform.vue b/pages/personal/personalresume/basicinform.vue index 8ec1a3b..9625bc5 100644 --- a/pages/personal/personalresume/basicinform.vue +++ b/pages/personal/personalresume/basicinform.vue @@ -1,70 +1,39 @@ @@ -130,89 +130,84 @@ export default { data() { return { - userinfo:{}, - projectlist:[],//项目集合 - resumedata:{}, - action: 'https://www.keyitest.cn/prod-api/upload', - headers:{Authorization:'Bearer '+uni.getStorageSync('accessToken')}, + userinfo: {}, + projectlist: [], //项目集合 + worklist: [], //工作经历 + educationlist: [], //教育 + resumedata: {}, + credentialsList: [], //证书 } }, onShow() { - this.userinfo=uni.getStorageSync('wxUserInfo'); - console.log('个人信息',this.userinfo) - //获取该用户的所有项目案例列表 - this.http.quickGet(`/personal/case/list/${this.userinfo.userId}`,true).then(res=>{ - this.projectlist=res.data - console.log('res---',res) - }) - this.http.quickGet(`/tester/TesterInfo/resume/${this.userinfo.userId}`,true).then(res=>{ - this.resumedata=res.data - console.log('简历信息---',res) + + this.http.quickGet(`/personal/resume`, true).then(res => { + // 经历 + this.projectlist = res.data.experience.filter(it => it.type == 0) + this.worklist = res.data.experience.filter(it => it.type == 1) + this.educationlist = res.data.experience.filter(it => it.type == 2) + // 个人简介 + this.resumedata = res.data.personalInfo + // 证书 + this.credentialsList = res.data.credentials }) }, onLoad() { - + }, methods: { - //文件上传成功回调 - fielUploadSuc(data,index) { - console.log('-',data,'*',index) - - if (data.code === 200) { - this.resumedata.certificateUrl=data.filePath - console.log('技能认证',this.resumedata.certificateUrl) - } - }, - //移除 - deleteUpfile(index,lists){ - console.log('del技能认证',this.resumedata.certificateUrl) - this.resumedata.certificateUrl='' - // if(this.credentialImgList.length>0){ - // let id=this.credentialImgList[0].id; - // this.http.quickDelete(`/equestrianinfo/file/${id}`).then(()=>{}) - // } - }, - errorUpfile(data,index){ - // console.log('上传失败-',data,'*',index) - // this.$refs.uToast.show({ - // title: '上传失败，请您重新上传', - // type: 'error', - // }) - }, //添加项目 - nextpro(type){ - if(type=='basic'){ + nextpro(type) { + if (type == 'basic') { + uni.navigateTo({ + url: '/pages/personal/personalresume/basicinform' + }) + } else if (type == 'advantage') { uni.navigateTo({ - url:'/pages/personal/personalresume/basicinform' + url: '/pages/personal/personalresume/advantage' }) - }else if(type=='advantage'){ + } else if (type == 'work') { uni.navigateTo({ - url:'/pages/personal/personalresume/advantage' + url: '/pages/personal/personalresume/workexperience' }) - }else if(type=='work'){ + } else if (type == 'pro') { uni.navigateTo({ - url:'/pages/personal/personalresume/workexperience' + url: '/pages/personal/personalresume/projectexperience?type=1' }) - }else if(type=='pro'){ + } else if (type == 'edu') { uni.navigateTo({ - url:'/pages/personal/personalresume/projectexperience?type=1' + url: '/pages/personal/personalresume/education?type=1' }) } }, //修改项目详情 - prodetaols(item){ + prodetaols(item) { + uni.navigateTo({ + url: `/pages/personal/personalresume/projectexperience?type=2&caseId=${item.caseId}` + }) + }, + workdetaols(item) { + uni.navigateTo({ + url: `/pages/personal/personalresume/workexperience?type=2&caseId=${item.caseId}` + }) + }, + edudetaols(item) { + uni.navigateTo({ + url: `/pages/personal/personalresume/education?type=2&caseId=${item.caseId}` + }) + }, + bookdetaols(item) { uni.navigateTo({ - url:`/pages/personal/personalresume/projectexperience?type=2&caseId=${item.caseId}` + url: `/pages/personal/personalresume/basicinform?fileItem=${JSON.stringify(item)}&fileList=${JSON.stringify(this.credentialsList.filter(it => it.fileId != item.fileId))}` }) }, //预览图片 - priveimg(logourl){ + priveimg(logourl) { // console.log('预览图片') let imgsArray = []; imgsArray[0] = logourl uni.previewImage({ - current: 0, - urls: imgsArray + current: 0, + urls: imgsArray }); }, } @@ -220,7 +215,7 @@ + \ No newline at end of file diff --git a/pages/personal/personalresume/projectexperience.vue b/pages/personal/personalresume/projectexperience.vue index e5c8bbf..24a80a2 100644 --- a/pages/personal/personalresume/projectexperience.vue +++ b/pages/personal/personalresume/projectexperience.vue @@ -1,30 +1,32 @@