招聘页面更新筛选功能

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) => {

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
         },

pages/project/project.vue

@@ -5,18 +5,19 @@
 
 			<u-search placeholder="搜任务/搜岗位/搜政策/搜招工" @focus="goSeach" shape="round" :showAction="false"></u-search>
 		</view>
-        <view class="navPosition" @click="navTo('/pages/project/projectList')">
+		<view class="navPosition" @click="navTo('/pages/project/projectList')">
-            <u-icon name="map" color="#2979ff" size="16"></u-icon>
+			<u-icon name="map" color="#2979ff" size="16"></u-icon>
-            <view class="positionText">四川德阳市</view>
+			<view class="positionText">四川德阳市</view>
-            <u-icon name="arrow-right" color="#666666" size="14"></u-icon>
+			<u-icon name="arrow-right" color="#666666" size="14"></u-icon>
-        </view>
+		</view>
 		<view class="content">
 			<view class="typeButtonWrapper">
 				<view class="typeButtonLeft">
 
 					<view v-for="(item, index) in nonReactiveArray" :key="index"
-						:class="['typeButton', index == activeTab ? 'activeButton' : '']" @click="changeTab(index)">{{ item
+						:class="['typeButton', index == activeTab ? 'activeButton' : '']" @click="changeTab(index)">{{
-						}}</view>
+				item
+			}}</view>
 				</view>
 				<!-- 筛选 -->
 				<view class="screenButton" @click="showPopUp = true">
@@ -64,27 +65,27 @@
 					</view>
 				</view>
 			</block>
-            <block v-if="activeTab == 2">
+			<block v-if="activeTab == 2">
-            	<view>
+				<view>
-            		<!-- <view class="location" @click="gomap">
+					<!-- <view class="location" @click="gomap">
             			<image src="../../static/img/location.svg" mode=""></image>
             			{{ currentAddress }}（切换位置）
             			<image src="../../static/img/right.svg" mode=""></image>
             		</view> -->
-            	</view>
+				</view>
-            
+
-            	<view v-if="policyContentList.length > 0" style="padding-bottom: 20rpx;">
+				<view v-if="policyContentList.length > 0" style="padding-bottom: 20rpx;">
-            		<block v-for="(item, index) in policyContentList" :key="item.id">
+					<block v-for="(item, index) in policyContentList" :key="item.id">
-            			<userrecruitList :companyitem="item"></userrecruitList>
+						<userrecruitList :companyitem="item"></userrecruitList>
-            		</block>
+					</block>
-            	</view>
+				</view>
-            	<view v-else>
+				<view v-else>
-            		<image src="../../static/img/pic_notask.svg" mode="" class="nothing"></image>
+					<image src="../../static/img/pic_notask.svg" mode="" class="nothing"></image>
-            		<view class="nothingContnt">
+					<view class="nothingContnt">
-            			暂无信息
+						暂无信息
-            		</view>
+					</view>
-            	</view>
+				</view>
-            </block>
+			</block>
 
 			<!-- <block v-if="activeTab == 2">
 				
@@ -109,10 +110,13 @@ import userrecruitList from './userrecruitList.vue'
 import {
 	newMissionAll,
 	recommendMission,
-	nearMission
+	nearMission,
+	newMissionAllSearch,
+	recommendMissionSearch,
+	nearMissionSearch,
 } from '@/api/mission.js';
-import {getPolicyContent} from '@/api/newIndex.js'
+import { getPolicyContent } from '@/api/newIndex.js'
-import {getPushListByUserId } from '@/api/userrecruit.js'
+import { getPushListByUserId } from '@/api/userrecruit.js'
 import {
 	getcoder
 } from "@/api/map.js";
