招聘筛选及简历更新

This commit is contained in:
dengxin
2024-02-17 09:42:41 +08:00
parent a4aaf7856c
commit ef2e6dec38
13 changed files with 1464 additions and 941 deletions

View File

@@ -1,98 +1,106 @@
import {request} from '@/untils/AxiosUtils.js'; import { request } from "@/untils/AxiosUtils.js";
/*我的简历-查看*/ /*我的简历-查看*/
export const myResume = () => { export const myResume = () => {
return request({ return request({
url: '/api/jobslink-api/user/user/resume/find', url: "/api/jobslink-api/user/user/resume/find",
method: 'get' method: "get",
}) });
} };
/*我的简历-查看-我的职业技能*/ /*我的简历-查看-我的职业技能*/
export const mySkills = () => { export const mySkills = () => {
return request({ return request({
url: '/api/jobslink-api/user/user/skills/find', url: "/api/jobslink-api/user/user/skills/find",
method: 'get' method: "get",
}) });
} };
/*我的简历-删除-我的职业技能*/ /*我的简历-删除-我的职业技能*/
export const removeSkills = (id) => { export const removeSkills = (id) => {
return request({ return request({
url: '/api/jobslink-api/user/user/skills/remove', url: "/api/jobslink-api/user/user/skills/remove",
method: 'post', method: "post",
params:{ params: {
id id,
} },
}) });
} };
/*我的简历-设置我想工作的地点*/ /*我的简历-设置我想工作的地点*/
export const setCity = (id,cityId) => { export const setCity = (id, cityId) => {
return request({ return request({
url: '/api/jobslink-api/user/user/resume/update', url: "/api/jobslink-api/user/user/resume/update",
method: 'post', method: "post",
data:{ data: {
id, id,
cityId workplace: cityId,
} },
}) });
} };
/*我的简历-设置我想学习的技能*/ /*我的简历-设置我想学习的技能*/
export const setLearn = (id,learnSkill) => { export const setLearn = (id, learnSkill) => {
return request({ return request({
url: '/api/jobslink-api/user/user/resume/update', url: "/api/jobslink-api/user/user/resume/update",
method: 'post', method: "post",
data:{ data: {
id, id,
learnSkill learnSkill,
} },
}) });
} };
/*行业库*/ /*行业库*/
export const getTrade = () => { export const getTrade = () => {
return request({ return request({
url: '/api/jobslink-api/tenant/base/config/trade', url: "/api/jobslink-api/tenant/base/config/trade",
method: 'get' method: "get",
}) });
} };
/*工种库*/ /*工种库*/
export const getWorktypes = (id) => { export const getWorktypes = (id) => {
return request({ return request({
url: '/api/jobslink-api/tenant/base/config/worktypes', url: "/api/jobslink-api/tenant/base/config/worktypes",
method: 'get', method: "get",
params:{ params: {
id id,
} },
}) });
} };
/*技能库*/ /*技能库*/
export const getSkills = (id) => { export const getSkills = (id) => {
return request({ return request({
url: '/api/jobslink-api/tenant/base/config/skills', url: "/api/jobslink-api/tenant/base/config/skills",
method: 'get', method: "get",
params:{ params: {
id id,
} },
}) });
} };
/*新增职业技能*****/ /*新增职业技能*****/
export const addSkills = (trade,worktypes,skills) => { export const addSkills = (trade, worktypes, skills, type) => {
return request({ return request({
url: '/api/jobslink-api/user/user/skills/save', url: "/api/jobslink-api/user/user/skills/save",
method: 'post', method: "post",
params:{ data: {
trade, trade,
worktypes, worktypes,
skills skills,
} type,
}) },
} });
};
/*工种/岗位列表*****/
export const getWorktypesList = (type) => {
console.log(type, "=================");
return request({
url: "/api/jobslink-api/tenant/worktypes/base/list",
method: "get",
params: {
type,
},
});
};

View File

