flat: 暂存

This commit is contained in:
Apcallover
2024-04-16 10:41:03 +08:00
parent ebb6fe631f
commit d2eb30fd83
6 changed files with 646 additions and 618 deletions

View File

@@ -15,9 +15,9 @@
export default {
onLaunch: function(options) {
if (options.query.ticket) {
if (options.query.token) {
uni.reLaunch({
url: '/pages/login/blank?ticket=' + options.query.ticket
url: '/pages/login/blank?token=' + options.query.token
})
} else if (this.$store.state.user.token) {
this.$store.dispatch('startRefreshTokenTimer')

View File

@@ -81,43 +81,31 @@ export const newMissionAll = (current, size, seaStr) => {
})
}
/*抢任务-个体户招工*/
export const nearMissionSearch = (current, size, education,salary,industry,province,city) => {
export const nearMissionSearch = (params) => {
return request({
url: '/api/jobslink-api/user/userWork/searchList',
method: 'get',
params: {
current,
size,
education,salary,industry,province,city
},
params,
headers: getHeader()
})
}
/*抢任务-推荐任务*/
export const recommendMissionSearch = (current, size, education,salary,industry,province,city) => {
export const recommendMissionSearch = (params) => {
return request({
url: '/api/jobslink-api/missions/user/mission/searchList',
method: 'get',
params: {
current,
size,
education,salary,industry,province,city
},
params,
headers: getHeader()
})
}
/*抢任务-推荐岗位*/
export const newMissionAllSearch = (current, size, education,salary,industry,province,city) => {
export const newMissionAllSearch = (params) => {
return request({
url: '/api/jobslink-api/user/userrecruit/searchList',
method: 'get',
params: {
current,
size,
education,salary,industry,province,city
},
params,
headers: getHeader()
})
}

View File

@@ -41,51 +41,63 @@ export const classifyData = [{
name: "工资",
data: [{
name: "10-15元/小时",
id: "10-15元/小时",
id: "10-15",
wageUnitCategory: 1,
},
{
name: "16-20元/小时",
id: "16-20元/小时",
id: "16-20",
wageUnitCategory: 1,
},
{
name: "21-25元/小时",
id: "21-25元/小时",
id: "21-25",
wageUnitCategory: 1,
},
{
name: "26-30元/小时",
id: "26-30元/小时",
id: "26-30",
wageUnitCategory: 1,
},
{
name: "30元/小时以上",
id: "30元/小时以上",
id: "30",
wageUnitCategory: 1,
},
{
name: "100-150/天",
id: "100-150/天",
id: "100-150",
wageUnitCategory: 2,
},
{
name: "151-200/天",
id: "151-200/天",
id: "151-200",
wageUnitCategory: 2,
},
{
name: "201-250/天",
id: "201-250/天",
id: "201-250",
wageUnitCategory: 2,
},
{
name: "251-300/天",
id: "251-300/天",
id: "251-300",
wageUnitCategory: 2,
},
{
name: "300元/天以上",
id: "300元/天以上",
id: "300",
wageUnitCategory: 2,
},
{
name: "30000元以上/月",
id: "30000元以上/月",
id: "30000",
wageUnitCategory: 3,
},
{
name: "面议、暂无要求",
id: "面议、暂无要求",
id: "",
wageUnitCategory: '',
},
],
},

View File

@@ -69,7 +69,6 @@
classifyData,
classifyData2
} from './classifyData.js';
console.log(classifyData, classifyData2)
import {
getTrade
} from '@/api/resume.js'
@@ -143,7 +142,6 @@
methods: {
getData: function() {
getTrade().then(res => {
console.log(res.data.data);
const newData = this.tabbar;
newData.map(item => {
@@ -153,6 +151,7 @@
})
this.tabbar = newData;
this.industryModal.industry = res.data.data[0]?.name
this.industryModal.industryInfo = res.data.data[0]
this.industryModal.industryList = [res.data.data]
})
@@ -248,7 +247,7 @@
let height1 = this.arr[i];
let height2 = this.arr[i + 1];
// 如果不存在height2意味着数据循环已经到了最后一个设置左边菜单为最后一项即可
// 如果不存在height2意味着数据循环已经到了最后一个设置左边菜单为最后一项即可s
if (!height2 || scrollHeight >= height1 && scrollHeight < height2) {
this.leftMenuStatus(i - 1);
return;
@@ -299,6 +298,9 @@
default:
this.$set(this.submitData, bigObj.name, smallObj.id);
if (smallObj.wageUnitCategory) {
this.$set(this.submitData, 'wageUnitCategory', smallObj.wageUnitCategory);
}
console.log(this.submitData);
break;
}
@@ -323,6 +325,7 @@
confirmAddress(val) {
console.log(val, "点击地址");
var valArr = val.value;
this.areaModal.info = val.chooseObjs
this.areaModal.address = [...new Set(val.value)].join(' / ')
this.areaModal.address1 = valArr
this.areaModal.addressShow = false
@@ -330,6 +333,7 @@
pickerIndustryFunc(val) {
console.log(val, "点击行业");
this.industryModal.industry = val.value[0].name;
this.industryModal.info = val.value[0]
this.industryModal.industryShow = false
},
@@ -343,7 +347,6 @@
if (!this.industryModal.isClickIndustry) {
this.industryModal.industry = "";
}
console.log(this.submitData, this.areaModal, this.industryModal);
this.subMitPopUp({
submitData: this.submitData,
areaModal: this.areaModal,

View File

@@ -19,7 +19,7 @@
uni.showLoading({
title: ''
})
if (options.ticket) {
if (options.token) {
const that = this
console.log(options)
this.$store.dispatch("LoginByUsername", {
@@ -28,7 +28,7 @@
key: '',
code: '1111',
type: "account",
ticket: options.ticket,
token: options.token,
tenantId: website.tenantId
}).then((resp) => {
console.log('123', resp)

View File

@@ -507,9 +507,17 @@
areaModal,
industryModal
} = this.searchData;
nearMissionSearch(this.policyPage.current, this.policyPage.size, submitData["学历"],
submitData["工资"], industryModal?.industry, areaModal?.address1[0], areaModal?.address1[1]
).then(res => {
let params = {
current: this.policyPage.current,
size: this.policyPage.size,
education: submitData["学历"],
salary: submitData["工资"],
industry: industryModal?.industry,
province: areaModal?.address1[0],
city: areaModal?.address1[1],
cityId: areaModal?.info[areaModal?.info?.length - 1]?.id
}
nearMissionSearch(params).then(res => {
if (this.policyPage.current === 1) {
this.policyContentList = [];
}
@@ -528,9 +536,17 @@
areaModal,
industryModal
} = this.searchData;
newMissionAllSearch(this.nearPage.current, this.nearPage.size, submitData["学历"],
submitData["工资"], industryModal?.industry, areaModal?.address1[0], areaModal?.address1[1]
).then(res => {
let params = {
current: this.nearPage.current,
size: this.nearPage.size,
education: submitData["学历"],
salary: submitData["工资"],
industry: industryModal?.info?.id,
province: areaModal?.address1[0],
city: areaModal?.address1[1],
cityId: areaModal?.info[areaModal?.info?.length - 1]?.id
}
newMissionAllSearch(params).then(res => {
if (this.nearPage.current === 1) {
this.companyList = [];
}
@@ -548,9 +564,18 @@
areaModal,
industryModal
} = this.searchData;
recommendMissionSearch(this.newPage.current, this.newPage.size, submitData["学历"],
submitData["工资"], industryModal?.industry, areaModal?.address1[0], areaModal?.address1[1]
).then(res => {
let params = {
current: this.policyPage.current,
size: this.policyPage.size,
education: submitData["学历"],
salary: submitData["工资"],
industry: industryModal?.info?.id,
province: areaModal?.address1[0],
city: areaModal?.address1[1],
wageUnitCategory: submitData["wageUnitCategory"],
cityId: areaModal?.info[areaModal?.info?.length - 1]?.id
}
recommendMissionSearch(params).then(res => {
if (this.newPage.current === 1) {
this.newList = [];
}