查找功能完善

config/.env.dev.js

@@ -7,16 +7,15 @@ const UNI_APP = {
 	
 	//BASE_URL:'http://192.168.77.162:8081/railroad-server/',
 	//BASE_URL:'http://192.168.77.222:8086/railroad-server/',
-	PREFIX : "jp-Equipment-Jingli",
+	PREFIX : "jp-zeroWorkerStation",
 	NODE_ENV :"dev",
 	SIMPLE_RUN:false,// 无视权限控制跳转页面   ， 用于样式人员快速访问各种功能 ，快速测试等
 
-	openId:"o_5WO4hc7MyyVNjSDePRIft6AokI",//zkx
+	openId:"o_5WO4hc7MyyVNjSDePRIft6AokI",//个人企业都注册
 	
-	//openId:"123456",//库管理
-	//openId:"123",// 项目部 - 审批1
-	//openId:"223",// 项目部 - 审批2
-	//openId:"323",// 项目部 - 审批3
+	openId:"001",// 个人企业 未注册
+	//openId:"223",// 个人  注册 ，企业未
+	//openId:"323",// 个人  未注册 ，企业 注册
 	 
 	//小鹏管家appid
 	//VUE_APP_WXAPPID:"wx7e70eb62a8459869",

config/.env.prod.js

@@ -1,6 +1,6 @@
 const UNI_APP = {  	
 	ProjectName :"荆州经开区共享用工平台",
-	PREFIX : "jp-Equipment-Jingli",
+	PREFIX : "jp-zeroWorkerStation",
 	
 //	BASE_URL:"http://47.98.231.198:8081/equipment-manage-server/",
 	BASE_URL:"https://equipment.xiaoxinda.com/equipment-manage-server/",

config/.env.test.js

@@ -1,5 +1,5 @@
 const UNI_APP = {  
-	PREFIX : "jp-Equipment-Jingli",
+	PREFIX : "jp-zeroWorkerStation",
 	ProjectName :"荆州经开区共享用工平台",
 	
 	//BASE_URL:"http://47.98.231.198:8081/equipment-manage-server/",

pages/main/index/index.vue

@@ -104,7 +104,7 @@
 					<view class="content-1">
 						<!-- 职位 -->
 						<view class="position">
-							{{item.positionName}}
+							<b>{{item.positionName}}</b>
 						</view>
 						<!-- 薪水 -->
 						<view class="salary">
@@ -131,7 +131,7 @@
 							{{item.contacts}}
 						</view>
 						<view class="address">
-							{{item.workArea}}
+							{{item.workArea}}{{item.address}}
 						</view>
 					</view>
 				</view>

pages/packages/as-components/limeClipper/limeClipper.vue

@@ -506,7 +506,7 @@ export default {
 			if (!this.image) {
 				uni.showToast({
 					title: '请选择图片',
-					icon: 'none'
+				
 				});
 				return;
 			}
@@ -536,7 +536,7 @@ export default {
 			if (!this.image) {
 				uni.showToast({
 					title: '请选择图片',
-					icon: 'none'
+					 
 				});
 				return;
 			}
@@ -721,7 +721,7 @@ export default {
 			if (!this.image) {
 				uni.showToast({
 					title: '请选择图片',
-					icon: 'none'
+					 
 				});
 				return;
 			}
@@ -739,7 +739,7 @@ export default {
 			if (!this.image) {
 				uni.showToast({
 					title: '请选择图片',
-					icon: 'none'
+					 
 				});
 				return;
 			}

pages/packages/jobInformation/jobDetails.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-navbar  :back-text="showTitle" back-icon-size="28" back-icon-color="#ffffff"
+		<u-navbar :back-text="showTitle" back-icon-size="28" back-icon-color="#ffffff"
 			:background="{backgroundColor: '#2795FD',}" :back-text-style="{color: '#ffffff'}"></u-navbar>
 		<view class="content">
 			<view class="title">
@@ -107,11 +107,11 @@
 			</view>
 			<view class="btn">
 				<button class="dialing" @click="showPhone=true">拨打电话</button>
-				<button class="invite" :class="{
-					isJoin:isJoin
-				}"  @click="isJoinBtn">{{isJoin?'已报名':'我要报名'}}</button>
+				<button class="invite" :class="{
+					isJoin:isJoin
+				}" @click="isJoinBtn">{{isJoin?'已报名':'我要报名'}}</button>
+
 
-				
 			</view>
 			<u-modal v-model="showPhone" @confirm="confirmPhone" :confirm-text="confirmText" confirm-color="#606266"
 				:show-cancel-button="true" ref="uModal" :asyncClose="true" title="联系电话" :content="info.contactsPhone"
@@ -173,12 +173,12 @@
 		computed: {
 			showTitle() {
 				if (this.info.id) {
-					return this.info.positionName + '-' + this.info.salary + '元/天' 
+					return this.info.positionName + '-' + this.info.salary + '元/天'
 				}
 				return ''
 			}
 		},
-		onLoad(op) {
+		onLoad(op) {
 			//uni.showShareMenu()
 			this.id = op.id
 			if (op.shareMP) {
@@ -186,58 +186,78 @@
 			}
 			this.getInfo()
 		},
-		methods: {
-						confirmPhone() {
-							this.showPhone = false;
-							uni.makePhoneCall({
-								phoneNumber: this.info.contactsPhone
-							});
-						},
+		methods: {
+			confirmPhone() {
+				this.showPhone = false;
+				uni.makePhoneCall({
+					phoneNumber: this.info.contactsPhone
+				});
+			},
 
 			isJoinBtn() {
 				if (this.isJoin) {
 					return
-				}
-				var user=this.carhelp.getPersonInfo();
-				if (!user) {
-					uni.showModal({
-						title: '提示',
-						content: '登录并实名认证后可以报名',
-						confirmText:"前往登录",
-						showCancel: true,
-						success: function(res) {
-							if (res.confirm) {
-								uni.navigateTo({
-									url:'/pages/tab/mine/mine'
-								})
-								
-							} else if (res.cancel) {
-								console.log('用户点击取消');
-							}
-						}
-					});
-					return
-				}
-				if (user.status!=1) {
-					uni.showModal({
-						title: '提示',
-						content: '实名认证后可以报名',
-						confirmText:"实名认证",
-						showCancel: true,
-						success: function(res) {
-							if (res.confirm) {
-								uni.navigateTo({
-									url:'/pages/packages/mine/otherServices/authentication'
-								})
-								
-							} else if (res.cancel) {
-								console.log('用户点击取消');
-							}
-						}
-					});
-					return
-				}
-				 
+				}
+				var user = this.carhelp.getPersonInfo();
+
+				if (!user) {
+					uni.showModal({
+						title: '提示',
+						content: '登录并实名认证创建简历后可以报名',
+						confirmText: "前往登录",
+						showCancel: true,
+						success: function(res) {
+							if (res.confirm) {
+								uni.navigateTo({
+									url: '/pages/tab/mine/mine'
+								})
+
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});
+					return
+				}
+				if (user.status != 1) {
+					uni.showModal({
+						title: '提示',
+						content: '实名认证并创建简历后可以报名',
+						confirmText: "实名认证",
+						showCancel: true,
+						success: function(res) {
+							if (res.confirm) {
+								uni.navigateTo({
+									url: '/pages/packages/mine/otherServices/authentication'
+								})
+
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});
+					return
+				}
+				var jobInformationInfo = this.carhelp.getPersonInfoPlus().jobInformationInfo;
+				if (!user) {
+					uni.showModal({
+						title: '提示',
+						content: '创建简历后可以报名',
+						confirmText: "创建简历",
+						showCancel: true,
+						success: function(res) {
+							if (res.confirm) {
+								uni.navigateTo({
+									url: '/pages/packages/mine/myJobInformation/myJobInformation'
+								})
+
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});
+					return
+				}
 				uni.showLoading({
 					title: "加载中",
 					mask: true,
@@ -435,11 +455,12 @@
 				font-size: 36rpx;
 				text-align: center;
 
-			}
-			.isJoin{
-				background-color: #19be6d;
-			}
-			
+			}
+
+			.isJoin {
+				background-color: #19be6d;
+			}
+
 		}
 	}
 </style>

pages/packages/mine/employmentService/receiveRegistration.vue

@@ -7,22 +7,27 @@
 			<u-tabs :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs>
 		</view>
 		<!-- 我的报名 -->
-		<view class="receive-registration" v-for="(item,i) in list[current].list"   :key="i">
+		<view class="receive-registration" v-for="(item,i) in list[current].list" 
+		  v-if="item.jobInformationInfo"
+		  :key="i">
 			<view class="card">
 				<view class="top">
 					
 				<!-- 头像 -->
 				<view class="photo">
-					<img src="@/assets/img/informationPhoto.png"></img>
+					<img :src="item.jobInformationInfo.photo"></img>
 				</view>
 				<!-- 信息 -->
 				<view class="infos">
 					<view class="positon-salary">
 						<view class="positon">
-							家政清洁
+							{{item.jobInformationInfo.intendedIndustriesN}}
 						</view>
 						<view class="salary">
-							200元/天
+							{{item.jobInformationInfo.hopeSalary}}元/天
+						</view>
+						<view class="btncheck" @click="ckInfo(item,0)">
+							查看
 						</view>
 					</view>
 					<view class="tags-date">
@@ -37,9 +42,9 @@
 								高中
 							</view>
 						</view>
-						<view class="date">
+						<!-- <view class="date">
 							报名时间：2023-06-01
-						</view>
+						</view> -->
 					</view>
 				</view>
 					
@@ -47,8 +52,11 @@
 				</view>
 				<u-line color="#E6E6E6"></u-line>
 				<view class="buttons">
-					<view class="btn check" @click="ckInfo(item)">
-						查看
+					<view class=" view">
+						{{item.recruitInformationInfo.positionName}}-{{item.recruitInformationInfo.salary}}元/天
+					</view>
+					<view class="btn check" @click="ckInfo(item,1)">
+						岗位查看
 					</view>
 					<!-- <view class="btn delete">
 						删除
@@ -93,14 +101,14 @@
 			this.getList();
 		},
 		methods: {
-			ckInfo(item){
+			ckInfo(item,current){
 				
-				var url="/pages/packages/choreInformation/jobSearchDetails?id="
-				if(this.current==0){
-					url+=item.workPersonInfo.id
+				var url=""
+				if(current==0){
+					url="/pages/packages/choreInformation/jobSearchDetails?id="+item.jobInformationInfo.id
 				}
-				if(this.current==1){
-					url+=item.jobInformationInfo.id
+				if(current==1){
+					url="/pages/packages/jobInformation/jobDetails?id="+item.recruitInformationInfo.id
 				}
 				uni.navigateTo({
 					url:url
@@ -202,6 +210,19 @@
 				font-size: 32rpx;
 				font-family: 'PingFangSC-medium';
 			}
+			.btncheck{
+				width: 120rpx;
+				height: 56rpx;
+				line-height: 56rpx;
+				
+				border-radius: 50px;
+				background-color: rgba(255, 255, 255, 1);
+				color: rgba(119, 119, 119, 1);
+				text-align: center;
+				font-family: Microsoft Yahei;
+				border: 1px solid rgba(207, 210, 213, 1);
+				margin-left: 24rpx;
+			}
 		}
 		.tags-date{
 			display: flex;
@@ -235,11 +256,15 @@
 		
 		.buttons{
 			display: flex;
-			justify-content: flex-end;
+			justify-content: space-between;
 			margin-top: 24rpx;
+			.view{
+				color: rgba(16, 16, 16, 1);
+				font-size: 36rpx;
+			}
 			// 查看
 			.btn{
-				width: 120rpx;
+				width: 140rpx;
 				height: 56rpx;
 				line-height: 56rpx;
 				

pages/packages/mine/myJobInformation/myJobInformation.vue

@@ -6,10 +6,16 @@
 			<!-- 个人信息 -->
 			<view class="person-infos">
 				<view class="infos">
-					<view class="name">
-						许慕
+					<view class="name" v-if="userInfo.status==1">
+						{{userInfo.realName?userInfo.realName:'实名认证后生效'}}
+					</view>
+					<view class="name" v-if="userInfo.status==0" style=" font-size: 36rpx;color: #4CAF50;">
+						实名认证后生效
+						<view  style=" font-size: 24rpx;color: #4CAF50;" >
+							生效后可以进行简历投递，可以被企业邀请等
+						</view>
 					</view>
-					<view class="gender-age">
+					<view class="gender-age" v-if="userInfo.status==1">
 						<text class="text">女</text>|
 						<text class="text">28</text>
 					</view>

pages/packages/search/search.vue

@@ -13,9 +13,10 @@
 
 				</view>
 			</view>
-		</view>
+		</view>
+		
 		<!-- 搜索历史 -->
-		<view class="search-history">
+		<view class="search-history"  v-show="step" >
 			<view class="top">
 				<view class="title">
 					搜索历史
@@ -32,13 +33,224 @@
 
 			</view>
 
-		</view>
+		</view>
+		<!-- 搜索结果 -->
+		<view class="result"  v-if="!step&&searchQuery.selectIndex==0" >
+			<view class="tabs">
+				<view class="left"  style="  width: 33%;">
+					<u-tabs bg-color="#F0F0F2" :list="tabList" :is-scroll="false" :current="current"
+						@change="change"></u-tabs>
+				</view>
+				<view class="screen" @click="popupShow = true">
+					<view class="icon">
+						<img src="@/assets/img/riLine-filter-line@1x.png" alt="">
+					</view>
+					<view>筛选</view>
+				</view>
+			</view>
+			<view class="result-item"   v-for="(item,i) in tabList[current].list" :key="i"
+			  @click="gotoUrl('pages/packages/choreInformation/jobSearchDetails?id='+item.id)" >
+				<!-- 照片 -->
+				<view class="photo">
+					<u-avatar :src="item.photo"></u-avatar>
+					
+				</view>
+				<view class="content">
+					<!--  职位薪水 -->
+					<view class="top">
+						<view class="position">
+							{{item.intendedIndustriesN}}
+						</view>
+						<view class="salary">
+							{{item.hopeSalary}}元/天
+						</view>
+					</view>
+					<view class="issuer">
+						{{item.personName}}
+					</view>
+					<view class="bottom">
+						<view class="tags">
+						<!-- 	<view class="tag-item">
+								男
+							</view>
+							<view class="tag-item">
+								21岁
+							</view> -->
+							<view class="tag-item">
+								{{item.educationN}}
+							</view>
+						</view>
+		
+						<view class="date">
+							更新时间：{{getTime(item)}}
+						</view>
+					</view>
+				</view>
+				
+			</view>
+			<!-- 筛选框 -->
+			<u-popup v-model="popupShow" @close="close"  @open="popupShowOpen2" mode="bottom" border-radius="20" :closeable="true">
+				<view class="popup-content">
+					<view class="headline">
+						筛选
+					</view>
+					<!-- 薪资待遇 -->
+					<view class="salary-package">
+						<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="work-experience">
+						<view class="title">
+							工作经验
+						</view>
+						<!-- 选项 -->
+						<view class="options">
+							<view :class="{item,checked:workChecked==index}" v-for="(item,index) in workList" :key="index"
+								@click="changeWorkChecked(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>
+			<u-divider  v-if="tabList[current].recordsTotal==tabList[current].list.length"
+					 :isnone="tabList[current].recordsTotal==0" nonetext="没有找到相关内容" 
+					border-color="#CFD2D5">已经到底了</u-divider>
+		</view>
+		
+		<!-- 搜索结果 -->
+		<view class="result" v-if="!step&&searchQuery.selectIndex==1" >
+			<view class="tabs">
+				<view class="left">
+					<u-tabs bg-color="#F0F0F2" :list="tabList" :is-scroll="false" :current="current"
+						@change="change"></u-tabs>
+				</view>
+				<view class="screen" @click="popupShow = true">
+					<view class="icon">
+						<img src="@/assets/img/riLine-filter-line@1x.png" alt="">
+					</view>
+					<view>筛选</view>
+				</view>
+			</view>
+			<view class="result-item"  v-for="(item,i) in tabList[current].list" :key="i"
+			 
+			 @click="gotoUrl('pages/packages/jobInformation/jobDetails?id='+item.id)">
+		
+				<view class="content-1">
+					<!-- 职位 -->
+					<view class="position">
+						{{item.positionName}}
+					</view>
+					<!-- 薪水 -->
+					<view class="salary">
+						{{item.salary}}元/天
+					</view>
+				</view>
+				<view class="content-2">
+					<!-- 标签 -->
+					<view class="tag">
+						<view class="tag-item">
+							{{item.settlementMethodN}}
+						</view>
+					</view>
+					<!-- 日期 -->
+					<view class="date">
+						{{item.createTime}}
+					</view>
+				</view>
+				<view class="content-3">
+					<view class="issuer">
+						{{item.contacts}}
+					</view>
+					<view class="address">
+						{{item.workArea}}
+					</view>
+				</view>
+			</view>
+			
+			<!-- 筛选框 -->
+			<u-popup v-model="popupShow"  @open="popupShowOpen1" mode="bottom" border-radius="20" :closeable="true">
+				<view class="popup-content">
+					<view class="headline">
+						筛选
+					</view>
+			
+					<!-- 行业 -->
+					<view class="industry">
+						<view class="title">
+							行业
+						</view>
+						<!-- 选项 -->
+						<view class="options">
+							<view :class="{item,checked:isChecked==index}" v-for="(item,index) in industryList" :key="index"
+								@click="changeChecked(index)">
+								<!-- 快递跑腿/配送/分拣 -->{{item.name}}
+							</view>
+						</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>
+			<u-divider  v-if="tabList[current].recordsTotal==tabList[current].list.length"
+					 :isnone="tabList[current].recordsTotal==0" nonetext="没有找到相关内容" 
+					border-color="#CFD2D5">已经到底了</u-divider>
+		</view>
+		
+		
+		
+		
 	</view>
 </template>
 
 <script>
 	import * as API from '@/apis/pagejs/packages.js'
 	import nxsearch from "@/components/nx-search.vue"
+	import * as API_weixin from '@/apis/weixin.js'
 
 	export default {
 		components: {
@@ -70,10 +282,105 @@
 					pageIndex: 1,
 					pageSize: 4,
 					totalPage: 1,
-				},
+				},
+				current: 0,
 				list: [],
-				searchHistory: [],
-
+				searchHistory: [],
+				tabList:[],
+				tabList2: [{
+					name: '最新',
+					pageIndex: 1,
+					pageSize: 20,
+					statusType:"",
+					list:[],
+					recordsTotal:0
+				}, {
+					name: '日结',
+					unit:"日",
+					statusType:"1",
+					pageIndex: 1,
+					pageSize: 20,
+					list:[],
+					recordsTotal:0
+				}, {
+					name: '周结',
+					unit:"周",
+					pageIndex: 1,
+					pageSize: 20,
+					statusType:"2",
+					list:[],
+					recordsTotal:0
+				
+				}, {
+					name: '月结',
+					unit:"月",
+					pageIndex: 1,
+					pageSize: 20,
+					statusType:"3",
+					list:[],
+					recordsTotal:0
+				}],
+				
+				industryList: [
+				],
+				
+				salaryList: [{
+						name: '100元/天以下',
+						//min:0,
+						max:100
+					},
+					{
+						name: '100-150元/天',
+						min:100,
+						max:150
+					}, {
+						name: '150-200元/天',
+						min:150,
+						max:200
+					}, {
+						name: '200-300元/天',
+						
+						min:200,
+						max:300
+					}, {
+						name: '300-400元/天',
+						
+						min:300,
+						max:400
+					}, {
+						name: '400-500元/天',
+						min:400,
+						max:500
+					},
+					{
+						name: '500元/天以上',
+						min:500,
+					
+					}
+				],
+				tabList1: [{
+					name: '最新',
+					pageIndex: 1,
+					pageSize: 20,
+					statusType:"1",
+					list:[],
+					recordsTotal:0
+				}, {
+					name: '最热',
+					pageIndex: 1,
+					pageSize: 20,
+					statusType:"2",
+					list:[],
+					recordsTotal:0
+				}],
+				workList: [
+				
+				],
+				saralyChecked: -1,
+				workChecked: -1,
+				isChecked: -1,
+				wayChecked: -1,
+				popupShow:false,
 			}
 		},
 		onLoad(op) {
@@ -93,7 +400,69 @@
 				this.myLoadmore();
 			}
 		},
-		methods: {
+		methods: {
+			getTime(item){
+				var time=item.updateTime?item.updateTime:item.createTime;
+				if(time){
+					return time.substring(0,10)
+				}
+				return  ''
+			},
+			popupShowOpen2(){
+				
+				if(this.workList.length==0){
+				
+					uni.showLoading({
+						title: "加载中",
+						mask: true,
+					})
+					API_weixin.findListByCatalogName({
+						name:'学历',
+						
+					}).then((res) => {
+						uni.hideLoading();
+						
+						this.workList=res.data.dictionaryList
+						
+					}).catch(error => {
+					
+						uni.showToast({
+							title: error
+						})
+						//this.getPhone()
+						
+					})
+					
+				}
+			},
+			popupShowOpen1(){
+				
+				
+				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({
+							title: error
+						})
+						//this.getPhone()
+						
+					})
+					
+				}
+			},
 			ckInfo(id) {
 				var url = "/pages/news/articleDetails?id=" + id;
 				uni.navigateTo({
@@ -149,7 +518,7 @@
 					return
 				}
 				this.setHistory()
-				this.step = false;
+				
 				this.listForm.pageIndex = 1
 				// var ref =this.$refs.searchinput.getRef()
 				// ref.blur()
@@ -159,7 +528,20 @@
 				this.listForm.pageIndex += 1;
 				this.query();
 			},
-			query() {
+			query() {
+				
+				if(this.searchQuery.selectIndex==0){
+					this.tabList=[
+						...this.tabList1
+					]
+				}
+				if(this.searchQuery.selectIndex==1){
+					this.tabList=[
+						...this.tabList2
+					]
+				}
+				this.step = false;
+				
 				uni.showLoading({
 					title: "加载中",
 					mask: true,
@@ -188,7 +570,49 @@
 				console.log('searchQuery', searchQuery);
 				this.searchQuery=searchQuery;
 				this.submit()
-			},
+			},
+			change(index) {
+				this.current = index;
+				var list = this.tabList[this.current].list
+				if (list.length == 0) {
+					this.query();
+				}
+			},
+			close(){},
+			queryBtn(){
+				this.popupShow=false;
+				this.current = 0;
+				 this.tabList[this.current].list=[]
+				
+				this.tabList[this.current].pageIndex = 1;
+				
+				// this.saralyChecked = -1;
+				// this.workChecked = -1;
+				
+				// this.queryForm.salaryStart=""
+				// this.queryForm.salaryEnd=""
+				// this.queryForm.workExp=""
+				
+				// if(this.saralyChecked!=-1){
+				// 	this.queryForm.salaryStart=this.salaryList[this.saralyChecked].min
+				// 	this.queryForm.salaryEnd=this.salaryList[this.saralyChecked].max
+					
+				// } 
+				// if(this.workChecked!=-1){
+				// 	this.queryForm.workExp=this.workList[this.workChecked].value
+				// } 
+				
+				this.query();
+			},
+			reset() {
+			
+				this.saralyChecked = -1;
+				this.workChecked = -1;
+				this.queryForm.salaryStart=""
+				this.queryForm.salaryEnd=""
+				this.queryForm.workExp=""
+				this.queryBtn()
+			}
 
 		}
 	}
@@ -244,5 +668,261 @@
 				margin-right: 16rpx;
 			}
 		}
+	}
+	
+	// 搜索结果
+	.result {
+		background-color: #fff;
+	
+		.tabs {
+			padding-right: 32rpx;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			border-bottom: 1px solid #f1f1f1;
+	
+			.left {
+				width: 68%;
+	
+				/deep/.u-tabs {
+					background-color: #fff !important;
+	
+				}
+			}
+	
+			.screen {
+				display: flex;
+				align-items: center;
+				color: rgba(39, 149, 253, 1);
+				font-size: 16px;
+	
+				img {
+					width: 16px;
+					height: 16px;
+					vertical-align: middle;
+					margin-right: 4rpx;
+				}
+			}
+	
+		}
+	
+		.result-item {
+			padding: 24rpx 0;
+			margin: 0 32rpx;
+			border-bottom: 1px solid #F0F0F2;
+			.content {
+				margin-left: 24rpx;
+				flex: 1;
+			
+				// 职位薪水
+				.top {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					font-size: 36rpx;
+			
+					.position {
+						color: rgba(16, 16, 16, 1);
+			
+						font-family: 'PingFangSC-medium';
+					}
+			
+					.salary {
+						color: rgba(255, 61, 0, 1);
+						font-size: 32rpx;
+					}
+				}
+			
+				// 发布人
+				.issuer {
+					margin-top: 16rpx;
+				}
+			
+				// 标签和时间
+				.bottom {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					margin-top: 24rpx;
+			
+					.tags {
+						display: flex;
+			
+						.tag-item {
+							padding: 0 16rpx;
+							height: 36rpx;
+							line-height: 36rpx;
+							border-radius: 4px;
+							background-color: rgba(241, 241, 247, 1);
+							color: rgba(129, 127, 153, 1);
+							font-size: 24rpx;
+							text-align: center;
+							margin-right: 8rpx;
+						}
+					}
+			
+					.date {
+						color: rgba(153, 153, 153, 1);
+						font-size: 24rpx;
+			
+					}
+				}
+			}
+			.content-1 {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+	
+				// 职位
+				.position {
+					color: rgba(16, 16, 16, 1);
+					font-size: 36rpx;
+					font-family: 'PingFang Medium';
+				}
+	
+				// 薪水
+				.salary {
+					color: rgba(255, 61, 0, 1);
+					font-size: 32rpx;
+					font-family: 'PingFang Medium';
+				}
+			}
+	
+			.content-2 {
+				margin-top: 12rpx;
+				display: flex;
+				justify-content: space-between;
+	
+				// 标签
+				.tag {
+					display: flex;
+	
+					.tag-item {
+						width: 64rpx;
+						height: 36rpx;
+						line-height: 36rpx;
+						border-radius: 8rpx;
+						background-color: rgba(241, 241, 247, 1);
+						color: rgba(129, 127, 153, 1);
+						font-size: 24rpx;
+						text-align: center;
+						margin-right: 12rpx;
+					}
+				}
+	
+				// 日期
+				.date {
+					color: rgba(153, 153, 153, 1);
+					font-size: 24rpx;
+				}
+			}
+	
+			.content-3 {
+				margin-top: 20rpx;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+	
+				.issuer {
+					color: rgba(51, 51, 51, 1);
+					font-size: 24rpx;
+				}
+	
+				.address {
+					color: rgba(51, 51, 51, 1);
+					font-size: 24rpx;
+				}
+			}
+	
+		}
+	
+	
+	
+	
+	}
+	
+	// 筛选框
+	.popup-content {
+		padding: 32rpx;
+	
+		.headline {
+			color: #101010;
+			font-size: 40rpx;
+			text-align: center;
+		}
+	
+		//行业
+		.industry,.salary-package,.work-experience,
+		.clearing-form,
+		.salary-form {
+			margin-top: 16rpx;
+			margin-bottom: 76rpx;
+			.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;
+					padding: 0 32rpx;
+					margin-bottom: 16rpx;
+					color: #999999;
+					background-color: #F3F3F4;
+					border-radius: 4px;
+				}
+	
+				.checked {
+					background-color: #2795FD;
+					color: #fff;
+				}
+			}
+		}
+	
+		.button {
+			display: flex;
+	
+			margin-top: 8rpx;
+	
+			.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,.salary-package,.work-experience,
+	.clearing-form {
+		.options {
+			justify-content: start !important;
+		}
+	
+		.item {
+			margin-right: 24rpx;
+		}
+	}
+	
+	/deep/.u-close--top-right {
+		top: 44rpx;
 	}
 </style>

pages/packages/shareEmployment/shareEmployment-old.vue

@@ -1,195 +0,0 @@
-<template>
-	<view>
-	<u-navbar back-text="共享用工" back-icon-size="28" back-icon-color="#ffffff" :background="{backgroundColor: '#2795FD',}" :back-text-style="{color: '#ffffff'}"></u-navbar>
-		
-	<view class="info-card" >
-		<!-- 卡片信息 -->
-		<view class="detail">
-			企业现急需熟练机床车工5名，如有资源请联系0716-8818118 刘女士。
-		</view>
-		<view class="tag">
-			<view class="item1">
-				急需用工
-			</view>
-			<view class="date-item">
-				2023-06-12
-			</view>
-		</view>
-		
-		<u-line color="#CFD2D5"  />
-		<!-- 审核 -->
-		<view class="check">
-			<view class="state">
-				审核中
-			</view>
-			<view class="handle">
-				<view class="unamend">
-					修改
-				</view>
-				<view class="delete">
-					删除
-				</view>
-				
-			</view>
-			
-		</view>
-		
-	</view>
-	
-	<view class="info-card">
-		<!-- 卡片信息 -->
-		<view class="detail">
-			因企业季节性停产3个月，现产生闲置熟练机床车工5名，如有需求请联系0716-8668168 汪先生。
-		</view>
-		<view class="tag">
-			<view class="item2">
-				资源共享
-			</view>
-			<view class="date-item">
-				2023-06-12
-			</view>
-		</view>
-		
-		<u-line color="#CFD2D5"  />
-		<!-- 审核 -->
-		<view class="check">
-			<view class="state">
-				已审核
-			</view>
-			<view class="handle">
-				<view class="amend">
-					修改
-				</view>
-				<view class="delete">
-					删除
-				</view>
-				
-			</view>
-			
-		</view>
-		
-	</view>
-	<u-divider bg-color="#F0F0F2" margin-top="40" border-color="#CFD2D5">已经到底了</u-divider>
-	<!-- 底部按钮 -->
-	
-		<button class="btn">发布信息</button>
-	
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/pagejs/packages.js'
-	export default {
-		data() {
-			return {
-				
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style>
-	page{
-		background: #F0F0F2;
-		padding-bottom: 100px;
-	}
-</style>
-<style scoped lang="scss">
-	.info-card{
-		margin: 24rpx 32rpx 0;
-		padding: 24rpx;
-		background-color: #fff;
-		border-radius: 24rpx;
-		// 卡片信息
-		.detail{
-			color: rgba(16, 16, 16, 1);
-			line-height: 40rpx;
-			
-		}
-		.tag{
-			display: flex;
-			justify-content: space-between;
-			margin-top: 16rpx;
-			margin-bottom: 24rpx;
-			.item1{
-				color: rgba(39, 149, 253, 1);
-				font-size: 24rpx;
-			}
-			.item2{
-				color: rgba(0, 185, 98, 1);
-				font-size: 24rpx;
-			}
-		}
-		// 审核
-		.check{
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			margin-top: 32rpx;
-			.state{
-				color: rgba(51, 51, 51, 1);
-				font-weight: 600;
-			}
-			.handle{
-				display: flex;
-				align-items: center;
-				
-				.unamend{
-					width: 120rpx;
-					height: 56rpx;
-					line-height: 56rpx;
-					text-align: center;
-					font-family: Microsoft Yahei;
-					border: 1px solid rgba(231, 232, 234, 1);
-					border-radius: 50px;
-					opacity: 0.4;
-				}
-				.amend{
-					width: 120rpx;
-					height: 56rpx;
-					line-height: 56rpx;
-					text-align: center;
-					font-family: Microsoft Yahei;
-					border: 1px solid rgba(231, 232, 234, 1);
-					border-radius: 50px;
-					
-				}
-				.delete{
-					width: 120rpx;
-					height: 56rpx;
-					line-height: 56rpx;
-					text-align: center;
-					font-family: Microsoft Yahei;
-					border: 1px solid rgba(231, 232, 234, 1);
-					border-radius: 50px;
-					margin-left: 24rpx;
-					color: #E60012;
-				}
-			}
-		}
-	}
-
-// 底部按钮
-
-	
-	.btn{
-		position: fixed;
-		bottom: 32rpx;
-		left: 0;
-		right: 0;
-		background-color:#F0F0F2;
-		padding: 0 32rpx;
-		border-radius: 50px;
-		background-color: rgba(34, 149, 255, 1);
-		color: rgba(241, 241, 241, 1);
-		font-size: 36rpx;
-		margin: 0 32rpx;
-		box-shadow: 0px 0px 6px 0px rgba(0, 0, 0, 0.03);
-	}
-
-
-</style>

pages/packages/skillTraining/skillTraining.vue

@@ -27,7 +27,7 @@
 		
 		<u-divider v-if="list.length==recordsTotal"
 		  :isnone="list.length==0" nonetext="没有找到相关内容" 
-		 bg-color="#fff" margin-top="20" border-color="#CFD2D5">已经到底了</u-divider>
+		 bg-color="#F0F0F0" margin-top="20" border-color="#CFD2D5">已经到底了</u-divider>
 		
 	</view>
 </template>

pages/tab/issue/issue.vue

@@ -89,18 +89,107 @@
 		methods: {
 			customBack(){
 				
+			},
+			ck1(){
+				var user = this.carhelp.getPersonInfo();
+				
+				if (!user) {
+					uni.showModal({
+						title: '提示',
+						content: '当前操作需要登录',
+						confirmText: "前往登录",
+						showCancel: true,
+						success: function(res) {
+							if (res.confirm) {
+								uni.navigateTo({
+									url: '/pages/tab/mine/mine'
+								})
+				
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});
+					return false
+				}
+				return true
+			},
+			ck2(){
+				var user = this.carhelp.getPersonInfo();
+				
+				if (user.status != 1) {
+					uni.showModal({
+						title: '提示',
+						content: '当前操作需要实名认证',
+						confirmText: "实名认证",
+						showCancel: true,
+						success: function(res) {
+							if (res.confirm) {
+								uni.navigateTo({
+									url: '/pages/packages/mine/otherServices/authentication'
+								})
+				
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});
+					return false
+				}
+				return true
+			},
+			ck3(){
+				var enterpriseInfo=this.carhelp.getPersonInfoPlus().enterpriseInfo;
+				
+				if (!enterpriseInfo||enterpriseInfo.status!=1) {
+					uni.showModal({
+						title: '提示',
+						content: '当前操作需要进行企业认证',
+						confirmText:"企业认证",
+						showCancel: true,
+						success: function(res) {
+							if (res.confirm) {
+								uni.navigateTo({
+									url:'/pages/packages/mine/otherServices/authentication'
+								})
+								
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});
+					return false
+				}
+				return true
 			},
 			toMyJobInformation() {
+				
+				if(this.ck1()&&this.ck2()){
+					
+				}else{
+					return
+				}
+				
 				uni.navigateTo({
 					url: '/pages/packages/mine/myJobInformation/myJobInformation'
 				})
 			},
 			toLaborManagement() {
+				if(this.ck1()&&this.ck3()){
+					
+				}else{
+					return
+				}
 				uni.navigateTo({
 					url: '/pages/packages/mine/employmentService/laborManagement/postMessage'
 				})
 			},
 			toPostMessage() {
+				if(this.ck1()&&this.ck3()){
+					
+				}else{
+					return
+				}
 				uni.navigateTo({
 					url: '/pages/packages/mine/employmentService/postMessage'
 				})

pages/tab/jobInformation/jobInformation.vue

@@ -319,6 +319,8 @@
 			// 执行搜索
 			doSearch(searchQuery) {
 				console.log('searchQuery', searchQuery);
+				this.searchQuery=searchQuery;
+				
 			},
 			change(index) {
 				this.current = index;

pages/tab/mine/mine.vue

@@ -25,7 +25,7 @@
 				</view>
 				<view class="tel">
 					<template v-if="userInfo&&userInfo.id">
-						{{userInfo.phone.slice(0,3)}}****{{userInfo.phone.slice(-4)}} 
+						{{userInfo.phone}} 
 					</template>
 				</view>
 				
@@ -37,19 +37,19 @@
 				求职信息
 			</view>
 			 <u-grid :col="3" :border="false">
-			 		<u-grid-item  @click="gotoMyJobInformation">
+			 		<u-grid-item   @click="gotoUrl1('pages/packages/mine/myJobInformation/myJobInformation')">
 			 			<view class="icon">
 			 				<img src="@/assets/img/riLine-folder-user-line@1x.png" alt="">
 			 			</view>
 			 			<view class="grid-text">求职信息</view>
 			 		</u-grid-item>
-			 		<u-grid-item  @click="gotoUrl('pages/packages/mine/myJobInformation/myRegistration?c=0')">
+			 		<u-grid-item  @click="gotoUrl1('pages/packages/mine/myJobInformation/myRegistration?c=0')">
 			 			<view class="icon">
 			 				<img src="@/assets/img/riLine-todo-line@1x.png" alt="">
 			 			</view>
 			 			<view class="grid-text">我的报名</view>
 			 		</u-grid-item>
-			 		<u-grid-item  @click="gotoUrl('pages/packages/mine/myJobInformation/myRegistration?c=1')">
+			 		<u-grid-item  @click="gotoUrl1('pages/packages/mine/myJobInformation/myRegistration?c=1')">
 						<u-badge count="1" size="mini" :offset="[28,34]"></u-badge>
 			 			<view class="icon">
 			 				<img src="@/assets/img/riLine-mail-star-line@1x.png" alt="">
@@ -65,26 +65,27 @@
 				用工服务
 			</view>
 			 <u-grid :col="4" :border="false">
-			 		<u-grid-item  @click="gotoUrl('pages/packages/mine/employmentService/laborManagement/laborManagement')">
+			 		<u-grid-item  @click="gotoUrl2('pages/packages/mine/employmentService/laborManagement/laborManagement')">
 			 			<view class="icon">
 			 				<img src="@/assets/img/riLine-folder-2-line@1x.png" alt="">
 			 			</view>
 			 			<view class="grid-text">用工管理</view>
 			 		</u-grid-item>
-			 		<u-grid-item @click="gotoUrl('pages/packages/mine/employmentService/receiveRegistration?c=0')">
-			 			<view class="icon">
+			 		<u-grid-item @click="gotoUrl2('pages/packages/mine/employmentService/receiveRegistration?c=0')">
+			 			<u-badge count="1" size="mini" :offset="[28,34]"></u-badge>
+						<view class="icon">
 			 				<img src="@/assets/img/riLine-inbox-archive-line@1x.png" alt="">
 			 			</view>
 			 			<view class="grid-text">收到报名</view>
 			 		</u-grid-item>
-			 		<u-grid-item  @click="gotoUrl('pages/packages/mine/employmentService/receiveRegistration?c=1')">
+			 		<u-grid-item  @click="gotoUrl2('pages/packages/mine/employmentService/receiveRegistration?c=1')">
 			 			<view class="icon">
 			 				<img src="@/assets/img/riLine-time-line@1x.png" alt="">
 			 			</view>
 			 			<view class="grid-text">邀请记录</view>
 			 		</u-grid-item>
 
-					<u-grid-item @click="toShareEmployment">
+					<u-grid-item @click="gotoUrl2('/pages/packages/mine/employmentService/shareEmployment')">
 
 						<view class="icon">
 							<img src="@/assets/img/riLine-service-line@1x.png" alt="">
@@ -181,6 +182,52 @@
 			
 		},
 		methods: {
+			ck1(){
+				var user = this.carhelp.getPersonInfo();
+				
+				if (user.status != 1) {
+					uni.showToast({
+						title:"当前操作需要实名认证"
+					})
+					return false
+				}
+				return true
+			},
+			ck2(){
+				var enterpriseInfo=this.carhelp.getPersonInfoPlus().enterpriseInfo;
+				
+				if (!enterpriseInfo||enterpriseInfo.status!=1) {
+					
+					uni.showToast({
+						title:"当前操作需要进行企业认证"
+					})
+					
+					return false
+				}
+				return true
+			},
+			gotoUrl1(url){
+				if(this.ck1()){
+					
+				}else{
+					return
+				}
+				
+				uni.navigateTo({
+					url: "/" + url
+				})
+			},
+			gotoUrl2(url){
+				if(this.ck2()){
+					
+				}else{
+					return
+				}
+				
+				uni.navigateTo({
+					url: "/" + url
+				})
+			},
 			gotoMyJobInformation(){
 				//zkx 需要认证
 				uni.navigateTo({