@@ -1,301 +1,125 @@
export default [ export default [
{
name: "年龄",
foods: [
{
name: "不限年龄",
key: "不限年龄",
cat: 10,
},
{
name: "30以下",
key: "30",
cat: 10,
},
{
name: "35以下",
key: "35",
cat: 10,
},
{
name: "40以下",
key: "40",
cat: 10,
},
{
name: "45以下",
key: "45",
cat: 10,
},
{
name: "50以下",
key: "50",
cat: 10,
},
{
name: "55以下",
key: "55",
cat: 10,
},
{
name: "60以下",
key: "60",
cat: 10,
},
],
},
{ {
name: "学历", name: "学历",
foods: [ data: [
{ {
name: "学历不限", name: "学历不限",
key: "学历不限", id: "学历不限",
cat: 6,
}, },
{ {
name: "初中及以下", name: "初中及以下",
key: "初中及以下", id: "初中及以下",
cat: 6,
}, },
{ {
name: "中专及中技", name: "中专及中技",
key: "中专及中技", id: "中专及中技",
cat: 6,
}, },
{ {
name: "高中", name: "高中",
key: "高中", id: "高中",
cat: 6,
}, },
{ {
name: "大专", name: "大专",
key: "大专", id: "大专",
cat: 6,
}, },
{ {
name: "本科及以上", name: "本科及以上",
key: "本科及以上", id: "本科及以上",
cat: 6,
}, },
], ],
}, },
{ {
name: "工资", name: "工资",
foods: [ data: [
{ {
name: "薪资不限", name: "薪资不限",
key: "薪资不限", id: "薪资不限",
cat: 3,
}, },
{ {
name: "100-150/天", name: "100-150/天",
key: "100-150/天", id: "100-150/天",
cat: 3,
}, },
{ {
name: "151-200/天", name: "151-200/天",
key: "151-200/天", id: "151-200/天",
cat: 3,
}, },
{ {
name: "201-250/天", name: "201-250/天",
key: "201-250/天", id: "201-250/天",
cat: 3,
}, },
{ {
name: "251-300/天", name: "251-300/天",
key: "251-300/天", id: "251-300/天",
cat: 3,
}, },
{ {
name: "300元/天以上", name: "300元/天以上",
key: "300元/天以上", id: "300元/天以上",
cat: 3,
}, },
], ],
}, },
{ {
name: "工资", name: "行业",
foods: [ data: [
{
name: "薪资不限",
key: "薪资不限",
cat: 3,
},
{
name: "100-150/天",
key: "100-150/天",
cat: 3,
},
{
name: "151-200/天",
key: "151-200/天",
cat: 3,
},
{
name: "201-250/天",
key: "201-250/天",
cat: 3,
},
{
name: "251-300/天",
key: "251-300/天",
cat: 3,
},
{
name: "300元/天以上",
key: "300元/天以上",
cat: 3,
},
],
},
{
name: "年龄",
foods: [
{ {
name: "不限年龄", name: "不限年龄",
key: "不限年龄", id: "不限年龄",
cat: 10,
}, },
{ {
name: "30以下", name: "30以下",
key: "30", id: "30",
cat: 10,
}, },
{ {
name: "35以下", name: "35以下",
key: "35", id: "35",
cat: 10,
}, },
{ {
name: "40以下", name: "40以下",
key: "40", id: "40",
cat: 10,
}, },
{ {
name: "45以下", name: "45以下",
key: "45", id: "45",
cat: 10,
}, },
{ {
name: "50以下", name: "50以下",
key: "50", id: "50",
cat: 10,
}, },
{ {
name: "55以下", name: "55以下",
key: "55", id: "55",
cat: 10,
}, },
{ {
name: "60以下", name: "60以下",
key: "60", id: "60",
cat: 10,
}, },
], ],
}, },
{ {
name: "学历", name: "省市区县",
foods: [ data: [
{
name: "学历不限",
key: "学历不限",
cat: 6,
},
{
name: "初中及以下",
key: "初中及以下",
cat: 6,
},
{
name: "中专及中技",
key: "中专及中技",
cat: 6,
},
{
name: "高中",
key: "高中",
cat: 6,
},
{
name: "大专",
key: "大专",
cat: 6,
},
{
name: "本科及以上",
key: "本科及以上",
cat: 6,
},
],
},
{
name: "工资",
foods: [
{ {
name: "薪资不限", name: "薪资不限",
key: "薪资不限", id: "薪资不限",
cat: 3,
}, },
{ {
name: "100-150/天", name: "100-150/天",
key: "100-150/天", id: "100-150/天",
cat: 3,
}, },
{ {
name: "151-200/天", name: "151-200/天",
key: "151-200/天", id: "151-200/天",
cat: 3,
}, },
{ {
name: "201-250/天", name: "201-250/天",
key: "201-250/天", id: "201-250/天",
cat: 3,
}, },
{ {
name: "251-300/天", name: "251-300/天",
key: "251-300/天", id: "251-300/天",
cat: 3,
}, },
{ {
name: "300元/天以上", name: "300元/天以上",
key: "300元/天以上", id: "300元/天以上",
cat: 3,
},
],
},
{
name: "工资",
foods: [
{
name: "薪资不限",
key: "薪资不限",
cat: 3,
},
{
name: "100-150/天",
key: "100-150/天",
cat: 3,
},
{
name: "151-200/天",
key: "151-200/天",
cat: 3,
},
{
name: "201-250/天",
key: "201-250/天",
cat: 3,
},
{
name: "251-300/天",
key: "251-300/天",
cat: 3,
},
{
name: "300元/天以上",
key: "300元/天以上",
cat: 3,
}, },
], ],
}, },

View File

@@ -16,27 +16,51 @@
<text>{{ item.name }}</text> <text>{{ item.name }}</text>
</view> </view>
<view class="item-container"> <view class="item-container">
<view @click="clickFunc" class="thumb-box" v-for="(item1, index1) in item.foods" :key="index1"> <view @click="clickFunc({ 'type': 'address' })" v-if="item.name === `省市区县`"
class="thumb-box thumb-box1">
<u-cell-group>
<u-cell icon="map" :title="areaModal.address" :isLink="true"
arrow-direction="down"></u-cell>
</u-cell-group>
</view>
<view @click="clickFunc({ 'type': 'industry' })" v-else-if="item.name === `行业`"
class="thumb-box thumb-box1">
<u-cell-group>
<u-cell icon="map" :title="areaModal.industry" :isLink="true"
arrow-direction="down"></u-cell>
</u-cell-group>
</view>
<view @click="clickFunc({
'type': 'normal', 'bigObj': item, 'smallObj': item1
})" v-else
:class="submitData[item.name] === item1.id ? `selected-box thumb-box` : `thumb-box`"
v-for="(item1, index1) in item.data" :key="index1">
<view class="item-menu-name">{{ item1.name }}</view> <view class="item-menu-name">{{ item1.name }}</view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
<!-- <view class="text-area"> <view class="buttonWrapper">
<text class="title" @click="areaModal.addressShow=true">{{areaModal.address}}</text> <view class="cancelButton">取消</view>
</view> --> <view class="sureButton">确定</view>
</view>
<!-- 省市 -->
<data-picker :show="areaModal.addressShow" @confirm='confirmAddress' @cancel='areaModal.addressShow = false' <data-picker :show="areaModal.addressShow" @confirm='confirmAddress' @cancel='areaModal.addressShow = false'
@close='areaModal.addressShow = false' :defaultNames="areaModal.defaultNames" :indexs="areaModal.indexs" @close='areaModal.addressShow = false' :defaultNames="areaModal.defaultNames" :indexs="areaModal.indexs"
:defaultIds="areaModal.defaultIds" :showToolbar="false" :showBottombar="true" :defaultIds="areaModal.defaultIds" :showToolbar="false" :showBottombar="true"
:labelName="areaModal.labelName"></data-picker> :labelName="areaModal.labelName"></data-picker>
<!-- 行业 -->
<u-picker :show="industryModal.industryShow" :columns="industryModal.industry"></u-picker>
</view> </view>
</template> </template>
<script> <script>
import classifyData from './classifyData.js'; import classifyData from './classifyData.js';
import { mapGetters } from 'vuex' import { getTrade } from '@/api/resume.js'
export default { export default {
components: { components: {
// vTabs, // vTabs,
@@ -63,24 +87,43 @@ export default {
title: 'Hello', title: 'Hello',
// indexs: [0, 0, 8], // indexs: [0, 0, 8],
// defaultIds: [1, 110000, 110106], // defaultIds: [1, 110000, 110106],
defaultNames: ['北京市', '北京市', '房山区'], defaultNames: ['北京市', '北京市', '东城区'],
labelName: "areaName" labelName: "areaName"
} },
industryModal: {
industry: [['中国', '美国', '日本']],
industryShow: false,
},
submitData: {},
} }
}, },
computed: { created: function () {
...mapGetters(['area']) this.getData()
},
onLoad: function () {
console.log("0000000000000000000");
this.getMenuItemTop() this.getMenuItemTop()
console.log(this.area, '--------------------');
}, },
methods: { methods: {
getData: function () {
getTrade().then(res => {
console.log(res.data.data);
const newData = this.tabbar;
newData.map(item => {
if (item.name === "行业") {
item.data = res.data.data
}
})
this.tabbar = newData;
})
},
// 点击左边的栏目切换 // 点击左边的栏目切换
async swichMenu(index) { async swichMenu(index) {
if (this.arr.length == 0) { if (this.arr.length == 0) {
@@ -148,7 +191,7 @@ export default {
await this.getElRect('menu-scroll-view', 'menuHeight'); await this.getElRect('menu-scroll-view', 'menuHeight');
await this.getElRect('u-tab-item', 'menuItemHeight'); await this.getElRect('u-tab-item', 'menuItemHeight');
} }
console.log(index, this.arr[index]); // console.log(index, this.arr[index]);
// 将菜单活动item垂直居中 // 将菜单活动item垂直居中
this.scrollTop = index * this.menuItemHeight + this.menuItemHeight / 2 - this.menuHeight / 2; this.scrollTop = index * this.menuItemHeight + this.menuItemHeight / 2 - this.menuHeight / 2;
}, },
@@ -202,10 +245,21 @@ export default {
}).exec() }).exec()
}) })
}, },
clickFunc(e) { clickFunc({ type, bigObj, smallObj }) {
console.log(e); switch (type) {
this.show = true; case "industry":
this.industryModal.industryShow = true;
break;
case "address":
this.areaModal.addressShow = true this.areaModal.addressShow = true
break;
default:
this.$set(this.submitData, bigObj.name, smallObj.id);
console.log(this.submitData);
break;
}
}, },
changeHandler(e) { changeHandler(e) {
const { const {
@@ -226,7 +280,8 @@ export default {
confirmAddress(val) { confirmAddress(val) {
console.log(val); console.log(val);
var valArr = val.value; var valArr = val.value;
this.areaModal.address = [...new Set(val.value)].join('') this.areaModal.address = [...new Set(val.value)].join(' / ')
console.log(this.areaModal.address);
this.areaModal.addressShow = false this.areaModal.addressShow = false
} }
@@ -329,14 +384,14 @@ export default {
} }
.item-title { .item-title {
font-size: 26rpx; font-size: 28rpx;
font-weight: bold; font-weight: bold;
} }
.item-menu-name { .item-menu-name {
font-weight: normal; font-weight: normal;
font-size: 24rpx; font-size: 26rpx;
color: #666666;
} }
.item-container { .item-container {
@@ -346,19 +401,55 @@ export default {
.thumb-box { .thumb-box {
width: 43%; width: 43%;
line-height: 70rpx; line-height: 80rpx;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
flex-direction: column; flex-direction: column;
margin-top: 20rpx; margin-top: 25rpx;
margin-left: 20rpx; margin-left: 20rpx;
background-color: #f3f4f8; background-color: #f3f4f8;
border: 1px solid #f3f4f8;
color: #666666;
}
.thumb-box1 {
width: 90%;
}
.selected-box {
background-color: #e3eafe;
border: 1px solid #92adfb;
color: #92adfb !important;
} }
.item-menu-image { .item-menu-image {
width: 120rpx; width: 120rpx;
height: 120rpx; height: 120rpx;
} }
.buttonWrapper {
// position: absolute;
// bottom: 10px;
display: flex;
justify-content: space-around;
margin-bottom: -10px;
margin-top: 10px;
}
.cancelButton {
padding: 15rpx 30rpx;
background-color: #f3f4f8;
border-radius: 5px;
color: #9b9b9b;
}
.sureButton {
padding: 15rpx 150rpx;
background-color: #4171f9;
color: #fff;
border-radius: 5px;
}
</style> </style>

View File

@@ -11,7 +11,7 @@
<view class="jobAddress"> <view class="jobAddress">
我从事的行业 我从事的行业
</view> </view>
<view v-if="tradeName" class="jobText">{{tradeName}}</view> <view v-if="tradeName" class="jobText">{{ tradeName }}</view>
<view v-else class="jobText nochoose">请选择</view> <view v-else class="jobText nochoose">请选择</view>
</view> </view>
<image src="../../../static/img/right.svg" mode=""></image> <image src="../../../static/img/right.svg" mode=""></image>
@@ -22,7 +22,7 @@
<view class="jobAddress"> <view class="jobAddress">
我具备的技能 我具备的技能
</view> </view>
<view v-if="worktypesName" class="jobText">{{worktypesName}}</view> <view v-if="worktypesName" class="jobText">{{ worktypesName }}</view>
<view v-else class="jobText nochoose">请选择</view> <view v-else class="jobText nochoose">请选择</view>
</view> </view>
<image src="../../../static/img/right.svg" mode=""></image> <image src="../../../static/img/right.svg" mode=""></image>
@@ -33,25 +33,25 @@
<view class="jobAddress"> <view class="jobAddress">
我的技能水平 我的技能水平
</view> </view>
<view v-if="skillsName" class="jobText">{{skillsName}}</view> <view v-if="skillsName" class="jobText">{{ skillsName }}</view>
<view v-else class="jobText nochoose">请选择</view> <view v-else class="jobText nochoose">请选择</view>
</view> </view>
<image src="../../../static/img/right.svg" mode=""></image> <image src="../../../static/img/right.svg" mode=""></image>
</view> </view>
<view class="border"></view> <view class="border"></view>
<view class="btn"> <view class="btn">
<view v-if="skillsId " class="bottombtn" @click="submit">确定</view> <view v-if="skillsName" class="bottombtn" @click="submit">确定</view>
<view v-else class="bottombtn disabledBtn">确定</view> <view v-else class="bottombtn disabledBtn">确定</view>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import { import {
addSkills addSkills
} from '@/api/resume.js' } from '@/api/resume.js'
export default { export default {
data() { data() {
return { return {
tradeId: '', tradeId: '',
@@ -77,33 +77,32 @@
}) })
uni.$off('setworkTypes') uni.$off('setworkTypes')
uni.$on('setworkTypes', ({ uni.$on('setworkTypes', ({
id, detail
name
}) => { }) => {
this.worktypesId = id console.log(detail, "id,name");
this.worktypesName = name // this.worktypesId = id
this.skillsId = '' this.worktypesName = detail.parentLabel + "-" + detail.label
this.skillsName = '' // this.skillsId = ''
// this.skillsName = ''
}) })
uni.$off('setSkill') uni.$off('setSkill')
uni.$on('setSkill', ({ uni.$on('setSkill', ({
id, detail
name
}) => { }) => {
this.skillsId = id // this.skillsId = id
this.skillsName = name this.skillsName = detail.parentLabel + "-" + detail.label
}) })
}, },
methods: { methods: {
goAddind: function() { goAddind: function () {
uni.navigateTo({ uni.navigateTo({
url: './addInd?id=' + this.tradeId url: './addInd?id=' + this.tradeId
}) })
}, },
skill: function() { skill: function () {
if (this.tradeId) { if (this.tradeId) {
uni.navigateTo({ uni.navigateTo({
url: `./skill?id=${this.worktypesId}&tradeId=${this.tradeId}` url: `./skill?id=${this.worktypesId}&tradeId=${this.tradeId}&maxLayer=2&type=1`
}) })
} else { } else {
uni.showToast({ uni.showToast({
@@ -112,74 +111,84 @@
}); });
} }
}, },
skillLevel: function() { skillLevel: function () {
if (!this.tradeId) { if (!this.tradeId) {
uni.showToast({ uni.showToast({
title: '请先选择从事的行业', title: '请先选择从事的行业',
icon: 'none' icon: 'none'
}); });
} else if (!this.worktypesId) { } else if (!this.worktypesName) {
uni.showToast({ uni.showToast({
title: '请先选择具备的技能', title: '请先选择具备的技能',
icon: 'none' icon: 'none'
}); });
} else { } else {
uni.navigateTo({ uni.navigateTo({
url: `./skillLevel?id=${this.skillsId}&worktypesId=${this.worktypesId}` url: `./skillLevel?id=${this.skillsId}&worktypesId=${this.worktypesId}&maxLayer=2&type=2`
}) })
} }
}, },
submit: function() { submit: function () {
addSkills(this.tradeName, this.worktypesName, this.skillsName).then(res => { console.log(this.tradeName, this.worktypesName, this.skillsName);
let result = this.worktypesName.split('-');
let result1 = this.skillsName.split('-');
console.log(result, result1);
// 工种
addSkills(this.tradeName, result[0], result[1], 0).then(res => {
uni.navigateBack()
})
// 岗位
addSkills(this.tradeName, result1[0], result1[1], 1).then(res => {
uni.navigateBack() uni.navigateBack()
}) })
} }
} }
} }
</script> </script>
<style> <style>
.slo { .slo {
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 28rpx; font-size: 28rpx;
color: #999999; color: #999999;
padding: 0 30rpx; padding: 0 30rpx;
padding-top: 10rpx; padding-top: 10rpx;
} }
.titles { .titles {
font-family: PingFangSC-Medium; font-family: PingFangSC-Medium;
font-size: 36rpx; font-size: 36rpx;
color: #333333; color: #333333;
padding: 0 30rpx; padding: 0 30rpx;
padding-top: 30rpx; padding-top: 30rpx;
} }
.border { .border {
margin-left: 30rpx; margin-left: 30rpx;
width: 720rpx; width: 720rpx;
border-bottom: 2rpx solid #ddd; border-bottom: 2rpx solid #ddd;
opacity: 0.6; opacity: 0.6;
} }
.jobText { .jobText {
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 32rpx; font-size: 32rpx;
color: #666666; color: #666666;
} }
.nochoose { .nochoose {
color: #ccc; color: #ccc;
} }
.jobAddress { .jobAddress {
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 32rpx; font-size: 32rpx;
color: #999999; color: #999999;
} }
.jobcontent { .jobcontent {
padding: 30rpx; padding: 30rpx;
background: #fefefe; background: #fefefe;
@@ -188,44 +197,44 @@
align-items: flex-end; align-items: flex-end;
justify-content: space-between; justify-content: space-between;
line-height: 63rpx; line-height: 63rpx;
} }
.jobcontent image { .jobcontent image {
width: 40rpx; width: 40rpx;
height: 40rpx; height: 40rpx;
margin-bottom: 5px; margin-bottom: 5px;
} }
.listBody {} .listBody {}
.list_text { .list_text {
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 32rpx; font-size: 32rpx;
color: #666666; color: #666666;
} }
.list image { .list image {
width: 40rpx; width: 40rpx;
height: 40rpx; height: 40rpx;
margin-left: auto; margin-left: auto;
} }
.list { .list {
padding: 0 30rpx; padding: 0 30rpx;
height: 126rpx; height: 126rpx;
background: #fefefe; background: #fefefe;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} }
.title image { .title image {
width: 40rpx; width: 40rpx;
height: 40rpx; height: 40rpx;
} }
.title { .title {
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 28rpx; font-size: 28rpx;
color: #999999; color: #999999;
@@ -234,43 +243,43 @@
background-color: #fefefe; background-color: #fefefe;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} }
.userInfo { .userInfo {
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 24rpx; font-size: 24rpx;
color: #999999; color: #999999;
} }
.name { .name {
margin-left: 20rpx; margin-left: 20rpx;
font-family: PingFangSC-Medium; font-family: PingFangSC-Medium;
font-size: 36rpx; font-size: 36rpx;
color: #333333; color: #333333;
line-height: 50rpx; line-height: 50rpx;
} }
.head image:last-child { .head image:last-child {
width: 40rpx; width: 40rpx;
height: 40rpx; height: 40rpx;
margin-left: auto; margin-left: auto;
} }
.head image { .head image {
width: 100rpx; width: 100rpx;
height: 100rpx; height: 100rpx;
} }
.head { .head {
padding: 30rpx; padding: 30rpx;
width: 690rpx; width: 690rpx;
background-color: #fefefe; background-color: #fefefe;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: flex-start; justify-content: flex-start;
} }
.bottombtn { .bottombtn {
background-color: #1b66ff; background-color: #1b66ff;
color: #fff; color: #fff;
text-align: center; text-align: center;
@@ -279,9 +288,9 @@
font-size: 32rpx; font-size: 32rpx;
height: 90rpx; height: 90rpx;
line-height: 90rpx; line-height: 90rpx;
} }
.btn { .btn {
background-color: #fefefe; background-color: #fefefe;
width: 690rpx; width: 690rpx;
padding: 30rpx; padding: 30rpx;
@@ -289,9 +298,9 @@
position: fixed; position: fixed;
bottom: 0; bottom: 0;
left: 0; left: 0;
} }
.disabledBtn { .disabledBtn {
background-color: #c8c9cc; background-color: #c8c9cc;
} }
</style> </style>

View File

@@ -6,7 +6,7 @@
<view class="name"> <view class="name">
<view class="userName"> <view class="userName">
{{auth.authInfo.realName}} {{ auth.authInfo.realName }}
</view> </view>
<view class="userInfo"> <view class="userInfo">
个人基本信息 个人基本信息
@@ -19,16 +19,17 @@
<view class="title_text"> <view class="title_text">
我的职业技能 我的职业技能
</view> </view>
<image v-if="mySkills.length<10" src="../../../static/img/add.gray.svg" mode="" @click="goAdd"></image> <image v-if="mySkills.length < 10" src="../../../static/img/add.gray.svg" mode="" @click="goAdd"></image>
</view> </view>
<view class="listBody"> <view class="listBody">
<m-slide-list @controller-reg="controller.reg" @controller-moving="controller.moving" @controller-opened="controller.opened" <m-slide-list @controller-reg="controller.reg" @controller-moving="controller.moving"
@controller-closed="controller.closed" @remove="removeSkills(item.id,index)" v-for="(item,index) in mySkills" :key="item.id" @controller-opened="controller.opened" @controller-closed="controller.closed"
@remove="removeSkills(item.id, index)" v-for="(item, index) in mySkills" :key="item.id"
:button="buttonList"> :button="buttonList">
<view class="list"> <view class="list">
<view class="list_text"> <view class="list_text">
{{item.trade}}·{{item.worktypes}}·{{item.skills}} {{ item.trade }}·{{ item.worktypes }}·{{ item.skills }}
</view> </view>
</view> </view>
</m-slide-list> </m-slide-list>
@@ -38,12 +39,56 @@
<view class="jobAddress"> <view class="jobAddress">
您想工作的地点 您想工作的地点
</view> </view>
<view v-bind:class="['jobText',{nochoose: !myResume.cityId}]"> <view v-bind:class="['jobText', { nochoose: !myResume.cityId }]">
{{myResume.cityId ? getCity(myResume.cityId) : '请选择'}} {{ myResume.cityId ? getCity(myResume.cityId) : '请选择' }}
</view> </view>
</view> </view>
<image src="../../../static/img/right.svg" mode=""></image> <image src="../../../static/img/right.svg" mode=""></image>
</view> </view>
<view class="jobcontent" @click="showPickerFunc('education')">
<view class="jobinfo">
<view class="jobAddress">
您的学历
</view>
<view v-bind:class="['jobText', { nochoose: !myResume.cityId }]">
{{ myResume.education ? this.myResume.education : '请选择' }}
</view>
</view>
<image src="../../../static/img/right.svg" mode=""></image>
</view>
<view class="jobcontent" @click="showPickerFunc('wage')">
<view class="jobinfo">
<view class="jobAddress">
您的期望薪资
</view>
<view v-bind:class="['jobText', { nochoose: !myResume.cityId }]">
{{ myResume.wage ? this.myResume.wage : '请选择' }}
</view>
</view>
<image src="../../../static/img/right.svg" mode=""></image>
</view>
<!-- <view class="jobcontent" @click="goSetCity">
<view class="jobinfo">
<view class="jobAddress">
您的期望薪资
</view>
<view v-bind:class="['jobText', { nochoose: !myResume.cityId }]">
{{ myResume.cityId ? getCity(myResume.cityId) : '请选择' }}
</view>
</view>
<image src="../../../static/img/right.svg" mode=""></image>
</view>
<view class="jobcontent" @click="goSetCity">
<view class="jobinfo">
<view class="jobAddress">
您的联系方式
</view>
<view v-bind:class="['jobText', { nochoose: !myResume.cityId }]">
{{ myResume.cityId ? getCity(myResume.cityId) : '请选择' }}
</view>
</view>
<image src="../../../static/img/right.svg" mode=""></image>
</view> -->
<view class="border"></view> <view class="border"></view>
<!--<view class="jobcontent" @click="goWantSkill"> <!--<view class="jobcontent" @click="goWantSkill">
<view class="jobinfo"> <view class="jobinfo">
@@ -56,24 +101,26 @@
</view> </view>
<image src="../../../static/img/right.svg" mode=""></image> <image src="../../../static/img/right.svg" mode=""></image>
</view>--> </view>-->
<u-picker @confirm="pickerButtonFunc" @cancel="showPicker = false" :show="showPicker" :columns="columns"></u-picker>
</view> </view>
</template> </template>
<script> <script>
import { import {
mapGetters mapGetters
} from 'vuex' } from 'vuex'
import { import {
mySkills, mySkills,
myResume, myResume,
removeSkills, removeSkills,
setCity, setCity,
setLearn setLearn
} from '@/api/resume.js'; } from '@/api/resume.js';
import mSlideList from '@/components/mark-slide-list/mark-slide-list.vue'; import mSlideList from '@/components/mark-slide-list/mark-slide-list.vue';
import controller from '@/components/mark-slide-list/controller'; import controller from '@/components/mark-slide-list/controller';
export default { export default {
components: { components: {
mSlideList mSlideList
}, },
@@ -87,7 +134,14 @@
title: '删除', title: '删除',
background: '#ff3b32', background: '#ff3b32',
clickName: 'remove' clickName: 'remove'
}] }],
showPicker: false,
showType: "",
columns: [
['MBA/EMBA', '博士', '硕士', '本科', '大专', '高中', '中专/中技'
, '初中及以下', '不限'
]
],
} }
}, },
onShow() { onShow() {
@@ -112,7 +166,7 @@
this.mySkills = res.data.data; this.mySkills = res.data.data;
}) })
}, },
goWantSkill: function() { goWantSkill: function () {
uni.$off('getWantSkill') uni.$off('getWantSkill')
uni.$once('getWantSkill', (cb) => { uni.$once('getWantSkill', (cb) => {
cb(this.myResume.learnSkill) cb(this.myResume.learnSkill)
@@ -133,11 +187,13 @@
url: './setWskill?id=' + this.id url: './setWskill?id=' + this.id
}) })
}, },
goSetCity: function() { goSetCity: function () {
uni.$off('setCity') uni.$off('setCity')
uni.$on('setCity', (id) => { uni.$on('setCity', ({ detail }) => {
setCity(this.id, id).then(res => { console.log(detail, '---------------');
this.myResume.cityId = id
setCity(this.id, detail.parentLabel + '-' + detail.label).then(res => {
this.myResume.cityId = detail.id
this.getResume() this.getResume()
}) })
}) })
@@ -145,17 +201,17 @@
url: `/pages/setCity/setCity?maxLayer=2` url: `/pages/setCity/setCity?maxLayer=2`
}) })
}, },
goAdd: function() { goAdd: function () {
uni.navigateTo({ uni.navigateTo({
url: './addSkill' url: './addSkill'
}) })
}, },
goUserBase: function() { goUserBase: function () {
uni.navigateTo({ uni.navigateTo({
url: '../userBase' url: '../userBase'
}) })
}, },
getCity: function(val) { getCity: function (val) {
if (val) { if (val) {
let areas = this.$store.getters.getAreaParents(val) let areas = this.$store.getters.getAreaParents(val)
if (areas.length) { if (areas.length) {
@@ -163,7 +219,7 @@
} }
} }
}, },
removeSkills: function(id, index) { removeSkills: function (id, index) {
removeSkills(id).then(res => { removeSkills(id).then(res => {
uni.showToast({ uni.showToast({
title: '操作成功', title: '操作成功',
@@ -171,82 +227,111 @@
}); });
this.mySkills.splice(index, 1) this.mySkills.splice(index, 1)
}) })
},
showPickerFunc(type) {
this.showType = type;
switch (type) {
case "education":
this.columns =
[['MBA/EMBA', '博士', '硕士', '本科', '大专', '高中', '中专/中技'
, '初中及以下', '不限'
]]
break;
case "wage":
this.columns =[['10-15元/小时', '16-20元/小时', '21-25元/小时', '26-30元/小时', '30元/小时以上', '100-150元/天', '151-200元/天'
, '201-250元/天', '251-300元/天',"300元/天以上","2000元以下/月","2000-5000元/月","5000-8000元/月",
"8000-10000元/月","10000-15000元/月","15000-20000元/月","20000-25000元/月","25000-30000元/月","30000元以上/月","面议、暂无要求"
]]
break;
default:
break;
}
this.showPicker = true;
},
pickerButtonFunc(e) {
console.log(e, this.myResume, this.myResume[this.showType]);
this.myResume[this.showType] = e.value[0];
this.showPicker = false;
} }
} }
} }
</script> </script>
<style> <style>
.border { .border {
margin-left: 30rpx; margin-left: 30rpx;
width: 720rpx; width: 720rpx;
border: 1rpx solid #f2f2f2; border: 1rpx solid #f2f2f2;
/* height: 1rpx; /* height: 1rpx;
background-color: #ddd; */ background-color: #ddd; */
} }
.jobText { .jobText {
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 32rpx; font-size: 32rpx;
color: #666666; color: #666666;
} }
.jobAddress { .jobAddress {
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 28rpx; font-size: 28rpx;
color: #999999; color: #999999;
} }
.nochoose { .nochoose {
color: #ccc; color: #ccc;
} }
.jobcontent { .jobcontent {
padding: 30rpx; padding: 30rpx;
background: #fff; background: #fff;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
line-height: 63rpx; line-height: 63rpx;
} }
.jobcontent image { .jobcontent image {
width: 40rpx; width: 40rpx;
height: 40rpx; height: 40rpx;
} }
.listBody {} .listBody {}
.list_text { .list_text {
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 32rpx; font-size: 32rpx;
color: #666666; color: #666666;
background: #ffffff; background: #ffffff;
overflow-y: auto; overflow-y: auto;
white-space: nowrap; white-space: nowrap;
} }
.list image { .list image {
width: 40rpx; width: 40rpx;
height: 40rpx; height: 40rpx;
margin-left: auto; margin-left: auto;
} }
.list { .list {
padding: 0 15px 0 30rpx; padding: 0 15px 0 30rpx;
height: 126rpx; height: 126rpx;
line-height: 126rpx; line-height: 126rpx;
background: #fff; background: #fff;
border-bottom: 1px solid #f2f2f2; border-bottom: 1px solid #f2f2f2;
} }
.title image { .title image {
width: 40rpx; width: 40rpx;
height: 40rpx; height: 40rpx;
} }
.title { .title {
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 28rpx; font-size: 28rpx;
color: #999999; color: #999999;
@@ -257,43 +342,43 @@
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
border: 1rpx solid #f2f2f2; border: 1rpx solid #f2f2f2;
} }
.userInfo { .userInfo {
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 24rpx; font-size: 24rpx;
color: #999999; color: #999999;
} }
.name { .name {
margin-left: 20rpx; margin-left: 20rpx;
font-family: PingFangSC-Medium; font-family: PingFangSC-Medium;
font-size: 36rpx; font-size: 36rpx;
color: #333333; color: #333333;
line-height: 50rpx; line-height: 50rpx;
} }
.head image:last-child { .head image:last-child {
width: 40rpx; width: 40rpx;
height: 40rpx; height: 40rpx;
margin-left: auto; margin-left: auto;
} }
.head image { .head image {
width: 100rpx; width: 100rpx;
height: 100rpx; height: 100rpx;
} }
page { page {
background-color: #f6f6f6; background-color: #f6f6f6;
} }
.head { .head {
padding: 30rpx; padding: 30rpx;
width: 690rpx; width: 690rpx;
background-color: #fff; background-color: #fff;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: flex-start; justify-content: flex-start;
} }
</style> </style>

