diff --git a/api/mission.js b/api/mission.js index b9f6c77..6c2624a 100644 --- a/api/mission.js +++ b/api/mission.js @@ -37,7 +37,7 @@ export const recMission = () => { }) } -/*抢任务-附近任务*/ +/*抢任务-推荐岗位*/ export const nearMission = (current, size, lat, lon, distance) => { return request({ url: '/api/jobslink-api/user/userWork/getPushListByUserId', @@ -67,7 +67,6 @@ export const recommendMission = (current, size, seaStr) => { }) } - /*抢任务-最新任务*/ export const newMissionAll = (current, size, seaStr) => { return request({ @@ -81,6 +80,47 @@ export const newMissionAll = (current, size, seaStr) => { headers: getHeader() }) } +/*抢任务-个体户招工*/ +export const nearMissionSearch = (current, size, education,salary,industry,province,city) => { + return request({ + url: '/api/jobslink-api/user/userWork/searchList', + method: 'get', + params: { + current, + size, + education,salary,industry,province,city + }, + headers: getHeader() + }) +} + +/*抢任务-推荐任务*/ +export const recommendMissionSearch = (current, size, education,salary,industry,province,city) => { + return request({ + url: '/api/jobslink-api/missions/user/mission/searchList', + method: 'get', + params: { + current, + size, + education,salary,industry,province,city + }, + headers: getHeader() + }) +} + +/*抢任务-推荐岗位*/ +export const newMissionAllSearch = (current, size, education,salary,industry,province,city) => { + return request({ + url: '/api/jobslink-api/user/userrecruit/searchList', + method: 'get', + params: { + current, + size, + education,salary,industry,province,city + }, + headers: getHeader() + }) +} /*提交抢任务*/ export const submit = (missionNo,type) => { diff --git a/components/vertical-menu/classifyData.js b/components/vertical-menu/classifyData.js index 90787e5..afaca5e 100644 --- a/components/vertical-menu/classifyData.js +++ b/components/vertical-menu/classifyData.js @@ -1,126 +1,156 @@ -export default [ - { - name: "学历", - data: [ - { - name: "学历不限", - id: "学历不限", - }, - { - name: "初中及以下", - id: "初中及以下", - }, - { - name: "中专及中技", - id: "中专及中技", - }, - { - name: "高中", - id: "高中", - }, - { - name: "大专", - id: "大专", - }, - { - name: "本科及以上", - id: "本科及以上", - }, - ], - }, - { - name: "工资", - data: [ - { - name: "薪资不限", - id: "薪资不限", - }, - { - name: "100-150/天", - id: "100-150/天", - }, - { - name: "151-200/天", - id: "151-200/天", - }, - { - name: "201-250/天", - id: "201-250/天", - }, - { - name: "251-300/天", - id: "251-300/天", - }, - { - name: "300元/天以上", - id: "300元/天以上", - }, - ], - }, - { - name: "行业", - data: [ - { - name: "不限年龄", - id: "不限年龄", - }, - { - name: "30以下", - id: "30", - }, - { - name: "35以下", - id: "35", - }, - { - name: "40以下", - id: "40", - }, - { - name: "45以下", - id: "45", - }, - { - name: "50以下", - id: "50", - }, - { - name: "55以下", - id: "55", - }, - { - name: "60以下", - id: "60", - }, - ], - }, - { - name: "区域", - data: [ - { - name: "薪资不限", - id: "薪资不限", - }, - { - name: "100-150/天", - id: "100-150/天", - }, - { - name: "151-200/天", - id: "151-200/天", - }, - { - name: "201-250/天", - id: "201-250/天", - }, - { - name: "251-300/天", - id: "251-300/天", - }, - { - name: "300元/天以上", - id: "300元/天以上", - }, - ], - }, -]; +export default [{ + name: "学历", + data: [{ + name: "不限", + id: "不限", + }, + { + name: "初中及以下", + id: "初中及以下", + }, + { + name: "中专/中技", + id: "中专/中技", + }, + { + name: "高中", + id: "高中", + }, + { + name: "大专", + id: "大专", + }, + { + name: "本科", + id: "本科", + }, + { + name: "硕士", + id: "硕士", + }, + { + name: "博士", + id: "博士", + }, { + name: "MBA/EMBA", + id: "MBA/EMBA", + }, + ], + }, + { + name: "工资", + data: [{ + name: "10-15元/小时", + id: "10-15元/小时", + }, + { + name: "16-20元/小时", + id: "16-20元/小时", + }, + { + name: "21-25元/小时", + id: "21-25元/小时", + }, + { + name: "26-30元/小时", + id: "26-30元/小时", + }, + { + name: "30元/小时以上", + id: "30元/小时以上", + }, + { + name: "100-150/天", + id: "100-150/天", + }, + { + name: "151-200/天", + id: "151-200/天", + }, + { + name: "201-250/天", + id: "201-250/天", + }, + { + name: "251-300/天", + id: "251-300/天", + }, + { + name: "300元/天以上", + id: "300元/天以上", + }, + { + name: "30000元以上/月", + id: "30000元以上/月", + }, + { + name: "面议、暂无要求", + id: "面议、暂无要求", + }, + ], + }, + { + name: "行业", + data: [{ + name: "不限年龄", + id: "不限年龄", + }, + { + name: "30以下", + id: "30", + }, + { + name: "35以下", + id: "35", + }, + { + name: "40以下", + id: "40", + }, + { + name: "45以下", + id: "45", + }, + { + name: "50以下", + id: "50", + }, + { + name: "55以下", + id: "55", + }, + { + name: "60以下", + id: "60", + }, + ], + }, + { + name: "区域", + data: [{ + name: "薪资不限", + id: "薪资不限", + }, + { + name: "100-150/天", + id: "100-150/天", + }, + { + name: "151-200/天", + id: "151-200/天", + }, + { + name: "201-250/天", + id: "201-250/天", + }, + { + name: "251-300/天", + id: "251-300/天", + }, + { + name: "300元/天以上", + id: "300元/天以上", + }, + ], + }, +]; \ No newline at end of file diff --git a/components/vertical-menu/vertical-menu.vue b/components/vertical-menu/vertical-menu.vue index 475923c..f02c69a 100644 --- a/components/vertical-menu/vertical-menu.vue +++ b/components/vertical-menu/vertical-menu.vue @@ -293,6 +293,7 @@ export default { console.log(val); var valArr = val.value; this.areaModal.address = [...new Set(val.value)].join(' / ') + this.areaModal.address1 = valArr console.log(this.areaModal.address); this.areaModal.addressShow = false }, diff --git a/pages/login/blank.vue b/pages/login/blank.vue index eaddfab..a85c44e 100644 --- a/pages/login/blank.vue +++ b/pages/login/blank.vue @@ -17,7 +17,7 @@ }, onLoad(options) { uni.showLoading({ - title: '登陆中' + title: '' }) if(options.token) { const that = this diff --git a/pages/project/project copy.vue b/pages/project/project copy.vue new file mode 100644 index 0000000..a534627 --- /dev/null +++ b/pages/project/project copy.vue @@ -0,0 +1,713 @@ + + + + + diff --git a/pages/project/project.vue b/pages/project/project.vue index 9402e30..dc1ae97 100644 --- a/pages/project/project.vue +++ b/pages/project/project.vue @@ -5,18 +5,19 @@ - - - 四川德阳市 - - + + + 四川德阳市 + + {{ item - }} + :class="['typeButton', index == activeTab ? 'activeButton' : '']" @click="changeTab(index)">{{ + item + }} @@ -64,27 +65,27 @@ - - - - - - - - - - - - - - 暂无信息 - - - + + + + + + + + + + + 暂无信息 + + +