diff --git a/public/assets/ability/cloudMore1.png b/public/assets/ability/cloudMore1.png new file mode 100644 index 0000000..4542ed6 Binary files /dev/null and b/public/assets/ability/cloudMore1.png differ diff --git a/public/assets/ability/det1.png b/public/assets/ability/det1.png new file mode 100644 index 0000000..e4d79e9 Binary files /dev/null and b/public/assets/ability/det1.png differ diff --git a/public/assets/ability/det2.png b/public/assets/ability/det2.png new file mode 100644 index 0000000..17e6888 Binary files /dev/null and b/public/assets/ability/det2.png differ diff --git a/public/assets/ability/det3.png b/public/assets/ability/det3.png new file mode 100644 index 0000000..7352d55 Binary files /dev/null and b/public/assets/ability/det3.png differ diff --git a/public/assets/ability/det4.png b/public/assets/ability/det4.png new file mode 100644 index 0000000..d5dc3b0 Binary files /dev/null and b/public/assets/ability/det4.png differ diff --git a/public/assets/crowd/edu.png b/public/assets/crowd/edu.png new file mode 100644 index 0000000..0051adf Binary files /dev/null and b/public/assets/crowd/edu.png differ diff --git a/public/assets/home/12.png b/public/assets/home/12.png new file mode 100644 index 0000000..ed00484 Binary files /dev/null and b/public/assets/home/12.png differ diff --git a/src/api/tester/TesterApply.js b/src/api/tester/TesterApply.js index c52350f..c817293 100644 --- a/src/api/tester/TesterApply.js +++ b/src/api/tester/TesterApply.js @@ -148,9 +148,9 @@ export function couldUserInfoAdd(data) { } // 查询简历信息 -export function getCloudAll() { +export function getCloudAll(id) { return request({ - url: '/personal/resume', + url: '/personal/resume/'+id, method: 'get', }) } diff --git a/src/page/homepage/personability/ability.vue b/src/page/homepage/personability/ability.vue index 3eaefef..536c6c4 100644 --- a/src/page/homepage/personability/ability.vue +++ b/src/page/homepage/personability/ability.vue @@ -5,6 +5,10 @@ 提交用人需求 --> +
+ 提交用人需求 + +
浏览云员工 @@ -642,11 +646,29 @@ export default { .zxzx1 { z-index: 2147483639; - width: 180px; + width: 172px; + height: 68px; + position: fixed; + right: 16px; + top: 515px; + font-weight: 500; + font-size: 17px; + color: #ffffff; + cursor: pointer; + background: linear-gradient(0deg, #5ea6fd, #1a81f9); + box-shadow: 0px 1px 20px 1px rgba(13, 92, 187, 0.4); + border-radius: 4px; + display: flex; + align-items: center; + justify-content: center; +} +.zxzx2 { + z-index: 2147483639; + width: 172px; height: 68px; position: fixed; right: 16px; - top: 500px; + top: 425px; font-weight: 500; font-size: 17px; color: #ffffff; diff --git a/src/page/homepage/personability/abilityApply.vue b/src/page/homepage/personability/abilityApply.vue index a8d906e..ddb0b20 100644 --- a/src/page/homepage/personability/abilityApply.vue +++ b/src/page/homepage/personability/abilityApply.vue @@ -456,7 +456,7 @@ import { couldBookAdd, couldBookUpdate, couldApply, - delBook + delBook, } from '@/api/tester/TesterApply' export default { @@ -465,7 +465,9 @@ export default { return { active: 0, // 实名认证 - certifform: {}, + certifform: { + + }, certifRules: { name: [ { required: true, message: '真实姓名不能为空', trigger: 'blur' }, @@ -550,7 +552,7 @@ export default { }, }, computed: { - ...mapGetters(['userinform', 'token']), + ...mapGetters(['userinform','userId', 'token']), }, created() { this.getCloudAllList() @@ -567,7 +569,7 @@ export default { }, // 获取简历信息 getCloudAllList() { - getCloudAll().then((res) => { + getCloudAll(this.userId).then((res) => { // 经历 this.projectList = res.experience.filter((it) => it.type == 0) if (!this.projectList.length) { @@ -582,17 +584,19 @@ export default { this.educationList = [{}] } // 个人简介 - this.userForm = res.personalInfo - this.province = this.userForm.city.split('-')[0] - this.city = this.userForm.city.split('-')[1] + if (res.personalInfo) { + this.userForm = res.personalInfo + this.province = this.userForm.city.split('-')[0] + this.city = this.userForm.city.split('-')[1] - // 审核状态 1审核通过 2不通过 没有或者0待审核 - if (res.personalInfo.status === 0) { - } else if (res.personalInfo.status === 1) { - this.active = 6 - } else if (res.personalInfo.status === 2) { - this.active = 6 - } else { + // 审核状态 1审核通过 2不通过 没有或者0待审核 + if (res.personalInfo.status === 0) { + } else if (res.personalInfo.status === 1) { + this.active = 6 + } else if (res.personalInfo.status === 2) { + this.active = 6 + } else { + } } // 证书 @@ -843,8 +847,6 @@ export default { }) } }) - - }, // 教育经历添加 addEducation() { diff --git a/src/page/homepage/personability/abilityMore.vue b/src/page/homepage/personability/abilityMore.vue index db12cab..d646672 100644 --- a/src/page/homepage/personability/abilityMore.vue +++ b/src/page/homepage/personability/abilityMore.vue @@ -6,7 +6,7 @@
搜索
-
+
{{ it.name }}
@@ -80,6 +80,14 @@ export default { }) }) }, + doDetail(it) { + this.$router.push({ + path: '/ability/more/detail', + query: { + id: it.user_id, + }, + }) + }, handleSizeChange(val) { this.queryParams.pageSize = val this.getList() diff --git a/src/page/homepage/personability/abilityMoreDetail.vue b/src/page/homepage/personability/abilityMoreDetail.vue new file mode 100644 index 0000000..10cd22e --- /dev/null +++ b/src/page/homepage/personability/abilityMoreDetail.vue @@ -0,0 +1,258 @@ + + + + \ No newline at end of file diff --git a/src/page/personalpage/commonheader/personalheader.vue b/src/page/personalpage/commonheader/personalheader.vue index 45ec730..cbbc55d 100644 --- a/src/page/personalpage/commonheader/personalheader.vue +++ b/src/page/personalpage/commonheader/personalheader.vue @@ -104,6 +104,20 @@ > + -
diff --git a/src/page/personalpage/home/resume.vue b/src/page/personalpage/home/resume.vue index f05bd4b..d449f29 100644 --- a/src/page/personalpage/home/resume.vue +++ b/src/page/personalpage/home/resume.vue @@ -2,8 +2,9 @@
- - 云员工个人简历
+ + 云员工个人简历 +
@@ -14,12 +15,12 @@
-
+
- 张三(已实名) + {{userForm.name}} - 男 + {{userForm.sex}}
@@ -294,7 +295,7 @@ import { couldBookAdd, couldBookUpdate, couldApply, - delBook + delBook, } from '@/api/tester/TesterApply' export default { @@ -388,7 +389,7 @@ export default { }, }, computed: { - ...mapGetters(['userinform', 'token']), + ...mapGetters(['userinform','userId', 'token']), }, created() { this.getCloudAllList() @@ -405,7 +406,7 @@ export default { }, // 获取简历信息 getCloudAllList() { - getCloudAll().then((res) => { + getCloudAll(this.userId).then((res) => { // 经历 this.projectList = res.experience.filter((it) => it.type == 0) if (!this.projectList.length) { @@ -420,18 +421,14 @@ export default { this.educationList = [{}] } // 个人简介 - this.userForm = res.personalInfo - this.province = this.userForm.city.split('-')[0] - this.city = this.userForm.city.split('-')[1] + if (res.personalInfo) { + this.userForm = res.personalInfo + this.province = this.userForm.city.split('-')[0] + this.city = this.userForm.city.split('-')[1] + } // 审核状态 1审核通过 2不通过 没有或者0待审核 - if (res.personalInfo.status === 0) { - } else if (res.personalInfo.status === 1) { - this.active = 6 - } else if (res.personalInfo.status === 2) { - this.active = 6 - } else { - } + // 证书 this.certificateList = res.credentials.map((it) => { @@ -681,8 +678,6 @@ export default { }) } }) - - }, // 教育经历添加 addEducation() { diff --git a/src/page/personalpage/home/userUpgrade.vue b/src/page/personalpage/home/userUpgrade.vue index fb7de97..d68f57d 100644 --- a/src/page/personalpage/home/userUpgrade.vue +++ b/src/page/personalpage/home/userUpgrade.vue @@ -336,7 +336,7 @@ export default { allFileGetFlag: false, testerdata: null, testerStatus: 0, - baseUrl: process.env.VUE_APP_BASE_TARGET, + baseUrl: process.env.VUE_APP_BASE_API, } }, created() { diff --git a/src/page/personalpage/testcrowd/TesterDetail.vue b/src/page/personalpage/testcrowd/TesterDetail.vue index f532caa..4be587f 100644 --- a/src/page/personalpage/testcrowd/TesterDetail.vue +++ b/src/page/personalpage/testcrowd/TesterDetail.vue @@ -34,10 +34,16 @@ > --> - + l -