Merge branch 'master' of https://gitee.com/beiwu/jobslink-user-clent
This commit is contained in:
@@ -11,22 +11,30 @@
|
||||
</view>
|
||||
</view>
|
||||
<view class="ask">
|
||||
<view class="askList">
|
||||
{{ companyitem.tradeNames }}
|
||||
</view>
|
||||
<view class="askList" v-for="(item, index) in skillNames" :key="index">
|
||||
{{ item }}
|
||||
</view>
|
||||
</view>
|
||||
<view class="allName">
|
||||
<!-- <view class="allName">
|
||||
{{ companyitem.companyName }}
|
||||
</view>
|
||||
<view class="timeAddress">
|
||||
<view v-if="companyitem.missionCompanyName">
|
||||
{{ companyitem.missionCompanyName }}
|
||||
</view> -->
|
||||
<view class="timeAddress" style="position: relative;">
|
||||
<view style="display: flex;align-items: center;">
|
||||
<image src="../../static/img/city.png" style="width: 40rpx;height: 40rpx;margin-right: 10rpx;" mode=""></image>
|
||||
<view style="font-size: 26rpx;color:#333;">{{ companyitem.missionCompanyName }}</view>
|
||||
</view>
|
||||
<view v-if="near">
|
||||
<!-- <view v-if="near">
|
||||
{{ companyitem.distanceStr }}km
|
||||
</view>
|
||||
<view v-else>
|
||||
{{ getCity(companyitem.cityId) }}
|
||||
</view> -->
|
||||
<view style="display: flex;align-items: center;position:absolute;right:0;">
|
||||
<image src="../../static/img/location_new.png" style="width: 30rpx;height: 30rpx;" mode=""></image>
|
||||
<view>2.2km</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="comment" v-if='comment' @tap.stop="goComment(companyitem.missionNo)">
|
||||
|
||||
@@ -11,22 +11,37 @@
|
||||
</view>
|
||||
</view>
|
||||
<view class="ask">
|
||||
<view class="askList">
|
||||
{{ companyitem.tradeNames }}
|
||||
</view>
|
||||
<view class="askList" v-for="(item, index) in skillNames" :key="index">
|
||||
{{ item }}
|
||||
</view>
|
||||
</view>
|
||||
<view class="allName">
|
||||
<!-- <view class="allName">
|
||||
{{ companyitem.jobCompanyName }}
|
||||
</view>
|
||||
<view class="timeAddress">
|
||||
<view v-if="companyitem.missionCompanyName">
|
||||
</view> -->
|
||||
<view class="timeAddress" style="position: relative;">
|
||||
<!-- <view v-if="companyitem.missionCompanyName">
|
||||
{{ companyitem.missionCompanyName }}
|
||||
</view> -->
|
||||
<!-- <view>
|
||||
<image src="../../static/img/city.png" style="width: 40rpx;height: 40rpx;" mode=""></image>
|
||||
{{ companyitem.jobCompanyName }}
|
||||
</view> -->
|
||||
<view style="display: flex;align-items: center;">
|
||||
<image src="../../static/img/city.png" style="width: 40rpx;height: 40rpx;margin-right: 10rpx;" mode=""></image>
|
||||
<view style="font-size: 26rpx;color:#333;">{{ companyitem.jobCompanyName }}</view>
|
||||
</view>
|
||||
<view v-if="near">
|
||||
<!-- <view v-if="near">
|
||||
{{ companyitem.distanceStr }}km
|
||||
</view>
|
||||
<view v-else>
|
||||
{{ getCity(companyitem.cityId) }}
|
||||
</view> -->
|
||||
<view style="display: flex;align-items: center;position:absolute;right:0;">
|
||||
<image src="../../static/img/location_new.png" style="width: 30rpx;height: 30rpx;" mode=""></image>
|
||||
<view>2.2km</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="comment" v-if='comment' @tap.stop="goComment(companyitem.missionNo)">
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
<view class="title_text">
|
||||
我的职业技能
|
||||
</view>
|
||||
<image v-if="mySkills.length < 5" src="../../../static/img/add.gray.svg" mode="" @click="goAdd"></image>
|
||||
<image v-if="mySkills.length < 2" src="../../../static/img/add.gray.svg" mode="" @click="goAdd"></image>
|
||||
</view>
|
||||
|
||||
<view class="listBody">
|
||||
@@ -37,11 +37,11 @@
|
||||
<view class="jobcontent" @click="goSetCity">
|
||||
<view class="jobinfo">
|
||||
<view
|
||||
v-bind:class="['jobAddress', { 'input-error': (!myResume.city.id || !myResume.city.workplace) && isShowBorder }]">
|
||||
v-bind:class="['jobAddress', { 'input-error':!myResume.city.id && !myResume.city.workplace && isShowBorder }]">
|
||||
您想工作的地点
|
||||
</view>
|
||||
<view v-bind:class="['jobText']">
|
||||
{{ myResume.city == {} ? myResume.city.id ? getCity(myResume.city.id) : myResume.city.workplace : '请选择'
|
||||
{{ myResume.city !== "{}" ? myResume.city.id ? getCity(myResume.city.id) : myResume.city.workplace : '请选择'
|
||||
}}
|
||||
</view>
|
||||
</view>
|
||||
@@ -53,7 +53,7 @@
|
||||
您的学历
|
||||
</view>
|
||||
<view v-bind:class="['jobText']">
|
||||
{{ myResume.education == {} ? myResume.education.label : '请选择' }}
|
||||
{{ myResume.education !== "{}" ? myResume.education.label : '请选择' }}
|
||||
</view>
|
||||
</view>
|
||||
<image src="../../../static/img/right.svg" mode=""></image>
|
||||
@@ -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()
|
||||
|
||||
@@ -77,7 +77,7 @@
|
||||
完善技能
|
||||
</view>
|
||||
</view> -->
|
||||
<view v-for="(item, index) in policyContentList" :key="index" style="width: 90%;height: 100rpx;background-color: #fff;border-radius: 10rpx;margin:20rpx 5% 20rpx 5%;display: flex;align-items: center">
|
||||
<view v-for="(item, index) in policyContentList" :key="index" style="width: 90%;height: 100rpx;background-color: #fff;border-radius: 10rpx;margin:20rpx 5% 20rpx 5%;display: flex;align-items: center" @click="goPolicyInfo(item.id)">
|
||||
<image :src="item.headPic" style="width: 60rpx;height: 60rpx;margin: 0 20rpx;"></image>
|
||||
<view style="font-size: 26rpx;">{{ item.articleTitle }}</view>
|
||||
</view>
|
||||
@@ -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 => {
|
||||
|
||||
BIN
static/img/city.png
Normal file
BIN
static/img/city.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 528 B |
BIN
static/img/location_new.png
Normal file
BIN
static/img/location_new.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.8 KiB |
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user