查询调整，bug处理

apis/pagejs/main.js

@@ -38,3 +38,11 @@ export function bannerList(data) {
 		url: url
 	})
 }
+
+export function findRecruitSearch(data) {
+ 	return requestWhite({
+ 		method: 'post',
+ 		data: data,
+ 		url: '/mobile/recruit/findRecruitSearch'
+ 	})
+}

apis/pagejs/packages.js

@@ -218,6 +218,16 @@ export function createAuthentication(data) {
 	})
 }
 
+
+ 
+ export function updateIntention(data) {
+  	return request({
+  		method: 'post',
+  		data: data,
+  		url: '/mobile/user/updateIntention'
+  	})
+ }
+ 
 export function updateRecruitOnline(data) {
  	return request({
  		method: 'post',

apis/pagejs/tab.js

@@ -33,6 +33,7 @@ export function createUser(data) {
   	})
  }
  
+
  
  export function updateIntention(data) {
   	return request({

config/.env.dev.js

@@ -9,7 +9,7 @@ const UNI_APP = {
 
 	openId:"o_5WO4hc7MyyVNjSDePRIft6AokI",//个人企业都注册
 	//openId:"o_5WO4qUozermjNRBqypzMZg56Qw",// 杨所199
-	openId:"o_5WO4tDGT3bJ-9Bpdizcdbs-HbI", //152
+	//openId:"o_5WO4tDGT3bJ-9Bpdizcdbs-HbI", //152
 	//openId:"006",// 个人  注册 ，企业未
 	//openId:"323",// 个人  未注册 ，企业 注册
 	 

pages/main/index/index.vue

@@ -302,10 +302,11 @@
 					title: "加载中",
 					mask: true,
 				})
-				API.findRecruitHomePage({
+				API.findRecruitSearch({
 					pageIndex:1,
 					pageSize:5,
-					type:this.tabList[this.current].value,
+					status:0,
+					statusType:this.tabList[this.current].value,
 				}).then((res) => {
 					uni.hideLoading();
 					this.tabList[this.current].list=res.data.data

pages/packages/as-components/jk-popup.vue

@@ -15,7 +15,7 @@
 					</view>
 						<!-- 选项 -->
 						
-						<scroll-view  class="scrollview" scroll-y="true" style="height: 520rpx;">
+						<scroll-view  class="scrollview" scroll-y="true" style="height: 420rpx;">
 						
 							<view class="options">
 								
@@ -45,7 +45,7 @@
 					</view>
 				</view>
 				<!-- 薪资待遇 -->
-				<view class="salary-package" v-show="methodChecked!=-1">
+				<view class="salary-package" v-show="methodChecked!=-1&&ptype=='per'">
 					<view class="title">
 						薪资待遇
 					</view>
@@ -74,8 +74,12 @@
  	export default {
 		name:"tabbarJob",
 		props:{
-			current: 0,
-			elderStatus: false
+			
+			ptype: {
+			    value: String,
+			    default: 'per'
+			},
+			
 		},
 		data() {
 			return {
@@ -239,7 +243,8 @@
 			},
 			queryBtn(){
 				var queryForm={}
-				if(this.saralyChecked!=-1){
+				debugger
+				if(this.saralyChecked!=-1&&this.ptype=='per'){
 					queryForm.salaryStart=this.salaryList[this.saralyChecked].min
 					if(queryForm.salaryStart==undefined){
 						queryForm.salaryStart=''

pages/packages/jobInformation/jobDetails.vue

@@ -4,7 +4,7 @@
 			:background="{backgroundColor: '#2795FD',}" :back-text-style="{color: '#ffffff'}"></u-navbar>
 		<view class="content">
 			<view class="title">
-				<span class="titleSpan"  v-if="!this.info.isOnline">
+				<span class="titleSpan"  v-if="!info.isOnline">
 					已下架
 				</span>
 				{{info.positionName}}
@@ -173,6 +173,7 @@
 				readId:"",
 				enterpriseInfo:{},
 				info: {
+					"isOnline":true,
 					"id": "",
 					"enterpriseId": "",
 					"positionName": "",
@@ -331,6 +332,30 @@
 					return
 				}
 				
+				if(user.intention=="2"){
+					var _this= this
+					uni.showModal({
+						title: '提示',
+						content: '您当前求职意向为[已入职],是否帮您修改为[未入职]，并为您报名此岗位？',
+						confirmText: "报名",
+						showCancel: true,
+						success: function(res) {
+							if (res.confirm) {
+								
+								_this.updateintentionBtn()
+							} else if (res.cancel) {
+								//.log('用户点击取消');
+							}
+						}
+					});
+					return
+				}
+				
+				
+				
+				this.joinRecruitApi()
+			},
+			joinRecruitApi(){
 				uni.showLoading({
 					title: "加载中",
 					mask: true,
@@ -346,7 +371,7 @@
 						showCancel: false,
 						success: function(res) {
 							if (res.confirm) {
-
+				
 								//uni.navigateBack()
 							} else if (res.cancel) {
 								//.log('用户点击取消');
@@ -354,7 +379,7 @@
 						}
 					});
 					uni.hideLoading();
-
+				
 				}).catch(error => {
 					uni.showToast({icon: 'none',
 						title: error,
@@ -362,6 +387,25 @@
 					})
 				})
 			},
+			updateintentionBtn(){
+				 
+				var intention=1
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API.updateIntention({
+					intention: intention
+				}).then((res) => {
+					uni.hideLoading();
+					
+					this.joinRecruitApi();
+					
+				}).catch(error => {
+					this.showPhone = false;
+					uni.hideLoading();
+				})
+			},
 			getInfo() {
 				uni.showLoading({
 					title: "加载中",

pages/packages/mine/employmentService/laborManagement/postMessage.vue

@@ -18,6 +18,19 @@
 					
 				</view>
 			</view>
+			<!--结算形式 -->
+			<view class="item">
+				<view class="title">
+					<text>*</text>结算形式
+				</view>
+				<view class="input">
+					
+					<u-input type="select"  v-model="settlementMethod"
+					 @click="showselect(1)" placeholder="请选择结算形式"></u-input>
+					
+				</view>
+				
+			</view>
 			<!-- *薪资待遇 -->
 			<view class="item">
 				<view class="title">
@@ -36,19 +49,7 @@
 				</view> -->
 
 			</view>
-			<!--结算形式 -->
-			<view class="item">
-				<view class="title">
-					<text>*</text>结算形式
-				</view>
-				<view class="input">
-					
-					<u-input type="select"  v-model="settlementMethod"
-					 @click="showselect(1)" placeholder="请选择结算形式"></u-input>
-					
-				</view>
-				
-			</view>
+			
 			<!-- 行业 -->
 			<view class="item">
 				<view class="title">
@@ -57,7 +58,7 @@
 				<view class="input">
 					
 					<u-input type="select"  v-model="industry"
-					 @click="showselect(2)" placeholder="请选择行业"></u-input>
+					 @click="popupShow=true" readonly  placeholder="请选择行业"></u-input>
 					
 				</view>
 				
@@ -152,7 +153,76 @@
 				
 		<button class="issue"   @click="submit()"
 		
-		type="default">发布</button>
+		type="default">提交审核</button>
+		
+		
+		<!-- 筛选框 -->
+		<u-popup v-model="popupShow"  @open="popupShowOpen" mode="bottom" border-radius="20" :closeable="true">
+			<view class="popup-content">
+				<view class="headline">
+					筛选
+				</view>
+		
+				<!-- 行业 -->
+				<view class="industry">
+					<view class="title">
+						<u-search v-model="querypop"></u-search>
+						<view>意向行业 <span style="color: #4696f6;">{{isChecked!=-1?'已选中:'+industryList[isChecked].name:''}}</span> (向下拉可滑动)</view>
+						
+					</view>
+						<!-- 选项 -->
+						
+						<scroll-view  class="scrollview" scroll-y="true" style="height: 620rpx;">
+						
+							<view class="options">
+								
+									<view 
+									:class="{item,checked:isChecked==index}" v-for="(item,index) in industryList"
+									  v-show="item.name.indexOf(querypop)!=-1"
+									 :key="index"
+										@click="changeChecked(index)">
+										<!-- 快递跑腿/配送/分拣 -->{{item.name}}
+									</view>
+								
+							</view>
+						</scroll-view>
+					
+				</view>
+				<!-- 结算方式 -->
+				<view class="clearing-form" v-if="false">
+					<view class="title">
+						结算方式
+					</view>
+					<!-- 选项 -->
+					<view class="options">
+						<view :class="{item,checked:wayChecked==index}" v-for="(item,index) in wayList" :key="index"
+							@click="changeWayChecked(index)">
+							{{item.name}}
+						</view>
+					</view>
+				</view>
+				<!-- 薪资形式 -->
+				<view class="salary-form" v-if="false">
+					<view class="title">
+						薪资形式
+					</view>
+					<!-- 选项 -->
+					<view class="options ">
+						<view :class="{item,checked:saralyChecked==index}" v-for="(item,index) in salaryList"
+							:key="index" @click="changeSaralyChecked(index)">
+							{{item.name}}
+						</view>
+					</view>
+				</view>
+		
+		
+		
+				<view class="button">
+					<button class="reset" @click="reset()">重置</button>
+					<button class="confirm" @click="queryBtn()" >确认</button>
+				</view>
+			</view>
+		</u-popup>
 	</view>
 </template>
 
@@ -162,6 +232,12 @@
 	export default {
 		data() {
 			return {
+				querypop:"",
+				popupShow: false,
+				isChecked: -1,
+				industryList: [
+				],
+				
 				selectIndex:0,
 				show: false,
 				list: [],
@@ -203,6 +279,43 @@
 			//this.tel=this.userInfo.phone
 		},
 		methods: {
+			reset() {
+				this.isChecked = -1;
+			
+				
+			},
+			queryBtn(){
+				this.formData.industry=this.industryList[this.isChecked].value
+				this.industry=this.industryList[this.isChecked].name
+				this.popupShow=false;
+			},
+			changeChecked(index) {
+				this.isChecked = index;
+			},
+			popupShowOpen(){
+				if(this.industryList.length==0){
+					uni.showLoading({
+						title: "加载中",
+						mask: true,
+					})
+					API_weixin.findListByCatalogName({
+						name:'意向行业',
+						
+					}).then((res) => {
+						uni.hideLoading();
+						
+						this.industryList=res.data.dictionaryList
+						
+					}).catch(error => {
+					
+						uni.showToast({icon: 'none',
+							title: error
+						})
+						//this.getPhone()
+						
+					})
+				}
+			},
 			getInfo(){
 				uni.showLoading({
 					title: "加载中",
@@ -344,7 +457,7 @@
 					
 					uni.showModal({
 						title: '提示',
-						content: '发布成功，等待审核！',
+						content: '提交成功，等待审核！',
 						showCancel:false,
 						success: function (res) {
 							if (res.confirm) {
@@ -474,4 +587,92 @@
 		bottom: 20rpx;
 		z-index: 999;
 	}
+	// 筛选框
+	.popup-content {
+		padding: 32rpx;
+	
+		.headline {
+			color: #101010;
+			font-size: 40rpx;
+			text-align: center;
+		}
+	
+		//行业
+		.industry,
+		.clearing-form,
+		.salary-form {
+			margin-top: 16rpx;
+		
+			.title {
+				font-size: 32rpx;
+				color: #111111;
+			}
+	
+			// 选项
+			.options {
+				display: flex;
+				justify-content: space-between;
+				flex-wrap: wrap;
+				margin-top: 24rpx;
+	
+				.item {
+					height: 56rpx;
+					line-height: 56rpx;
+					min-width: 210rpx;
+					text-align: center;
+					margin-bottom: 16rpx;
+					margin-right: 16rpx;
+					color: #999999;
+					background-color: #F3F3F4;
+					border-radius: 4px;
+				}
+	
+				.checked {
+					background-color: #2795FD;
+					color: #fff;
+				}
+			}
+		}
+	
+		.button {
+			display: flex;
+	
+			margin-top: 8rpx;
+			.reset:after{
+					border:0
+			}
+			.reset {
+				color: #999999;
+				background-color: #F3F3F4;
+				width: 200rpx;
+				height: 72rpx;
+				line-height: 72rpx;
+				border-radius: 8px;
+				
+			}
+	
+			.confirm {
+				width: 440rpx;
+				background-color: #2795FD;
+				color: #fff;
+				height: 72rpx;
+				line-height: 72rpx;
+				border-radius: 8px;
+			}
+		}
+	}
+	
+	.salary-form,
+	.clearing-form {
+		.options {
+			justify-content: start !important;
+		}
+	
+		.item {
+			margin-right: 24rpx;
+		}
+	}
+	.scrollview{
+		border: 1px #101010 dashed;
+	}
 </style>

pages/packages/mine/otherServices/authentication.vue

@@ -473,7 +473,7 @@
 				.title {
 					color: rgba(51, 51, 51, 1);
 					font-size: 32rpx;
-					width: 190rpx;
+					width: 180rpx;
 				}
 
 				.value {
@@ -610,7 +610,7 @@
 				.title {
 					color: rgba(119, 119, 119, 1);
 					font-size: 16px;
-					width: 180rpx;
+					width: 190rpx;
 				}
 
 				.value {

pages/packages/search/search.vue

@@ -161,7 +161,7 @@
 					border-color="#CFD2D5">已经到底了</u-divider>
 		</view>
 		
-		<jkpop ref="pop"  @reset="reset" @queryBtn="queryBtn" ></jkpop>
+		<jkpop ref="pop" :ptype="searchQuery.selectIndex==0?'per':'job'"  @reset="reset" @queryBtn="queryBtn" ></jkpop>
 		
 		
 		
@@ -295,7 +295,10 @@
 			}
 		},
 		methods: {
-			
+			selectItem(e){
+				
+				//this.searchQuery.selectIndex = e
+			},
 			
 			ckInfo(id) {
 				var url = "/pages/news/articleDetails?id=" + id;
@@ -387,13 +390,24 @@
 				
 				var list = this.tabList[this.current].list
 				var obj = this.tabList[this.current]
+				var queryForm={
+					...this.queryForm
+				}
+				
+				
 				var listForm = {
 					...obj,
-					...this.queryForm
+					...queryForm
 					
 				}
+				
 				listForm.status= this.selectList[this.searchQuery.selectIndex].id,
 				listForm.content= this.searchQuery.keyword
+				
+				if(listForm.status==0){
+					 listForm.salaryStart=""
+					listForm.salaryEnd=""
+				}
 				delete listForm.list
 				
 				API.findRecruitSearch(listForm).then((res) => {

pages/tab/as-components/jk-popup.vue

@@ -15,7 +15,7 @@
 					</view>
 						<!-- 选项 -->
 						
-						<scroll-view  class="scrollview" scroll-y="true" style="height: 520rpx;">
+						<scroll-view  class="scrollview" scroll-y="true" style="height: 420rpx;">
 						
 							<view class="options">
 								
@@ -45,7 +45,7 @@
 					</view>
 				</view>
 				<!-- 薪资待遇 -->
-				<view class="salary-package" v-show="methodChecked!=-1">
+				<view class="salary-package" v-show="methodChecked!=-1&&ptype=='per'">
 					<view class="title">
 						薪资待遇
 					</view>
@@ -74,8 +74,12 @@
  	export default {
 		name:"tabbarJob",
 		props:{
-			current: 0,
-			elderStatus: false
+			
+			ptype: {
+			    value: String,
+			    default: 'per'
+			},
+			
 		},
 		data() {
 			return {
@@ -239,7 +243,7 @@
 			},
 			queryBtn(){
 				var queryForm={}
-				if(this.saralyChecked!=-1){
+				if(this.saralyChecked!=-1&&this.ptype=='per'){
 					queryForm.salaryStart=this.salaryList[this.saralyChecked].min
 					if(queryForm.salaryStart==undefined){
 						queryForm.salaryStart=''

pages/tab/jobInformation/jobInformation.vue

@@ -80,7 +80,7 @@
 		</view>
 
 		<tabbar :current="1"></tabbar>
-		<jkpop ref="pop"  @reset="reset" @queryBtn="queryBtn" ></jkpop>
+		<jkpop ref="pop"  ptype="job"  @reset="reset" @queryBtn="queryBtn" ></jkpop>
 		
 	</view>
 </template>