View File

@@ -0,0 +1,51 @@
<template>
<select-template ref="select" title="请选择技能" slo="请选择最符合你能力的标签,标签会帮你定制个性化推荐任务信息" :list="skillLevel" search @submit="goAdd"></select-template>
</template>
<script>
import {
getWorktypes
} from '@/api/resume.js'
import selectTemplate from './selectTemplate.vue'
export default {
components: {
selectTemplate
},
data() {
return {
skillLevel: [],
tradeId: '',
id: ''
}
},
onLoad: function({
id,
tradeId
}) {
this.tradeId = tradeId
},
onShow: function() {
this.getData()
},
mounted() {
this.$refs.select.setActiveId(this.tradeId)
},
methods: {
getData: function() {
if (this.tradeId) {
getWorktypes(this.tradeId).then(res => {
this.skillLevel = res.data.data
})
}
},
goAdd(res) {
uni.$emit('setworkTypes', res)
uni.navigateBack()
}
}
}
</script>
<style>
</style>

View File

@@ -1,51 +1,182 @@
<template> <template>
<select-template ref="select" title="请选择技能" slo="请选择最符合你能力的标签,标签会帮你定制个性化推荐任务信息" :list="skillLevel" search @submit="goAdd"></select-template> <view>
<view class="title">
全部
</view>
<block v-for="(item, index) in city" :key="index">
<view class="cityList" @click="cityClick(item)">
{{ item.name }}
<image src="../../../static/img/correct.svg" v-if="id === item.id" mode=""></image>
<image v-else-if="layer !== maxLayer" src="../../../static/img/right.svg" mode=""></image>
</view>
</block>
<view class="" v-if="layer === maxLayer" style="height: 230rpx;background-color: #f6f6f6;"></view>
<view class="btn" v-if="layer === maxLayer" @click="comfirm">
<view class="bottombtn">
确定
</view>
</view>
</view>
</template> </template>
<script> <script>
import { import {
getWorktypes getWorktypesList
} from '@/api/resume.js' } from '@/api/resume.js'
import selectTemplate from './selectTemplate.vue'
export default { export default {
components: {
selectTemplate
},
data() { data() {
return { return {
skillLevel: [], workTypeList: [],
choose: false,
chooseIndex: '',
parentId: undefined,
layer: 1,
maxLayer: 2,
id: '',
label: '',
tradeId: '', tradeId: '',
id: ''
} }
}, },
onLoad: function({ computed: {
id, city() {
tradeId if (this.parentId) {
}) { const parentItem = this.workTypeList.find(item => item.id == this.parentId);
this.tradeId = tradeId if (parentItem) {
}, return parentItem.child;
onShow: function() { }
this.getData() } else {
return this.workTypeList;
}
}
}, },
mounted() { mounted() {
this.$refs.select.setActiveId(this.tradeId) getWorktypesList(1).then(res => {
this.workTypeList = res.data.data;
})
}, },
onLoad({
tradeId,
parentId,
layer,
maxLayer
}) {
this.parentId = parentId
this.tradeId = tradeId || 0
this.layer = parseInt(layer || 1)
this.maxLayer = parseInt(maxLayer || 2)
},
onShow: function () { },
methods: { methods: {
getData: function() { cityClick(item) {
if (this.tradeId) { if (this.layer === this.maxLayer) {
getWorktypes(this.tradeId).then(res => { this.selectCity(item)
this.skillLevel = res.data.data } else {
this.goCityInfo(item)
}
},
selectCity(item) {
console.log(item, "item");
this.id = item.id;
this.label = item.name;
},
goCityInfo(item) {
uni.navigateTo({
url: `./skill?layer=${this.layer + 1}&maxLayer=${this.maxLayer}&parentId=${item.id}&parentLabel=${item.name}`
})
},
comfirm: function () {
if (this.id) {
uni.$emit('setworkTypes', { detail: { id: this.id, label: this.label, parentLabel: this.$route.query.parentLabel } })
uni.navigateBack({
delta: this.layer
})
} else {
uni.showToast({
title: "请选择地点",
icon: "none"
}) })
} }
}, },
goAdd(res) {
uni.$emit('setworkTypes', res)
uni.navigateBack()
}
}
} }
}
</script> </script>
<style> <style>
.bottombtn {
background-color: #1B66FF;
color: #fff;
text-align: center;
border-radius: 10rpx;
font-family: PingFangSC-Medium;
font-size: 32rpx;
height: 90rpx;
line-height: 90rpx;
}
.btn {
background-color: #fefefe;
width: 690rpx;
padding: 30rpx;
padding-bottom: 80rpx;
position: fixed;
bottom: 0;
left: 0;
}
.cityList image {
width: 32rpx;
height: 32rpx;
}
.cityList {
display: flex;
align-items: center;
justify-content: space-between;
font-family: PingFangSC-Regular;
font-size: 32rpx;
color: #333333;
padding: 30rpx;
padding-left: 0;
margin-left: 30rpx;
width: 690rpx;
border-bottom: 1rpx solid #dddddd;
}
.location {
font-family: PingFangSC-Regular;
font-size: 32rpx;
color: #333333;
display: flex;
align-items: center;
justify-content: flex-start;
padding: 30rpx;
}
.comfirm {
margin-left: auto;
}
.location image {
width: 40rpx;
height: 40rpx;
}
.title {
font-family: PingFangSC-Regular;
font-size: 28rpx;
color: #999999;
background-color: #f6f6f6;
padding: 30rpx;
}
page {
background-color: #fefefe;
}
</style> </style>

