Merge remote-tracking branch 'origin/master'

This commit is contained in:
18500206848
2024-04-23 21:51:28 +08:00
3 changed files with 409 additions and 403 deletions

View File

@@ -20,11 +20,11 @@
</template>
<script>
import {
import {
getWorktypesList
} from '@/api/resume.js'
} from '@/api/resume.js'
export default {
export default {
data() {
return {
workTypeList: [],
@@ -71,7 +71,7 @@ export default {
this.layer = parseInt(layer || 1)
this.maxLayer = parseInt(maxLayer || 2)
},
onShow: function () { },
onShow: function() {},
methods: {
cityClick(item) {
if (this.layer === this.maxLayer) {
@@ -91,26 +91,32 @@ export default {
url: `./skill?layer=${this.layer + 1}&maxLayer=${this.maxLayer}&parentId=${item.id}&parentLabel=${item.name}`
})
},
comfirm: function () {
comfirm: function() {
if (this.id) {
uni.$emit('setworkTypes', { detail: { id: this.id, label: this.label, parentLabel: this.$route.query.parentLabel } })
uni.$emit('setworkTypes', {
detail: {
id: this.id,
label: this.label,
parentLabel: this.$route.query.parentLabel
}
})
uni.navigateBack({
delta: this.layer
})
} else {
uni.showToast({
title: "请选择地点",
title: "请选择类别",
icon: "none"
})
}
},
}
}
}
</script>
<style>
.bottombtn {
.bottombtn {
background-color: #1B66FF;
color: #fff;
text-align: center;
@@ -119,9 +125,9 @@ export default {
font-size: 32rpx;
height: 90rpx;
line-height: 90rpx;
}
}
.btn {
.btn {
background-color: #fefefe;
width: 690rpx;
padding: 30rpx;
@@ -129,14 +135,14 @@ export default {
position: fixed;
bottom: 0;
left: 0;
}
}
.cityList image {
.cityList image {
width: 32rpx;
height: 32rpx;
}
}
.cityList {
.cityList {
display: flex;
align-items: center;
justify-content: space-between;
@@ -148,9 +154,9 @@ export default {
margin-left: 30rpx;
width: 690rpx;
border-bottom: 1rpx solid #dddddd;
}
}
.location {
.location {
font-family: PingFangSC-Regular;
font-size: 32rpx;
color: #333333;
@@ -158,26 +164,26 @@ export default {
align-items: center;
justify-content: flex-start;
padding: 30rpx;
}
}
.comfirm {
.comfirm {
margin-left: auto;
}
}
.location image {
.location image {
width: 40rpx;
height: 40rpx;
}
}
.title {
.title {
font-family: PingFangSC-Regular;
font-size: 28rpx;
color: #999999;
background-color: #f6f6f6;
padding: 30rpx;
}
}
page {
page {
background-color: #fefefe;
}
}
</style>

View File

@@ -20,11 +20,11 @@
</template>
<script>
import {
import {
getWorktypesList
} from '@/api/resume.js'
} from '@/api/resume.js'
export default {
export default {
data() {
return {
workTypeList: [],
@@ -44,8 +44,8 @@ export default {
},
computed: {
city() {
if(!this.workTypeList.length) return;
if(this.parentTwoId) {
if (!this.workTypeList.length) return;
if (this.parentTwoId) {
const parentItem = this.workTypeList.find(item => item.id == this.parentId);
const parentChild = parentItem.child.find(item => item.id == this.parentTwoId);
if (parentItem) {
@@ -84,7 +84,7 @@ export default {
this.layer = parseInt(layer || 1)
this.maxLayer = parseInt(maxLayer || 2)
},
onShow: function () { },
onShow: function() {},
methods: {
cityClick(item) {
console.log('items', item, this.layer, this.maxLayer)
@@ -119,32 +119,33 @@ export default {
url: `./skillLevel?layer=${this.layer + 1}&maxLayer=${this.maxLayer}&parentId=${item.id}&parentLabel=${item.name}`
})
},
comfirm: function () {
comfirm: function() {
if (this.id) {
uni.$emit('setSkill', { detail: {
uni.$emit('setSkill', {
detail: {
id: this.id,
label: this.label,
parentLabel: this.$route.query.parentLabel,
parentTwoLabel: this.$route.query.parentTwoLabel
} ,
},
})
uni.navigateBack({
delta: this.layer
})
} else {
uni.showToast({
title: "请选择地点",
title: "请选择类别",
icon: "none"
})
}
},
}
}
}
</script>
<style>
.bottombtn {
.bottombtn {
background-color: #1B66FF;
color: #fff;
text-align: center;
@@ -153,9 +154,9 @@ export default {
font-size: 32rpx;
height: 90rpx;
line-height: 90rpx;
}
}
.btn {
.btn {
background-color: #fefefe;
width: 690rpx;
padding: 30rpx;
@@ -163,14 +164,14 @@ export default {
position: fixed;
bottom: 0;
left: 0;
}
}
.cityList image {
.cityList image {
width: 32rpx;
height: 32rpx;
}
}
.cityList {
.cityList {
display: flex;
align-items: center;
justify-content: space-between;
@@ -182,9 +183,9 @@ export default {
margin-left: 30rpx;
width: 690rpx;
border-bottom: 1rpx solid #dddddd;
}
}
.location {
.location {
font-family: PingFangSC-Regular;
font-size: 32rpx;
color: #333333;
@@ -192,26 +193,26 @@ export default {
align-items: center;
justify-content: flex-start;
padding: 30rpx;
}
}
.comfirm {
.comfirm {
margin-left: auto;
}
}
.location image {
.location image {
width: 40rpx;
height: 40rpx;
}
}
.title {
.title {
font-family: PingFangSC-Regular;
font-size: 28rpx;
color: #999999;
background-color: #f6f6f6;
padding: 30rpx;
}
}
page {
page {
background-color: #fefefe;
}
}
</style>

View File

@@ -3,11 +3,10 @@ module.exports = {
port: 1887,
proxy: {
'/api': {
target: 'http://192.168.1.101:8200',
target: 'http://10.165.0.173:8000',
ws: true,
changeOrigin: true,
pathRewrite: {
"^/api/jobslink-api": "/"
'^/api': '/'
}
},
'/qq/map': {