diff --git a/components/companyList/companyList.vue b/components/companyList/companyList.vue index 9d6407a..26a5c36 100644 --- a/components/companyList/companyList.vue +++ b/components/companyList/companyList.vue @@ -11,22 +11,30 @@ + + {{ companyitem.tradeNames }} + {{ item }} - + + + + + {{ companyitem.missionCompanyName }} - + + + + 2.2km diff --git a/components/companyList/workList.vue b/components/companyList/workList.vue index dbf007d..78a1475 100644 --- a/components/companyList/workList.vue +++ b/components/companyList/workList.vue @@ -11,22 +11,37 @@ + + {{ companyitem.tradeNames }} + {{ item }} - + + + + + + + {{ companyitem.jobCompanyName }} - + + + + 2.2km diff --git a/components/vertical-menu/vertical-menu.vue b/components/vertical-menu/vertical-menu.vue index 29c91a7..2d1929b 100644 --- a/components/vertical-menu/vertical-menu.vue +++ b/components/vertical-menu/vertical-menu.vue @@ -387,7 +387,7 @@ export default { } .page-view { - padding: 16rpx; + padding: 8rpx; } .class-item { @@ -398,7 +398,7 @@ export default { } .class-item:last-child { - // min-height: 100vh; + min-height: 100vh; } .item-title { diff --git a/pageMy/my/resume/index.vue b/pageMy/my/resume/index.vue index 611c036..dddfc9b 100644 --- a/pageMy/my/resume/index.vue +++ b/pageMy/my/resume/index.vue @@ -19,7 +19,7 @@ 我的职业技能 - + @@ -37,11 +37,11 @@ + v-bind:class="['jobAddress', { 'input-error':!myResume.city.id && !myResume.city.workplace && isShowBorder }]"> 您想工作的地点 - {{ myResume.city == {} ? myResume.city.id ? getCity(myResume.city.id) : myResume.city.workplace : '请选择' + {{ myResume.city !== "{}" ? myResume.city.id ? getCity(myResume.city.id) : myResume.city.workplace : '请选择' }} @@ -53,7 +53,7 @@ 您的学历 - {{ myResume.education == {} ? myResume.education.label : '请选择' }} + {{ myResume.education !== "{}" ? myResume.education.label : '请选择' }} @@ -306,7 +306,7 @@ export default { // 电话号码格式正确 console.log(phone, "电话号码格式正确"); setResume({ - id: this.id, education: education.label, workplace: city.parentLabel + '-' + city.label, telephone: phone, wage + id: this.id, education: education.label, workplace:city.workplace?city.workplace: city.parentLabel + '-' + city.label, telephone: phone, wage }).then(res => { this.isShowButton = false; this.getResume() diff --git a/pages/project/project.vue b/pages/project/project.vue index 3150206..8879466 100644 --- a/pages/project/project.vue +++ b/pages/project/project.vue @@ -77,7 +77,7 @@ 完善技能 --> - + {{ item.articleTitle }} @@ -267,6 +267,22 @@ export default { } }) }, + goPolicyInfo(data){ + if(data){ + // var val=encodeURIComponent(data) + + uni.navigateTo({ + url:`/pages/user/policyContent?id=${data}` + }) + + } + else{ + // uni.showToast({ + // title:'暂无内容', + // icon:'none' + // }) + } + }, //推荐任务； getRecommendList: function () { recommendMission(this.recommendPage.current, this.recommendPage.size, '').then(res => { diff --git a/static/img/city.png b/static/img/city.png new file mode 100644 index 0000000..bfddaf9 Binary files /dev/null and b/static/img/city.png differ diff --git a/static/img/location_new.png b/static/img/location_new.png new file mode 100644 index 0000000..7e539ee Binary files /dev/null and b/static/img/location_new.png differ diff --git a/vue.config.js b/vue.config.js index 1af8282..fdcb0d0 100644 --- a/vue.config.js +++ b/vue.config.js @@ -3,7 +3,7 @@ module.exports = { port: 1887, proxy: { '/api': { - // target: 'http://192.168.0.102:8000', // 本地服务接口地址 + // target: 'http://192.168.0.104:8000', // 本地服务接口地址 target: "http://39.98.184.58:8000", // 阿里云后台地址 // target: "http://192.168.0.100:8000", // 本地网关 ws: true,