1.岗位上上架， 下架， 下架后， 零工 查看岗位时候 - 岗位标记已下线

2. 人员求职意向 ，  求职， 入职  ，  入职后，  雇主查看零工， 标记已入职
3.企业地址， 企业联系人

apis/pagejs/packages.js

@@ -216,4 +216,12 @@ export function createAuthentication(data) {
 		data: data,
 		url: url
 	})
-}
+}
+
+export function updateRecruitOnline(data) {
+ 	return request({
+ 		method: 'post',
+ 		data: data,
+ 		url: '/mobile/recruit/updateRecruitOnline'
+ 	})
+}

apis/pagejs/tab.js

@@ -31,4 +31,13 @@ export function createUser(data) {
   		data: data,
   		url: '/mobile/recruit/myReceivedRegistrationNotReadNum'
   	})
+ }
+ 
+ 
+ export function updateIntention(data) {
+  	return request({
+  		method: 'post',
+  		data: data,
+  		url: '/mobile/user/updateIntention'
+  	})
  }

components/Tabbar.vue

@@ -37,7 +37,7 @@
 						
 					},
 					{
-						"text":"找雇主",
+						"text":"雇主",
 						"pagePath":"/pages/tab/jobInformation/jobInformation",
 						"iconPath":img3,
 						"selectedIconPath": img4
@@ -51,7 +51,7 @@
 						
 					},
 					{
-						"text":"找零工",
+						"text":"零工",
 						"pagePath":"/pages/tab/choreInformation/choreInformation",
 						"iconPath":img7,
 						"selectedIconPath": img8

config/.env.dev.js

@@ -5,11 +5,11 @@ const UNI_APP = {
 	//IMG_URL:"http://www.jsrailway.com.cn/",
 	PREFIX : "jp-zeroWorkerStation",
 	NODE_ENV :"dev",
-	SIMPLE_RUN:false,// 无视权限控制跳转页面   ， 用于样式人员快速访问各种功能 ，快速测试等
+	SIMPLE_RUN:true,// 无视权限控制跳转页面   ， 用于样式人员快速访问各种功能 ，快速测试等
 
-	//openId:"o_5WO4hc7MyyVNjSDePRIft6AokI",//个人企业都注册
-	
-	openId:"o_5WO4qUozermjNRBqypzMZg56Qw",// 杨所
+	openId:"o_5WO4hc7MyyVNjSDePRIft6AokI",//个人企业都注册
+	//openId:"o_5WO4qUozermjNRBqypzMZg56Qw",// 杨所199
+	openId:"o_5WO4tDGT3bJ-9Bpdizcdbs-HbI", //152
 	//openId:"006",// 个人  注册 ，企业未
 	//openId:"323",// 个人  未注册 ，企业 注册
 	 

pages/main/index/index.vue

@@ -163,7 +163,6 @@
 
 	export default {
 		components: {
-
 			tabbar
 		},
 		onShareTimeline(){
@@ -223,10 +222,12 @@
 				
 			}
 		},
-		
+		onShow(){
+			this.findRecruitHomePage();
+		},
 		onLoad(op) {
 			
-			this.findRecruitHomePage();
+			
 			this.getBannerList()
 			this.findByOpenId(op);
 		},

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

@@ -0,0 +1,364 @@
+<template >
+	<view>
+		<!-- 筛选框 -->
+		<u-popup v-model="popupShow" @close="close"   @open="popupShowOpen" mode="bottom" border-radius="20" :closeable="true">
+			<view class="popup-content">
+				<view class="headline">
+					筛选
+				</view>
+				<!-- 行业 -->
+				<view class="industry">
+					<view class="title">
+						<view>意向行业 <span style="color: #4696f6;">{{industryChecked!=-1?'已选中:'+industryList[industryChecked].name:''}}</span> (向下拉可滑动)</view>
+						
+						<u-search v-model="querypop"></u-search>
+					</view>
+						<!-- 选项 -->
+						
+						<scroll-view  class="scrollview" scroll-y="true" style="height: 520rpx;">
+						
+							<view class="options">
+								
+									<view 
+									:class="{item,checked:industryChecked==index}" v-for="(item,index) in industryList"
+									  v-show="item.name.indexOf(querypop)!=-1"
+									 :key="index"
+										@click="industryChecked=index">
+										<!-- 快递跑腿/配送/分拣 -->{{item.name}}
+									</view>
+								
+							</view>
+						</scroll-view>
+					
+				</view>
+				<!-- 工作经验 -->
+				<view class="work-experience">
+					<view class="title">
+						结算方式
+					</view>
+					<!-- 选项 -->
+					<view class="options">
+						<view :class="{item,checked:methodChecked==index}" v-for="(item,index) in methodList" :key="index"
+							@click="methodChecked=index">
+							{{item.name}}
+						</view>
+					</view>
+				</view>
+				<!-- 薪资待遇 -->
+				<view class="salary-package" v-show="methodChecked!=-1">
+					<view class="title">
+						薪资待遇
+					</view>
+					<!-- 选项 -->
+					<view class="options">
+						<view :class="{item,checked:saralyChecked==index}" v-for="(item,index) in salaryList"
+							:key="index" @click="saralyChecked=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>
+
+<script>
+	import * as API_weixin from '@/apis/weixin.js'
+	
+ 	export default {
+		name:"tabbarJob",
+		props:{
+			current: 0,
+			elderStatus: false
+		},
+		data() {
+			return {
+				popupShow: false,
+				querypop:"",
+				methodChecked: -1,
+				industryChecked: -1,
+				saralyChecked:-1,
+				salaryStart:'',
+				salaryEnd:'',
+				
+				methodList:[
+					{
+						name: '日结',
+						value:"1"
+					}, {
+						name: '周结',
+						value:"2"
+					
+					}, {
+						name: '月结',
+						value:"3"
+					}
+				],//结算方式
+				industryList:[],// 
+				//salaryList: [],
+				salaryList3: [{
+						name: '1000元/月以下',
+						max:1000
+					},
+					 {
+						name: '1000-1500元/月',
+						min:1000,
+						max:1500
+					}, {
+						name: '1500-3000元/月',
+						
+						min:1500,
+						max:3000
+					}, {
+						name: '3000-5000元/月',
+						min:3000,
+						max:5000
+					}, 
+					{
+						name: '5000元/月以上',
+						min:5000,
+					}
+				],
+				salaryList2: [{
+						name: '500元/周以下',
+						max:500
+					},
+					 {
+						name: '500-800元/周',
+						min:500,
+						max:800
+					}, {
+						name: '800-1200元/周',
+						
+						min:800,
+						max:1200
+					}, {
+						name: '1200-2000元/周',
+						min:1200,
+						max:2000
+					}, 
+					{
+						name: '2000元/周以上',
+						min:2000,
+					
+					}
+				],
+				salaryList1: [{
+						name: '100元/天以下',
+						max:100
+					},
+					 {
+						name: '100-200元/天',
+						min:100,
+						max:200
+					}, {
+						name: '200-300元/天',
+						
+						min:200,
+						max:300
+					}, {
+						name: '300-500元/天',
+						min:300,
+						max:500
+					}, 
+					{
+						name: '500元/天以上',
+						min:500,
+						
+					
+					}
+				],
+				
+			};
+			
+		},
+		computed:{
+			salaryList(){
+				if(this.methodChecked!=-1){
+					if(this.methodChecked==0){
+						return this.salaryList1
+					}
+					if(this.methodChecked==1){
+						return this.salaryList2
+					}
+					if(this.methodChecked==2){
+						return this.salaryList3
+					}
+				}
+				return []
+			}
+		},
+		methods:{
+			show(){
+				this.popupShow=true;
+			},
+			hide(){
+				this.popupShow=false;
+			},
+			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()
+						
+					})
+				}
+				 
+			},
+			close(){},
+			reset() {
+			
+				this.querypop=""
+				this.methodChecked= -1
+				this.industryChecked= -1
+				this.saralyChecked=-1
+				this.salaryStart=''
+				this.salaryEnd=''
+				this.$emit("reset",{})
+			},
+			queryBtn(){
+				var queryForm={}
+				if(this.saralyChecked!=-1){
+					queryForm.salaryStart=this.salaryList[this.saralyChecked].min
+					if(queryForm.salaryStart==undefined){
+						queryForm.salaryStart=''
+					}
+					queryForm.salaryEnd=this.salaryList[this.saralyChecked].max
+					if(queryForm.salaryEnd==undefined){
+											queryForm.salaryEnd=''
+					}
+					
+				} 
+				if(this.methodChecked!=-1){
+					queryForm.settlementMethod=this.methodList[this.methodChecked].value
+				} 
+				if(this.industryChecked!=-1){
+					queryForm.industry=this.industryList[this.industryChecked].value
+				} 
+				
+				this.$emit("queryBtn",queryForm)
+			},
+			
+		},
+		mounted(){
+			
+		},destroyed(){
+			
+		}
+		
+		
+	}
+</script>
+
+<style lang="scss" scoped>
+	 // 筛选框
+	 .popup-content {
+	 	padding: 32rpx;
+	 
+	 	.headline {
+	 		color: #101010;
+	 		font-size: 40rpx;
+	 		text-align: center;
+	 	}
+	 
+	 	// 薪资待遇
+		.industry,
+	 	.salary-package,
+	 	.work-experience {
+	 		margin-top: 16rpx;
+	 
+	 		.title {
+	 			font-size: 32rpx;
+	 			color: #111111;
+	 		}
+	 
+	 		// 选项
+	 		.options {
+	 			display: flex;
+	 			flex-wrap: wrap;
+	 			justify-content: flex-start;
+	 			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;
+	 		}
+	 	}
+	 }
+	 .industry,
+	 .salary-form,
+	 .clearing-form {
+	 	.options {
+	 		justify-content: start !important;
+	 	}
+	 
+	 	.item {
+	 		margin-right: 24rpx;
+	 	}
+	 }
+	 .scrollview{
+	 	border: 1px #101010 dashed;
+		margin-bottom: 40rpx;
+	 }
+	 
+</style>