View File

@@ -1,55 +1,182 @@
<template> <template>
<select-template ref="select" title="请选择技能水平" slo="请选择最符合你能力的标签,标签会帮你定制个性化推荐任务信息" :list="skillLevel" @submit="goAdd"></select-template> <view>
<view class="title">
全部
</view>
<block v-for="(item, index) in city" :key="index">
<view class="cityList" @click="cityClick(item)">
{{ item.name }}
<image src="../../../static/img/correct.svg" v-if="id === item.id" mode=""></image>
<image v-else-if="layer !== maxLayer" src="../../../static/img/right.svg" mode=""></image>
</view>
</block>
<view class="" v-if="layer === maxLayer" style="height: 230rpx;background-color: #f6f6f6;"></view>
<view class="btn" v-if="layer === maxLayer" @click="comfirm">
<view class="bottombtn">
确定
</view>
</view>
</view>
</template> </template>
<script> <script>
import testData from '@/common/textdata.js'; import {
import { getWorktypesList
getSkills } from '@/api/resume.js'
} from '@/api/resume.js'
import selectTemplate from './selectTemplate.vue'
export default { export default {
components: {
selectTemplate
},
data() { data() {
return { return {
skillLevel: [], workTypeList: [],
worktypesId: null,
activeName: '', choose: false,
activeId: '', chooseIndex: '',
id: '' parentId: undefined,
layer: 1,
maxLayer: 2,
id: '',
label: '',
tradeId: '',
} }
}, },
onLoad({ computed: {
id, city() {
worktypesId if (this.parentId) {
}) { const parentItem = this.workTypeList.find(item => item.id == this.parentId);
this.id = id if (parentItem) {
this.worktypesId = worktypesId return parentItem.child;
}, }
onShow: function() { } else {
this.getData() return this.workTypeList;
}
}
}, },
mounted() { mounted() {
this.$refs.select.setActiveId(this.id) getWorktypesList(2).then(res => {
this.workTypeList = res.data.data;
})
}, },
onLoad({
tradeId,
parentId,
layer,
maxLayer
}) {
this.parentId = parentId
this.tradeId = tradeId || 0
this.layer = parseInt(layer || 1)
this.maxLayer = parseInt(maxLayer || 2)
},
onShow: function () { },
methods: { methods: {
getData: function() { cityClick(item) {
if (this.worktypesId) { if (this.layer === this.maxLayer) {
getSkills(this.worktypesId).then(res => { this.selectCity(item)
this.skillLevel = res.data.data } else {
this.goCityInfo(item)
}
},
selectCity(item) {
console.log(item, "item");
this.id = item.id;
this.label = item.name;
},
goCityInfo(item) {
uni.navigateTo({
url: `./skillLevel?layer=${this.layer + 1}&maxLayer=${this.maxLayer}&parentId=${item.id}&parentLabel=${item.name}`
})
},
comfirm: function () {
if (this.id) {
uni.$emit('setSkill', { detail: { id: this.id, label: this.label, parentLabel: this.$route.query.parentLabel } })
uni.navigateBack({
delta: this.layer
})
} else {
uni.showToast({
title: "请选择地点",
icon: "none"
}) })
} }
}, },
goAdd(res) {
uni.$emit('setSkill', res)
uni.navigateBack()
},
}
} }
}
</script> </script>
<style> <style>
.bottombtn {
background-color: #1B66FF;
color: #fff;
text-align: center;
border-radius: 10rpx;
font-family: PingFangSC-Medium;
font-size: 32rpx;
height: 90rpx;
line-height: 90rpx;
}
.btn {
background-color: #fefefe;
width: 690rpx;
padding: 30rpx;
padding-bottom: 80rpx;
position: fixed;
bottom: 0;
left: 0;
}
.cityList image {
width: 32rpx;
height: 32rpx;
}
.cityList {
display: flex;
align-items: center;
justify-content: space-between;
font-family: PingFangSC-Regular;
font-size: 32rpx;
color: #333333;
padding: 30rpx;
padding-left: 0;
margin-left: 30rpx;
width: 690rpx;
border-bottom: 1rpx solid #dddddd;
}
.location {
font-family: PingFangSC-Regular;
font-size: 32rpx;
color: #333333;
display: flex;
align-items: center;
justify-content: flex-start;
padding: 30rpx;
}
.comfirm {
margin-left: auto;
}
.location image {
width: 40rpx;
height: 40rpx;
}
.title {
font-family: PingFangSC-Regular;
font-size: 28rpx;
color: #999999;
background-color: #f6f6f6;
padding: 30rpx;
}
page {
background-color: #fefefe;
}
</style> </style>

