flat: 暂存

2024-04-16 10:41:03 +08:00
parent ebb6fe631f
commit d2eb30fd83
6 changed files with 646 additions and 618 deletions
--- a/App.vue
+++ b/App.vue
@@ -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')
--- a/api/mission.js
+++ b/api/mission.js
@@ -1,297 +1,285 @@
-import {
-	request
-} from '@/untils/AxiosUtils.js';
-import {
-	getStore
-} from '@/untils/store.js'
-
-function getHeader() {
-	const platformId = getStore({
-		name: 'platformId'
-	})
-	if (platformId) {
-		return {
-			'Platform-Id': platformId
-		}
-	} else {
-		return {}
-	}
-}
-
-/*首页 最新任务(10条)*/
-export const newMission = () => {
-	return request({
-		url: '/api/jobslink-api/missions/front/mission/guestList',
-		method: 'get',
-		headers: getHeader()
-	})
-}
-
-
-/*首页 推荐任务(10条)*/
-export const recMission = () => {
-	return request({
-		url: '/api/jobslink-api/missions/user/mission/interestedList',
-		method: 'get',
-		headers: getHeader()
-	})
-}
-
-/*抢任务-推荐岗位*/
-export const nearMission = (current, size, lat, lon, distance) => {
-	return request({
-		url: '/api/jobslink-api/user/userWork/getPushListByUserId',
-		method: 'get',
-		params: {
-			current,
-			size,
-			lat,
-			lon,
-			distance
-		},
-		headers: getHeader()
-	})
-}
-
-/*抢任务-推荐任务*/
-export const recommendMission = (current, size, seaStr) => {
-	return request({
-		url: '/api/jobslink-api/missions/user/mission/recommendList',
-		method: 'get',
-		params: {
-			current,
-			size,
-			seaStr
-		},
-		headers: getHeader()
-	})
-}
-
-/*抢任务-最新任务*/
-export const newMissionAll = (current, size, seaStr) => {
-	return request({
-		url: '/api/jobslink-api/missions/user/mission/getPushList',
-		method: 'get',
-		params: {
-			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) => {
-	return request({
-		url: '/api/jobslink-api/missions/user/mission/missionApply',
-		method: 'post',
-		params: {
-			missionNo,
-			type
-		}
-	})
-}
-
-
-
-/*我的任务*/
-export const myMission = (current, size, status) => {
-	return request({
-		url: '/api/jobslink-api/missions/user/mission/getUserMissionList',
-		method: 'get',
-		params: {
-			current,
-			size,
-			status
-		}
-	})
-}
-
-// 消息中心：推荐岗位和推荐任务
-export const tuiJianMission = (ids, type) => {
-	return request({
-		url: '/api/jobslink-api/user/userWork/getListByIDs',
-		method: 'get',
-		params: {
-			ids,
-			type
-		}
-	})
-}
-
-// 推送政策
-export const getNewsPolicyList = (ids) => {
-	return request({
-		url: '/api/jobslink-api/policy/userList',
-		method: 'get',
-		params: {
-			ids
-		}
-	})
-}
-
-/*我的收藏*/
-export const myCollection = (current, size, status) => {
-	return request({
-		url: '/api/jobslink-api/jkWorks/jkWorks/getCollectListByUserId',
-		method: 'get',
-		params: {
-			current,
-			size,
-			status
-		}
-	})
-}
-
-/*浏览记录*/
-export const myBrowing = (current, size, status) => {
-	return request({
-		url: '/api/jobslink-api/user/useraction/getListByUserId',
-		method: 'get',
-		params: {
-			current,
-			size,
-			status
-		}
-	})
-}
-
-/*招工消息通知列表*/
-export const recruitmentNewsList = (current, size, status) => {
-	return request({
-		url: '/api/jobslink-api/user/userrecruit/getCollectList',
-		method: 'get',
-		params: {
-			current,
-			size,
-			status
-		}
-	})
-}
-
-/*任务详情*/
-export const missionDetail = (missionNo) => {
-	return request({
-		url: '/api/jobslink-api/missions/front/mission/detail',
-		method: 'get',
-		params: {
-			missionNo
-		}
-	})
-}
-/*任务详情*/
-export const recruit_missionDetail = (missionNo,type) => {
-	return request({
-		url: '/api/jobslink-api/user/userrecruit/getCollectUserList',
-		method: 'get',
-		params: {
-			id:missionNo,
-			type
-		}
-	})
-}
-
-/*岗位详情*/
-// workDetail
-export const workDetail = (workId) => {
-	return request({
-		url: '/api/jobslink-api/user/userWork/getWorksInfoByWorkId',
-		method: 'get',
-		params: {
-			workId
-		}
-	})
-}
-
-/*获取收藏状态*/
-export const getCollectState = (workId, type) => {
-	return request({
-		url: '/api/jobslink-api/jkWorks/jkWorks/getCollectStatus',
-		method: 'get',
-		params: {
-			workId,
-			type
-		}
-	})
-}
-
-/*收藏和取消收藏接口*/
-export const updateCollectStatus = (workId, status, type) => {
-	return request({
-		url: '/api/jobslink-api/jkWorks/jkWorks/updateCollectStatus',
-		method: 'get',
-		params: {
-			workId,
-			status,
-			type
-		}
-	})
-}
-
-
-/*获取查询关键字列表*/
-export const getSearchKeyWordsList = () => {
-	return request({
-		url: '/api/jobslink-api/user/userWork/getSearchAllKeyWords',
-		method: 'get',
-	})
-}
-/*清空搜索历史*/
-export const clearSearchKeyWords = () => {
-	return request({
-		url: '/api/jobslink-api/user/userWork/delSearchAllKeyWords',
-		method: 'get',
-	})
-}
-/*通过关键字获取面板搜索结果*/
-export const getListByKeyWords = (keywords) => {
-	return request({
-		url: '/api/jobslink-api/user/userWork/searchAll',
-		method: 'get',
-		params: {
-			keywords
-		}
-	})
-}
+import {
+    request
+} from '@/untils/AxiosUtils.js';
+import {
+    getStore
+} from '@/untils/store.js'
+
+function getHeader() {
+    const platformId = getStore({
+        name: 'platformId'
+    })
+    if (platformId) {
+        return {
+            'Platform-Id': platformId
+        }
+    } else {
+        return {}
+    }
+}
+
+/*首页 最新任务(10条)*/
+export const newMission = () => {
+    return request({
+        url: '/api/jobslink-api/missions/front/mission/guestList',
+        method: 'get',
+        headers: getHeader()
+    })
+}
+
+
+/*首页 推荐任务(10条)*/
+export const recMission = () => {
+    return request({
+        url: '/api/jobslink-api/missions/user/mission/interestedList',
+        method: 'get',
+        headers: getHeader()
+    })
+}
+
+/*抢任务-推荐岗位*/
+export const nearMission = (current, size, lat, lon, distance) => {
+    return request({
+        url: '/api/jobslink-api/user/userWork/getPushListByUserId',
+        method: 'get',
+        params: {
+            current,
+            size,
+            lat,
+            lon,
+            distance
+        },
+        headers: getHeader()
+    })
+}
+
+/*抢任务-推荐任务*/
+export const recommendMission = (current, size, seaStr) => {
+    return request({
+        url: '/api/jobslink-api/missions/user/mission/recommendList',
+        method: 'get',
+        params: {
+            current,
+            size,
+            seaStr
+        },
+        headers: getHeader()
+    })
+}
+
+/*抢任务-最新任务*/
+export const newMissionAll = (current, size, seaStr) => {
+    return request({
+        url: '/api/jobslink-api/missions/user/mission/getPushList',
+        method: 'get',
+        params: {
+            current,
+            size,
+            seaStr
+        },
+        headers: getHeader()
+    })
+}
+/*抢任务-个体户招工*/
+export const nearMissionSearch = (params) => {
+    return request({
+        url: '/api/jobslink-api/user/userWork/searchList',
+        method: 'get',
+        params,
+        headers: getHeader()
+    })
+}
+
+/*抢任务-推荐任务*/
+export const recommendMissionSearch = (params) => {
+    return request({
+        url: '/api/jobslink-api/missions/user/mission/searchList',
+        method: 'get',
+        params,
+        headers: getHeader()
+    })
+}
+
+/*抢任务-推荐岗位*/
+export const newMissionAllSearch = (params) => {
+    return request({
+        url: '/api/jobslink-api/user/userrecruit/searchList',
+        method: 'get',
+        params,
+        headers: getHeader()
+    })
+}
+
+/*提交抢任务*/
+export const submit = (missionNo, type) => {
+    return request({
+        url: '/api/jobslink-api/missions/user/mission/missionApply',
+        method: 'post',
+        params: {
+            missionNo,
+            type
+        }
+    })
+}
+
+
+
+/*我的任务*/
+export const myMission = (current, size, status) => {
+    return request({
+        url: '/api/jobslink-api/missions/user/mission/getUserMissionList',
+        method: 'get',
+        params: {
+            current,
+            size,
+            status
+        }
+    })
+}
+
+// 消息中心：推荐岗位和推荐任务
+export const tuiJianMission = (ids, type) => {
+    return request({
+        url: '/api/jobslink-api/user/userWork/getListByIDs',
+        method: 'get',
+        params: {
+            ids,
+            type
+        }
+    })
+}
+
+// 推送政策
+export const getNewsPolicyList = (ids) => {
+    return request({
+        url: '/api/jobslink-api/policy/userList',
+        method: 'get',
+        params: {
+            ids
+        }
+    })
+}
+
+/*我的收藏*/
+export const myCollection = (current, size, status) => {
+    return request({
+        url: '/api/jobslink-api/jkWorks/jkWorks/getCollectListByUserId',
+        method: 'get',
+        params: {
+            current,
+            size,
+            status
+        }
+    })
+}
+
+/*浏览记录*/
+export const myBrowing = (current, size, status) => {
+    return request({
+        url: '/api/jobslink-api/user/useraction/getListByUserId',
+        method: 'get',
+        params: {
+            current,
+            size,
+            status
+        }
+    })
+}
+
+/*招工消息通知列表*/
+export const recruitmentNewsList = (current, size, status) => {
+    return request({
+        url: '/api/jobslink-api/user/userrecruit/getCollectList',
+        method: 'get',
+        params: {
+            current,
+            size,
+            status
+        }
+    })
+}
+
+/*任务详情*/
+export const missionDetail = (missionNo) => {
+    return request({
+        url: '/api/jobslink-api/missions/front/mission/detail',
+        method: 'get',
+        params: {
+            missionNo
+        }
+    })
+}
+/*任务详情*/
+export const recruit_missionDetail = (missionNo, type) => {
+    return request({
+        url: '/api/jobslink-api/user/userrecruit/getCollectUserList',
+        method: 'get',
+        params: {
+            id: missionNo,
+            type
+        }
+    })
+}
+
+/*岗位详情*/
+// workDetail
+export const workDetail = (workId) => {
+    return request({
+        url: '/api/jobslink-api/user/userWork/getWorksInfoByWorkId',
+        method: 'get',
+        params: {
+            workId
+        }
+    })
+}
+
+/*获取收藏状态*/
+export const getCollectState = (workId, type) => {
+    return request({
+        url: '/api/jobslink-api/jkWorks/jkWorks/getCollectStatus',
+        method: 'get',
+        params: {
+            workId,
+            type
+        }
+    })
+}
+
+/*收藏和取消收藏接口*/
+export const updateCollectStatus = (workId, status, type) => {
+    return request({
+        url: '/api/jobslink-api/jkWorks/jkWorks/updateCollectStatus',
+        method: 'get',
+        params: {
+            workId,
+            status,
+            type
+        }
+    })
+}
+
+
+/*获取查询关键字列表*/
+export const getSearchKeyWordsList = () => {
+    return request({
+        url: '/api/jobslink-api/user/userWork/getSearchAllKeyWords',
+        method: 'get',
+    })
+}
+/*清空搜索历史*/
+export const clearSearchKeyWords = () => {
+    return request({
+        url: '/api/jobslink-api/user/userWork/delSearchAllKeyWords',
+        method: 'get',
+    })
+}
+/*通过关键字获取面板搜索结果*/
+export const getListByKeyWords = (keywords) => {
+    return request({
+        url: '/api/jobslink-api/user/userWork/searchAll',
+        method: 'get',
+        params: {
+            keywords
+        }
+    })
+}
--- a/components/vertical-menu/classifyData.js
+++ b/components/vertical-menu/classifyData.js
@@ -1,305 +1,317 @@
-export const classifyData = [{
-		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元/天以上",
-			},
-		],
-	},
-];
-
-export const classifyData2 =  [{
-		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: "2000元(含)以下",
-				id: "0-2000",
-			},
-			{
-				name: "2000-5000元元(含)",
-				id: "2000-5000",
-			},
-			{
-				name: "5000-8000元(含)",
-				id: "5000-8000",
-			},
-			{
-				name: "8000-10000元(含)",
-				id: "8000-10000",
-			},
-			{
-				name: "10000-15000元(含)",
-				id: "10000-15000",
-			},
-			{
-				name: "15000-20000元(含)",
-				id: "15000-20000",
-			},
-			{
-				name: "20000-25000元(含)",
-				id: "20000-25000",
-			},
-			{
-				name: "25000-30000元(含)",
-				id: "25000-30000",
-			},
-			{
-				name: "30000以上",
-				id: "30000-200000",
-			},
-			{
-				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元/天以上",
-			},
-		],
-	},
+export const classifyData = [{
+        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",
+                wageUnitCategory: 1,
+            },
+            {
+                name: "16-20元/小时",
+                id: "16-20",
+                wageUnitCategory: 1,
+            },
+            {
+                name: "21-25元/小时",
+                id: "21-25",
+                wageUnitCategory: 1,
+            },
+            {
+                name: "26-30元/小时",
+                id: "26-30",
+                wageUnitCategory: 1,
+            },
+            {
+                name: "30元/小时以上",
+                id: "30",
+                wageUnitCategory: 1,
+            },
+            {
+                name: "100-150/天",
+                id: "100-150",
+                wageUnitCategory: 2,
+            },
+            {
+                name: "151-200/天",
+                id: "151-200",
+                wageUnitCategory: 2,
+            },
+            {
+                name: "201-250/天",
+                id: "201-250",
+                wageUnitCategory: 2,
+            },
+            {
+                name: "251-300/天",
+                id: "251-300",
+                wageUnitCategory: 2,
+            },
+            {
+                name: "300元/天以上",
+                id: "300",
+                wageUnitCategory: 2,
+            },
+            {
+                name: "30000元以上/月",
+                id: "30000",
+                wageUnitCategory: 3,
+            },
+            {
+                name: "面议、暂无要求",
+                id: "",
+                wageUnitCategory: '',
+            },
+        ],
+    },
+    {
+        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 const classifyData2 = [{
+        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: "2000元(含)以下",
+                id: "0-2000",
+            },
+            {
+                name: "2000-5000元元(含)",
+                id: "2000-5000",
+            },
+            {
+                name: "5000-8000元(含)",
+                id: "5000-8000",
+            },
+            {
+                name: "8000-10000元(含)",
+                id: "8000-10000",
+            },
+            {
+                name: "10000-15000元(含)",
+                id: "10000-15000",
+            },
+            {
+                name: "15000-20000元(含)",
+                id: "15000-20000",
+            },
+            {
+                name: "20000-25000元(含)",
+                id: "20000-25000",
+            },
+            {
+                name: "25000-30000元(含)",
+                id: "25000-30000",
+            },
+            {
+                name: "30000以上",
+                id: "30000-200000",
+            },
+            {
+                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元/天以上",
+            },
+        ],
+    },
 ];
--- a/components/vertical-menu/vertical-menu.vue
+++ b/components/vertical-menu/vertical-menu.vue
@@ -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,
--- a/pages/login/blank.vue
+++ b/pages/login/blank.vue
@@ -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)
--- a/pages/project/project.vue
+++ b/pages/project/project.vue
@@ -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 = [];
                    }