@@ -121,10 +125,10 @@ import verticalMenu from '@/components/vertical-menu/vertical-menu.vue';
 export default {
 	components: {
 		vTabs,
-		companyList, 
+		companyList,
 		verticalMenu,
 		workList,
-        userrecruitList
+		userrecruitList
 	},
 
 	data() {
@@ -134,7 +138,7 @@ export default {
 			companyList: [],
 			recommendList: [],
 			newList: [],
-			
+
 			nearPage: {
 				current: 1,
 				size: 10,
@@ -150,11 +154,11 @@ export default {
 				size: 10,
 				total: 0
 			},
-            policyPage: {
+			policyPage: {
-            	current: 1,
+				current: 1,
-            	size: 10,
+				size: 10,
-            	total: 0
+				total: 0
-            },
+			},
 			currentAddress: '',
 			currentPoint: {
 				latitude: 0,
@@ -163,6 +167,8 @@ export default {
 			key: 'FW3BZ-6JTK6-GCUS5-MZCRR-3GPR5-HJFEI',
 			open: false,
 			showPopUp: false,
+			isSearch: false,
+			searchData: {},
 
 			nonReactiveArray: ["推荐任务", "推荐岗位", "个体户招工"],
 		}
@@ -265,39 +271,42 @@ export default {
 				url: '../mapSeach/mapSeach'
 			})
 		},
-		getPolicy(){
+		//个人户招工；
-            let params = {
+		getPolicy() {
-                current: this.policyPage.current,
+			let params = {
-                size: this.policyPage.size,
+				current: this.policyPage.current,
-            }
+				size: this.policyPage.size,
-            getPushListByUserId(params).then((res) => {
+			}
-                if(res.data.code === 200 ){
+			getPushListByUserId(params).then((res) => {
-                    const {records, current, total, size } = res.data.data
+				if (res.data.code === 200) {
-                    console.log('个体招工', records, current, total, size)
+					const { records, current, total, size } = res.data.data
-                    if(!records.length) {
+					console.log('个体招工', records, current, total, size)
-                        return uni.showToast({
+					if (!records.length) {
-                        	icon: "none",
+						return uni.showToast({
-                        	title: '没有更多了',
+							icon: "none",
-                        })
+							title: '没有更多了',
-                    }
+						})
-                    if(current === 1) {
+					}
-                        this.policyContentList = records
+					if (current === 1) {
-                    } else {
+						this.policyContentList = records
-                        this.policyContentList = this.policyContentList.concat(records);
+					} else {
-                    }
+						this.policyContentList = this.policyContentList.concat(records);
-                    this.policyPage.current = current + 1;
+					}
-                    this.policyPage.total = total;
+					this.policyPage.current = current + 1;
-                }
+					this.policyPage.total = total;
-            })
+				}
+			})
 			// getPolicyContent(1).then(res=>{
 			// 	this.policyContentList=res.data.data.records
 			// })
 		},
 		changeTab: function (e) {
+			this.isSearch = false;
+
 			this.activeTab = e;
 		},
-		//附近任务；
 		getNearList: function (point) {
+
 			nearMission(this.nearPage.current, this.nearPage.size).then(res => {
 				if (this.nearPage.current === 1) {
 					this.companyList = [];
@@ -305,40 +314,43 @@ export default {
 				this.nearPage.current += 1;
 				this.nearPage.total = res.data.data.total;
 				if (res.data.data && res.data.data.records.length) {
+
 					this.companyList = this.companyList.concat(res.data.data.records);
 				}
 			})
 		},
-		goPolicyInfo(data){
+		goPolicyInfo(data) {
-			if(data){
+			if (data) {
 				// var val=encodeURIComponent(data)
-				
+
 				uni.navigateTo({
-					url:`/pages/user/policyContent?id=${data}`
+					url: `/pages/user/policyContent?id=${data}`
 				})
-				
+
 			}
-			else{
+			else {
 				// uni.showToast({
 				// 	title:'暂无内容',
 				// 	icon:'none'
 				// })
 			}
 		},
-		//推荐任务；
+		//推荐岗位；
 		getRecommendList: function () {
 			recommendMission(this.recommendPage.current, this.recommendPage.size, '').then(res => {
 				if (this.recommendPage.current === 1) {
 					this.recommendList = [];
 				}
+
 				this.recommendPage.current += 1;
 				this.recommendPage.total = res.data.data.total;
 				if (res.data.data && res.data.data.records.length) {
+					debugger
 					this.recommendList = this.recommendList.concat(res.data.data.records);
 				}
 			})
 		},
-		//最新任务；
+		//推荐任务；
 		getNewList: function () {
 			newMissionAll(this.newPage.current, this.newPage.size, '').then(res => {
 				if (this.newPage.current === 1) {
@@ -346,17 +358,22 @@ export default {
 				}
 				this.newPage.total = res.data.data.total;
 				if (res.data.data && res.data.data.records.length) {
+
 					this.newList = this.newList.concat(res.data.data.records);
-                    this.newPage.current += 1;
+					this.newPage.current += 1;
 				}
 			})
 		},
 		//上拉加载
 		upLoad: function () {
 			if (this.activeTab === 0) {
-				if (this.nearPage.current <= Math.ceil(this.nearPage.total / this.nearPage.size)) {
+				if (this.newPage.current <= Math.ceil(this.newPage.total / this.newPage.size)) {
-					// this.getNearList(this.currentPoint);
+
-                        this.getNewList();
+					if (this.isSearch) {
+						this.getNewListSearch()
+					} else {
+						this.getNewList();
+					}
 				} else {
 					uni.showToast({
 						icon: "none",
@@ -366,8 +383,14 @@ export default {
 				return
 			}
 			if (this.activeTab === 1) {
-				if (this.recommendPage.current <= Math.ceil(this.recommendPage.total / this.recommendPage.size)) {
+				if (this.nearPage.current <= Math.ceil(this.nearPage.total / this.nearPage.size)) {
-					this.getRecommendList();
+
+					if (this.isSearch) {
+						this.getNearListSearch();
+					} else {
+						// this.getRecommendList();
+						this.getNearList();
+					}
 				} else {
 					uni.showToast({
 						icon: "none",
@@ -377,32 +400,47 @@ export default {
 				return
 			}
 			if (this.activeTab === 2) {
-                    this.getPolicy()
+				if (this.policyPage.current <= Math.ceil(this.policyPage.total / this.policyPage.size)) {
+					if (this.isSearch) {
+						this.getPolicySearch()
+					} else {
+						this.getPolicy();
+					}
+				} else {
+					uni.showToast({
+						icon: "none",
+						title: '已经是最后一页',
+					})
+				}
+				return
 			}
 		},
 		//下拉刷新
 		download: function () {
+			this.isSearch = false;
 			if (this.activeTab === 0) {
 				this.nearPage.current = 1;
-                this.newPage.current = 1;
+				this.newPage.current = 1;
 				this.getLocation();
-                this.getNewList();
+				this.getNewList();
 				setTimeout(function () {
 					uni.stopPullDownRefresh();
 				}, 1000);
 				return
 			}
 			if (this.activeTab === 1) {
-				this.recommendPage.current = 1;
+				// this.recommendPage.current = 1;
-				this.getRecommendList();
+				// this.getRecommendList();
+				this.nearPage.current === 1
+				this.getNearList();
 				setTimeout(function () {
 					uni.stopPullDownRefresh();
 				}, 1000);
 				return
 			}
 			if (this.activeTab === 2) {
-                this.policyPage.current = 1;
+				this.policyPage.current = 1;
-                this.getPolicy()
+				this.getPolicy()
 				setTimeout(function () {
 					uni.stopPullDownRefresh();
 				}, 1000);
@@ -430,24 +468,102 @@ export default {
 		closePopUp() {
 			this.showPopUp = false
 		},
-		subMitPopUp({submitData,areaModal,industryModal}) {
+		subMitPopUp({ submitData, areaModal, industryModal }) {
-			console.log(submitData,areaModal,industryModal,"------确定");
+			this.searchData = { submitData, areaModal, industryModal }
+			if (submitData || areaModal || industryModal) {
+				this.isSearch = true;
+			}
+
+			switch (this.activeTab) {
+				case 0:
+					this.newPage.current = 1;
+					this.getNewListSearch()
+					break;
+				case 1:
+					this.nearPage.current = 1
+					this.getNearListSearch()
+					break;
+				case 2:
+					this.policyPage.current = 1
+					this.getPolicySearch()
+					break;
+
+				default:
+					break;
+			}
 			this.showPopUp = false
-		}
+		},
+
+
+		//个体户招工搜索；
+		getPolicySearch: function () {
+			const { submitData, areaModal, industryModal } = this.searchData;
+
+			nearMissionSearch(this.policyPage.current, this.policyPage.size, submitData["学历"],
+				submitData["工资"], industryModal?.industry, areaModal?.address1[0], areaModal?.address1[1]
+			).then(res => {
+				// 
+				if (this.policyPage.current === 1) {
+					this.policyContentList = [];
+				}
+				this.policyPage.current += 1;
+				this.policyPage.total = res.data.data.total;
+				// 
+				if (res.data.data && res.data.data.records.length) {
+					this.policyContentList = this.policyContentList.concat(res.data.data.records);
+				}
+
+			})
+		},
+		//推荐岗位搜索；
+		getNearListSearch: function () {
+			const { submitData, areaModal, industryModal } = this.searchData;
+			newMissionAllSearch(this.nearPage.current, this.nearPage.size, submitData["学历"],
+				submitData["工资"], industryModal?.industry, areaModal?.address1[0], areaModal?.address1[1]
+			).then(res => {
+				if (this.nearPage.current === 1) {
+					this.companyList = [];
+				}
+				this.nearPage.current += 1;
+				this.nearPage.total = res.data.data.total;
+				if (res.data.data && res.data.data.records.length) {
+					this.companyList = this.companyList.concat(res.data.data.records);
+				}
+			})
+		},
+		//推荐任务搜索；
+		getNewListSearch: function () {
+			const { submitData, areaModal, industryModal } = this.searchData;
+			recommendMissionSearch(this.newPage.current, this.newPage.size, submitData["学历"],
+				submitData["工资"], industryModal?.industry, areaModal?.address1[0], areaModal?.address1[1]
+			).then(res => {
+				if (this.newPage.current === 1) {
+					this.newList = [];
+				}
+
+				this.newPage.total = res.data.data.total;
+				if (res.data.data && res.data.data.records.length) {
+					this.newList = this.newList.concat(res.data.data.records);
+					this.newPage.current += 1;
+				}
+			})
+		},
 	}
 }
 </script>
 
 <style scoped>
-.navPosition{
+.navPosition {
-    padding: 0 24rpx 20rpx 30rpx;
+	padding: 0 24rpx 20rpx 30rpx;
-    display: flex;
+	display: flex;
-    align-item: center;
+	align-item: center;
-    font-size: 26rpx;
+	font-size: 26rpx;
-    .positionText{
+
-        margin: 0 10rpx;
+	.positionText {
-    }
+		margin: 0 10rpx;
+	}
 }
+
 .titleSearch {
 	display: flex;
 	width: 80%;
@@ -494,7 +610,7 @@ export default {
 
 .typeButtonLeft {
 	display: flex;
-    
+
 }
 
 .typeButton {
@@ -503,7 +619,7 @@ export default {
 	background: #fff;
 	border-radius: 50px;
 	margin-right: 10rpx;
-    white-space: nowrap;
+	white-space: nowrap;
 }
 
 .activeButton {

vue.config.js

@@ -1,26 +1,24 @@
 module.exports = {
-    devServer: {
+  devServer: {
-        port: 1887,
+    port: 1887,
-        proxy: {
+    proxy: {
-            '/api': {
+      "/api": {
-                // target: 'http://192.168.3.108:8000', // 本地服务接口地址
+        // target: 'http://192.168.1.106:8000',
-                // target: 'http://192.168.3.112:8000', // 本地服务接口地址
+        // target: 'http://192.168.1.109:8000',
-                // target: 'http://10.165.0.173:8000', // 本地服务接口地址
+        target: "http://10.165.0.173:80",
-                target: 'http://192.168.1.106:8000', // 本地服务接口地址
+        ws: true,
-                // target: 'http://192.168.3.120:8000', // 本地服务接口地址
+        // pathRewrite: {
-                ws: true,
+        //   "^/api": "/",
-                pathRewrite: {
+        // },
-                    '^/api': '/'
+      },
-                }
+      "/qq/map": {
-            },
+        //本地服务接口地址
-			'/qq/map': {
+        target: "https://apis.map.qq.com",
-			    //本地服务接口地址
+        ws: true,
-			    target: 'https://apis.map.qq.com',
+        pathRewrite: {
-			    ws: true,
+          "^/qq/map": "/",
-			    pathRewrite: {
+        },
-			        '^/qq/map': '/'
+      },
-			    }
+    },
-			}
+  },
-        }
-    }
 };