View File

@@ -39,7 +39,7 @@
{ {
"path" : "pages/project/project", "path" : "pages/project/project",
"style" : { "style" : {
"navigationBarTitleText" : "抢任务", "navigationBarTitleText" : "德阳市灵活就业平台",
"navigationBarBackgroundColor" : "#FFFFFF", "navigationBarBackgroundColor" : "#FFFFFF",
"enablePullDownRefresh" : true "enablePullDownRefresh" : true
} }

View File

@@ -1,21 +1,32 @@
<template> <template>
<view> <view>
<view class="titleSearch">
<view class="searchName">抢任务</view>
<u-search @focus="goSeach" shape="round" :showAction="false"></u-search>
</view>
<view>
<view>任务</view>
<view>岗位</view>
<view>推荐</view>
</view>
<!-- 筛选 --> <!-- 筛选 -->
<view class="screenButton" @click="showPopUp = true"> <view class="screenButton" @click="showPopUp = true">
筛选 筛选
<view class="arrow-up-right"> <view class="arrow-up-right"> </view>
</view> </view>
</view> <u-popup closeable :show="showPopUp" mode="right" @close="closePopUp" @open="openPopUp">
<u-popup :show="showPopUp" mode="right" @close="closePopUp" @open="openPopUp">
<view class="popUpWrapper"> <view class="popUpWrapper">
<verticalMenu></verticalMenu> <verticalMenu></verticalMenu>
</view> </view>
</u-popup> </u-popup>
<v-tabs :tabs="['最新', '附近', '推荐']" height="45px" v-model="activeTab" color="#999" activeColor="#000" <!-- <v-tabs :tabs="['最新', '附近', '推荐']" height="45px" v-model="activeTab" color="#999" activeColor="#000"
fontSize="36rpx" activeFontSize="36rpx" @change='changeTab' /> fontSize="36rpx" activeFontSize="36rpx" @change='changeTab' />
<image src="../../static/img/search.svg" @click="goSeach" class="topseach" mode=""></image> <image src="../../static/img/search.svg" @click="goSeach" class="topseach" mode=""></image> -->
<block v-if="activeTab == 0"> <block v-if="activeTab == 0">
<view v-if="newList.length > 0"> <view v-if="newList.length > 0">
@@ -363,6 +374,19 @@ export default {
</script> </script>
<style> <style>
.titleSearch{
display: flex;
width: 80%;
margin: 0 auto;
font-size: 22px;
font-weight: bold;
padding: 10rpx;
}
.searchName{
margin-right: 15rpx;
}
.screenButton { .screenButton {
position: absolute; position: absolute;
top: 10px; top: 10px;
@@ -460,6 +484,6 @@ export default {
} }
.popUpWrapper { .popUpWrapper {
width: 300px; width: 100%;
} }
</style> </style>

View File

@@ -5,7 +5,7 @@
</view> </view>
<block v-for="item in city" :key="item.value"> <block v-for="item in city" :key="item.value">
<view class="cityList" @click="cityClick(item)"> <view class="cityList" @click="cityClick(item)">
{{item.label}} {{ item.label }}
<image src="../../static/img/correct.svg" v-if='id === item.value' mode=""></image> <image src="../../static/img/correct.svg" v-if='id === item.value' mode=""></image>
<image v-else-if="layer !== maxLayer" src="../../static/img/right.svg" mode=""></image> <image v-else-if="layer !== maxLayer" src="../../static/img/right.svg" mode=""></image>
</view> </view>
@@ -20,14 +20,14 @@
</template> </template>
<script> <script>
import { import {
getcoder getcoder
} from "@/api/map.js"; } from "@/api/map.js";
import { import {
mapGetters mapGetters
} from 'vuex' } from 'vuex'
export default { export default {
data() { data() {
return { return {
choose: false, choose: false,
@@ -36,6 +36,7 @@
layer: 1, layer: 1,
maxLayer: 3, maxLayer: 3,
id: '', id: '',
label: '',
} }
}, },
computed: { computed: {
@@ -48,7 +49,7 @@
} }
} }
}, },
created() {}, created() { },
onLoad({ onLoad({
parentId, parentId,
layer, layer,
@@ -58,7 +59,7 @@
this.layer = parseInt(layer || 1) this.layer = parseInt(layer || 1)
this.maxLayer = parseInt(maxLayer || 3) this.maxLayer = parseInt(maxLayer || 3)
}, },
onShow: function() {}, onShow: function () { },
methods: { methods: {
cityClick(item) { cityClick(item) {
if (this.layer === this.maxLayer) { if (this.layer === this.maxLayer) {
@@ -68,16 +69,18 @@
} }
}, },
selectCity(item) { selectCity(item) {
this.id = item.value this.id = item.value;
this.label = item.label;
}, },
goCityInfo(item) { goCityInfo(item) {
uni.navigateTo({ uni.navigateTo({
url: `./setCity?layer=${this.layer + 1}&maxLayer=${this.maxLayer}&parentId=${item.value}` url: `./setCity?layer=${this.layer + 1}&maxLayer=${this.maxLayer}&parentId=${item.value}&parentLabel=${item.label}`
}) })
}, },
comfirm: function() { comfirm: function () {
if (this.id) { if (this.id) {
uni.$emit("setCity", this.id) uni.$emit("setCity", { detail: { id: this.id, label: this.label, parentLabel: this.$route.query.parentLabel } })
uni.navigateBack({ uni.navigateBack({
delta: this.layer delta: this.layer
}) })
@@ -89,11 +92,11 @@
} }
}, },
} }
} }
</script> </script>
<style> <style>
.bottombtn { .bottombtn {
background-color: #1B66FF; background-color: #1B66FF;
color: #fff; color: #fff;
text-align: center; text-align: center;
@@ -102,9 +105,9 @@
font-size: 32rpx; font-size: 32rpx;
height: 90rpx; height: 90rpx;
line-height: 90rpx; line-height: 90rpx;
} }
.btn { .btn {
background-color: #fefefe; background-color: #fefefe;
width: 690rpx; width: 690rpx;
padding: 30rpx; padding: 30rpx;
@@ -112,14 +115,14 @@
position: fixed; position: fixed;
bottom: 0; bottom: 0;
left: 0; left: 0;
} }
.cityList image { .cityList image {
width: 32rpx; width: 32rpx;
height: 32rpx; height: 32rpx;
} }
.cityList { .cityList {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
@@ -131,9 +134,9 @@
margin-left: 30rpx; margin-left: 30rpx;
width: 690rpx; width: 690rpx;
border-bottom: 1rpx solid #dddddd; border-bottom: 1rpx solid #dddddd;
} }
.location { .location {
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 32rpx; font-size: 32rpx;
color: #333333; color: #333333;
@@ -141,26 +144,26 @@
align-items: center; align-items: center;
justify-content: flex-start; justify-content: flex-start;
padding: 30rpx; padding: 30rpx;
} }
.comfirm { .comfirm {
margin-left: auto; margin-left: auto;
} }
.location image { .location image {
width: 40rpx; width: 40rpx;
height: 40rpx; height: 40rpx;
} }
.title { .title {
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 28rpx; font-size: 28rpx;
color: #999999; color: #999999;
background-color: #f6f6f6; background-color: #f6f6f6;
padding: 30rpx; padding: 30rpx;
} }
page { page {
background-color: #fefefe; background-color: #fefefe;
} }
</style> </style>

View File

@@ -0,0 +1,169 @@
<template>
<view>
<view class="title">
全部
</view>
<block v-for="item in city" :key="item.value">
<view class="cityList" @click="cityClick(item)">
{{ item.label }}
<image src="../../static/img/correct.svg" v-if='id === item.value' mode=""></image>
<image v-else-if="layer !== maxLayer" src="../../static/img/right.svg" mode=""></image>
</view>
</block>
<view class="" v-if="layer === maxLayer" style="height: 230rpx;background-color: #f6f6f6;"></view>
<view class="btn" v-if="layer === maxLayer" @click="comfirm">
<view class="bottombtn">
确定
</view>
</view>
</view>
</template>
<script>
import {
getcoder
} from "@/api/map.js";
import {
mapGetters
} from 'vuex'
export default {
data() {
return {
choose: false,
chooseIndex: '',
parentId: undefined,
layer: 1,
maxLayer: 3,
id: '',
label: '',
}
},
computed: {
...mapGetters(['area']),
city() {
if (this.parentId) {
return this.area.children[this.parentId]
} else {
return []
}
}
},
created() { },
onLoad({
parentId,
layer,
maxLayer
}) {
this.parentId = parentId || '0'
this.layer = parseInt(layer || 1)
this.maxLayer = parseInt(maxLayer || 3)
},
onShow: function () { },
methods: {
cityClick(item) {
if (this.layer === this.maxLayer) {
this.selectCity(item)
} else {
this.goCityInfo(item)
}
},
selectCity(item) {
this.id = item.value;
this.label = item.label;
},
goCityInfo(item) {
uni.navigateTo({
url: `./setCity?layer=${this.layer + 1}&maxLayer=${this.maxLayer}&parentId=${item.value}&parentLabel=${item.label}`
})
},
comfirm: function () {
if (this.id) {
uni.$emit("setCity", { detail: { id: this.id, label: this.label, parentLabel: this.$route.query.parentLabel } })
uni.navigateBack({
delta: this.layer
})
} else {
uni.showToast({
title: "请选择地点",
icon: "none"
})
}
},
}
}
</script>
<style>
.bottombtn {
background-color: #1B66FF;
color: #fff;
text-align: center;
border-radius: 10rpx;
font-family: PingFangSC-Medium;
font-size: 32rpx;
height: 90rpx;
line-height: 90rpx;
}
.btn {
background-color: #fefefe;
width: 690rpx;
padding: 30rpx;
padding-bottom: 80rpx;
position: fixed;
bottom: 0;
left: 0;
}
.cityList image {
width: 32rpx;
height: 32rpx;
}
.cityList {
display: flex;
align-items: center;
justify-content: space-between;
font-family: PingFangSC-Regular;
font-size: 32rpx;
color: #333333;
padding: 30rpx;
padding-left: 0;
margin-left: 30rpx;
width: 690rpx;
border-bottom: 1rpx solid #dddddd;
}
.location {
font-family: PingFangSC-Regular;
font-size: 32rpx;
color: #333333;
display: flex;
align-items: center;
justify-content: flex-start;
padding: 30rpx;
}
.comfirm {
margin-left: auto;
}
.location image {
width: 40rpx;
height: 40rpx;
}
.title {
font-family: PingFangSC-Regular;
font-size: 28rpx;
color: #999999;
background-color: #f6f6f6;
padding: 30rpx;
}
page {
background-color: #fefefe;
}
</style>

View File

@@ -5,6 +5,7 @@ module.exports = {
'/api': { '/api': {
// target: 'http://127.0.0.1:8000', // 本地服务接口地址 // target: 'http://127.0.0.1:8000', // 本地服务接口地址
target: "http://39.98.184.58:8000", // 阿里云后台地址 target: "http://39.98.184.58:8000", // 阿里云后台地址
// target: "http://192.168.0.100:8000", // 本地网关
ws: true, ws: true,
pathRewrite: { pathRewrite: {
'^/api': '/' '^/api': '/'