pages/packages/choreInformation/jobSearchDetails.vue

@@ -74,6 +74,10 @@
 						</view>
 						<!-- 标签 -->
 						<view class="tags">
+							<view class="tag-item" style="background-color: red;color:#fff" v-if="personInfo.intention==2" >
+								已入职
+							</view>
+							
 							<view class="tag-item">
 								{{personInfo.gender==1?'男':'女'}}
 							</view>
@@ -90,7 +94,7 @@
 							
 							<span class="tel" v-if="ck()">
 							
-								{{info.address}}
+								{{info.address?info.address:''}}
 							</span>
 							<span class="tel" style="font-size: 24rpx;" v-else >
 							
@@ -321,6 +325,7 @@
 					API.myEmployment({
 						pageIndex: 1,
 						pageSize: 200,
+						isOnline:1,
 						status: 1
 					}).then((res) => {
 						uni.hideLoading();

pages/packages/jobInformation/jobDetails.vue

@@ -4,6 +4,9 @@
 			: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>
 				{{info.positionName}}
 			</view>
 			<view class="saraly">
@@ -214,7 +217,7 @@
 		computed: {
 			showTitle() {
 				if (this.info.id) {
-					return this.info.positionName + '-' + this.info.salary + this.getUnit(this.info)
+					return (this.info.isOnline?'':'已下架-')+this.info.positionName + '-' + this.info.salary + this.getUnit(this.info)
 				}
 				return ''
 			}
@@ -405,8 +408,16 @@
 
 		.title {
 			color: rgba(16, 16, 16, 1);
-			font-size: 48rpx;
+			font-size: 52rpx;
 			font-family: 'PingFangSC-medium';
+			.titleSpan{
+				padding:0 12rpx;
+				font-size: 42rpx;
+				text-align: center;
+				border-radius: 4px;
+				color: rgba(255, 255, 255, 1);
+				background-color: rgba(178, 184, 190, 1);
+			}
 		}
 
 		.saraly {

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

@@ -11,6 +11,8 @@
 			<view class="card">
 				<view class="positon-salary">
 					<view class="positon">
+						<span class="positonSpan positonSpan1" v-if="item.isOnline">上架中</span> 
+						<span class="positonSpan positonSpan2" v-else>已下架</span>
 						{{item.positionName}}
 					</view>
 					<view class="salary">
@@ -27,15 +29,22 @@
 				</view>
 				<u-line color="#E6E6E6"></u-line>
 				<view class="buttons">
-					<view class="btn refresh" v-show="item.status=='1'" @click="refreshBtn(item)">
+					<span class="btn option1" v-show="item.status=='1'&&item.isOnline" @click="optionBtn(item,0)">
+						下架
+					</span>
+					 <span class="btn option2" v-show="item.status=='1'&&!item.isOnline" @click="optionBtn(item,1)">
+						上架
+					</span>
+					
+					<span class="btn refresh" v-show="item.status=='1'" @click="refreshBtn(item)">
 						刷新
-					</view>
-					<view class="btn amend"  @click="amendBtn(item)">
+					</span>
+					<span class="btn amend"  @click="amendBtn(item)">
 						修改
-					</view>
-					<view class="btn delete"  @click="deleteBtn(item)">
+					</span>
+					<span class="btn delete"  @click="deleteBtn(item)">
 						删除
-					</view>
+					</span>
 				</view>
 			</view>
 		</view>
@@ -187,6 +196,46 @@
 				})
 				
 			},
+			optionBtn(item,op){
+				if(op==0){
+					var _this=this;
+					uni.showModal({
+						title: '提示',
+						content:"确认是否下架岗位",
+						//content: '这是一个模态弹窗',
+						success: function(res) {
+							if (res.confirm) {
+								_this.optionBtnMethod(item,op)
+							} else if (res.cancel) {
+								//.log('用户点击取消');
+							}
+						}
+					});
+				}else{
+					this.optionBtnMethod(item,op)
+				}
+				
+			},
+			optionBtnMethod(item,op){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API.updateRecruitOnline({
+					id:item.id,
+					isOnline:op
+				}).then((res) => {
+					item.isOnline=op
+					uni.hideLoading()
+				}).catch(error => {
+					uni.showToast({icon: 'none',
+							title: error,
+							icon: "none"
+					})
+				})
+				
+			},
+			
 			deleteBtn(item){
 				var _this=this;
 				uni.showModal({
@@ -246,6 +295,20 @@
 				font-size: 36rpx;
 
 				font-family: 'PingFangSC-medium';
+				.positonSpan{
+					padding:0 6rpx;
+					font-size: 24rpx;
+					text-align: center;
+					border-radius: 4px;
+					color: rgba(255, 255, 255, 1);
+
+				}
+				.positonSpan1{
+					background-color: rgba(34, 149, 255, 1);
+				}
+				.positonSpan2{
+					background-color: rgba(178, 184, 190, 1);
+				}
 			}
 
 			.salary {
@@ -275,10 +338,10 @@
 
 		// 按钮
 		.buttons {
-			display: flex;
-			justify-content: flex-end;
+			//display: flex;
+			//justify-content: flex-end;
 			margin-top: 24rpx;
-
+			height: 56rpx;
 			.btn {
 				width: 120rpx;
 				height: 56rpx;
@@ -290,8 +353,18 @@
 				font-family: Microsoft Yahei;
 				border: 1px solid rgba(207, 210, 213, 1);
 				margin-left: 24rpx;
+				 float: right;
+			}
+			.option1{
+				margin-left: 0px;
+				float: left;
+				color:#EE3138 
+			}
+			.option2{
+				margin-left: 0px;
+				float: left;
+				color:#2295FF
 			}
-
 			.delete {
 				color: rgba(238, 49, 56, 1);
 			}

pages/packages/mine/employmentService/receiveRegistration.vue

@@ -19,7 +19,7 @@
 				<view class="photo">
 					<u-avatar :src="item.jobInformationInfo.photo"></u-avatar>
 					<span>{{item.workPersonInfo?item.workPersonInfo.realName:''}}</span>
-				
+					
 				</view>
 				<!-- 信息 -->
 				<view class="infos">
@@ -43,7 +43,9 @@
 					</view>
 					<view class="tags-date">
 						<view class="tags">
-							
+							<view class="item" style="background-color: red;color:#fff" v-if="item.workPersonInfo&&item.workPersonInfo.intention==2" >
+								已入职
+							</view>
 							<view class="item" v-if="item.workPersonInfo">
 								{{item.workPersonInfo.gender==1?'男':'女'}}
 							</view>
@@ -309,7 +311,7 @@
 	.tag {
 	
 		 top: -260rpx;
-		left: -400rpx;
+		left: -350rpx;
 		position: relative;
 		border-radius: 4px 4px 4px 0px;
 		color: #fff;

pages/packages/mine/myJobInformation/myJobInformation.vue

@@ -147,7 +147,7 @@
 				<text>*</text>个人简介
 			</view>
 			<textarea class="textarea"  v-model="formData.serviceDesc"
-			 placeholder="请填写您的个人简历，如工作年限\工作经历\擅长技能等，有助于您更快、更准确的找到工作。"></textarea>
+			 placeholder="请填写您的个人简历，如工作年限/工作经历/擅长技能等，有助于您更快、更准确的找到工作。"></textarea>
 		</view>
 
 		<button class="save"  @click="submit"
@@ -173,7 +173,7 @@
 					</view>
 						<!-- 选项 -->
 						
-						<scroll-view  class="scrollview" scroll-y="true" style="height: 420rpx;">
+						<scroll-view  class="scrollview" scroll-y="true" style="height: 620rpx;">
 						
 							<view class="options">
 								
@@ -323,7 +323,8 @@
 						"workExperience","education",]
 						for(var i in  name){
 							//.log(name[i]+'N')
-							this[name[i]]=this.formData[(name[i]+'N')]
+							var test=this.formData[(name[i]+'N')]
+							this[name[i]]=test?test:''
 						}
 						this.src= this.formData.photo
 					}

pages/packages/mine/myJobInformation/myRegistration.vue

@@ -13,7 +13,8 @@
 
 				<view class="positon-salary">
 
-					<view class="positon">
+					<view class="positon">
+						<span class="positonSpan positonSpan2" v-if="!item.recruitInformationInfo.isOnline">已下架</span>
 						{{item.recruitInformationInfo.positionName}}
 					</view>
 					<view class="salary">
@@ -23,6 +24,9 @@
 				<view class="tags-date">
 					<view class="company">
 						{{item.recruitInformationInfo.enterpriseName}}
+					</view>
+					<view class="date">
+						{{current==0?'报名时间':'邀请时间'}}：{{item.createTime.substring(0,10)}}
 					</view>
 					<view class="tags" v-if="current==0&&false">
 						<view class="item">
@@ -32,16 +36,14 @@
 							周结
 						</view>
 					</view>
-					<view class="date">
-						{{current==0?'报名时间':'邀请时间'}}：{{item.createTime.substring(0,10)}}
-					</view>
+					
 				</view>
 				<u-line color="#E6E6E6"></u-line>
 				<view  style="display: flex;
-    justify-content: space-between;" >
+				justify-content: space-between;" >
 					<span class="tag" v-if="current==1&&!item.isRead">未读</span>
 
-
+				
 					<view class="check" @click="ckInfo(item.recruitInformationInfo,item)">
 						查看
 					</view>
@@ -169,8 +171,21 @@
 			.positon {
 				color: rgba(16, 16, 16, 1);
 				font-size: 36rpx;
-
-				font-family: 'PingFangSC-medium';
+				font-family: 'PingFangSC-medium';
+				.positonSpan{
+					padding:0 6rpx;
+					font-size: 24rpx;
+					text-align: center;
+					border-radius: 4px;
+					color: rgba(255, 255, 255, 1);
+				
+				}
+				.positonSpan1{
+					background-color: rgba(34, 149, 255, 1);
+				}
+				.positonSpan2{
+					background-color: rgba(178, 184, 190, 1);
+				}
 			}
 
 			.salary {
@@ -181,8 +196,8 @@
 		}
 
 		.tags-date {
-			display: flex;
-			justify-content: space-between;
+			//display: flex;
+			//justify-content: space-between;
 			align-items: center;
 			margin-top: 16rpx;
 			margin-bottom: 24rpx;
@@ -232,7 +247,7 @@
 
 	.tag {
 
-		top: -160rpx;
+		top: -190rpx;
 		left: -40rpx;
 		position: relative;
 		border-radius: 4px 4px 4px 0px;

pages/packages/mine/otherServices/authentication.vue

@@ -114,6 +114,22 @@
 								<input v-model="enterpriseForm.name" type="text" placeholder="请填写企业全称">
 							</view>
 						</view>
+						<view class="item">
+							<view class="title">
+								企业地址
+							</view>
+							<view class="input">
+								<input v-model="enterpriseForm.address" type="text" placeholder="请填写企业地址">
+							</view>
+						</view>
+						<view class="item">
+							<view class="title">
+								企业联系人
+							</view>
+							<view class="input">
+								<input v-model="enterpriseForm.contactsPersonId" type="text" placeholder="请填写企业联系人">
+							</view>
+						</view>
 					</view>
 					<!-- 营业执照 -->
 					<view class="business-license">
@@ -152,6 +168,23 @@
 							{{enterpriseForm.name}}
 						</view>
 					</view>
+					<view class="item">
+						<view class="title">
+							企业地址
+						</view>
+						<view class="value">
+							
+							{{enterpriseForm.address?enterpriseForm.address:'' }}
+						</view>
+					</view>
+					<view class="item">
+						<view class="title">
+							企业联系人
+						</view>
+						<view class="value">
+							{{enterpriseForm.contactsPersonId?enterpriseForm.contactsPersonId:'' }}
+						</view>
+					</view>
 					<view class="item">
 						<view class="title">
 							营业执照
@@ -214,7 +247,11 @@
 				enterpriseForm: {
 					name: '',
 					licenseUrl: '',
-					type: '1'
+					type: '1',
+					address: '',
+				
+					contactsPersonId: '',
+					
 				},
 				phone: '',
 				listPic: [],
@@ -306,6 +343,8 @@
 				API_main.createAuthentication({
 					enterpriseName: this.enterpriseForm.name,
 					licenseUrl: this.enterpriseForm.licenseUrl,
+					contactsPersonId: this.enterpriseForm.contactsPersonId,
+					address: this.enterpriseForm.address,
 					type: this.enterpriseForm.type
 				}).then((res) => {
 					uni.hideLoading();
@@ -325,6 +364,20 @@
 					})
 					return
 				}
+				if(!this.enterpriseForm.address) {
+					uni.showToast({icon: 'none',
+						title: "请填写企业地址",
+						icon: "none"
+					})
+					return
+				}
+				if(!this.enterpriseForm.contactsPersonId) {
+					uni.showToast({icon: 'none',
+						title: "请填写企业联系人",
+						icon: "none"
+					})
+					return
+				}
 				if(!this.enterpriseForm.licenseUrl) {
 					uni.showToast({icon: 'none',
 						title: "请上传营业执照",
@@ -332,6 +385,7 @@
 					})
 					return
 				}
+				
 				var _this=this;
 				uni.showModal({
 					title: '提示',
@@ -419,7 +473,7 @@
 				.title {
 					color: rgba(51, 51, 51, 1);
 					font-size: 32rpx;
-					width: 180rpx;
+					width: 190rpx;
 				}
 
 				.value {
@@ -458,6 +512,10 @@
 				background-color: #fff;
 				padding: 24rpx 32rpx;
 				margin-top: 16rpx;
+				.item{
+					    padding: 6px 0;
+					    border-bottom: 1px solid #f1f1f1;
+				}
 			}
 
 			.infos-input {

pages/packages/search/search.vue

@@ -169,7 +169,7 @@
 </template>
 
 <script>
-	import jkpop from "@/pages/tab/as-components/jk-popup.vue"
+	import jkpop from "@/pages/packages/as-components/jk-popup.vue"
 	
 	import * as API from '@/apis/pagejs/packages.js'
 	import nxsearch from "@/components/nx-search.vue"
@@ -305,7 +305,7 @@
 			},
 			clear() {
 				this.setSearchHistory([]);
-				mui.toast("搜索内容已清空");
+				
 			},
 			setHistory() {
 				//搜索记录保存

pages/packages/skillTraining/trainingRegistration.vue

@@ -101,7 +101,7 @@
 				})
 			},
 			isJoinBtn() {
-				if(this.getStatus()){
+				if(!this.getStatus()){
 					return
 				}
 				if (this.isJoin) {

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

@@ -1,11 +1,36 @@
 <template >
 	<view>
 		<!-- 筛选框 -->
-		<u-popup v-model="popupShow" @close="close"  @open="popupShowOpen" mode="bottom" border-radius="20" :closeable="true">
+		<u-popup v-model="popupShow" @close="close"   @open="popupShowOpen" mode="bottom" border-radius="20" :closeable="true">
 			<view class="popup-content">
 				<view class="headline">
 					筛选
 				</view>
+				<!-- 行业 -->
+				<view class="industry">
+					<view class="title">
+						<view>意向行业 <span style="color: #4696f6;">{{industryChecked!=-1?'已选中:'+industryList[industryChecked].name:''}}</span> (向下拉可滑动)</view>
+						
+						<u-search v-model="querypop"></u-search>
+					</view>
+						<!-- 选项 -->
+						
+						<scroll-view  class="scrollview" scroll-y="true" style="height: 520rpx;">
+						
+							<view class="options">
+								
+									<view 
+									:class="{item,checked:industryChecked==index}" v-for="(item,index) in industryList"
+									  v-show="item.name.indexOf(querypop)!=-1"
+									 :key="index"
+										@click="industryChecked=index">
+										<!-- 快递跑腿/配送/分拣 -->{{item.name}}
+									</view>
+								
+							</view>
+						</scroll-view>
+					
+				</view>
 				<!-- 工作经验 -->
 				<view class="work-experience">
 					<view class="title">
@@ -32,31 +57,7 @@
 						</view>
 					</view>
 				</view>
-				<!-- 行业 -->
-				<view class="industry">
-					<view class="title">
-						<view>意向行业 <span style="color: #4696f6;">{{industryChecked!=-1?'已选中:'+industryList[industryChecked].name:''}}</span> (向下拉可滑动)</view>
-						
-						<u-search v-model="querypop"></u-search>
-					</view>
-						<!-- 选项 -->
-						
-						<scroll-view  class="scrollview" scroll-y="true" style="height: 420rpx;">
-						
-							<view class="options">
-								
-									<view 
-									:class="{item,checked:industryChecked==index}" v-for="(item,index) in industryList"
-									  v-show="item.name.indexOf(querypop)!=-1"
-									 :key="index"
-										@click="industryChecked=index">
-										<!-- 快递跑腿/配送/分拣 -->{{item.name}}
-									</view>
-								
-							</view>
-						</scroll-view>
-					
-				</view>
+				
 				<view class="button">
 					<button class="reset" @click="reset()">重置</button>
 					<button class="confirm" @click="queryBtn()" >确认</button>

pages/tab/jobInformation/jobInformation.vue

@@ -369,6 +369,7 @@
 				.issuer {
 					color: rgba(51, 51, 51, 1);
 					font-size: 24rpx;
+					min-width: 160rpx;
 				}
 
 				.address {

pages/tab/mine/mine.vue

@@ -30,14 +30,22 @@
 				</view>
 
 			</view>
-		</view>
+		</view>
+				<u-select v-model="updateintention" :list="intentionList" @confirm="updateintentionBtn" ></u-select>
+
 		<!-- 求职信息 -->
 		<view class="card card1">
 			<view class="title">
 				求职信息
-
+				
 				<u-icon size="34" v-if="ck1()" name="checkmark-circle-fill" style="color: #54b86c;"></u-icon>
-				<u-icon size="34" @click="showIcon(1)" v-else name="error-circle-fill" style="color: #dc4441;"></u-icon>
+				<u-icon size="34" @click="showIcon(1)" v-else name="error-circle-fill" style="color: #dc4441;"></u-icon>
+				
+				<span v-if="ck1()"  class="intentionClass" @click="updateintention=true">求职意向 <span  :class="{
+					intentionClassSpan:true,
+					intentionClassSpan1:userInfo.intention!=2,
+					intentionClassSpan2:userInfo.intention==2,
+				}" >{{userInfo.intention==2?'已入职':'求职中'}} </span><u-icon name="arrow-right"></u-icon></span>
 			</view>
 			<u-grid :col="3" :border="false">
 				<u-grid-item @click="gotoUrl1('pages/packages/mine/myJobInformation/myJobInformation')">
@@ -209,6 +217,17 @@
 				num2: 0,
 				num3: 0,//0 未创建 ，1 审批中， 2 成功
 				isReady:false,
+				updateintention:false,
+				intentionList:[
+					{
+											value: '1',
+											label: '求职中'
+										},
+										{
+											value: '2',
+											label: '已入职'
+										}
+				],
 				
 			}
 		},
@@ -222,7 +241,24 @@
 				
 			}
 		},
-		methods: {
+		methods: {
+			updateintentionBtn(e){
+				console.log(e);
+				var intention=e[0].value
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API.updateIntention({
+					intention: intention
+				}).then((res) => {
+					uni.hideLoading();
+					this.userInfo.intention=intention;
+				}).catch(error => {
+					this.showPhone = false;
+					uni.hideLoading();
+				})
+			},
 			showIcon(i) {
 				if (i == 1) {
 					uni.showToast({
@@ -728,5 +764,19 @@
 			font-size: 28rpx;
 			line-height: 44rpx;
 		}
+	}
+	.intentionClass{
+		font-size: 32rpx;
+		float: right;
+		.intentionClassSpan{
+			margin-left: 8rpx;
+			
+		}
+		.intentionClassSpan1{
+			color: #4caf50;
+		}
+		.intentionClassSpan2{
+			color: #ff5722;
+		}
 	}
 </style>