推荐职位,推荐岗位功能， 找回密码测试联调

apis/hr/news.js

@@ -10,6 +10,23 @@
  		method: 'post',
  	})
  }
+ 
+ export function positionResumeList(data) {
+ 	return request({
+ 		url: '/mobile/resumeApi/positionResumeList',
+ 		data: data,
+ 		method: 'post',
+ 	})
+ }
+ 
+ export function positionRecruitmentList(data) {
+ 	return request({
+ 		url: '/mobile/recruitmentApi/positionRecruitmentList',
+ 		data: data,
+ 		method: 'post',
+ 	})
+ }
+ 
  export function getLabourDetails(id) {
  	return request({
  		url: '/mobile/labourApi/getLabourDetails/'+id,

apis/job/install.js

@@ -24,7 +24,13 @@ export function saveInformation(formData) {
 	})
 }
 
-
+ export function logout() {
+ 	 
+ 	return request({
+ 		method: 'post',
+ 		url: '/mobile/jobUserApi/logout'
+ 	})
+ } 
  
  export function getVerifyCode(tel) {
  	 
@@ -33,14 +39,14 @@ export function saveInformation(formData) {
  		data:{
  			telephone:tel
  		} ,
- 		url: '/mobile/jobUserApi/getVerifyCode'
+ 		url: '/mobile/jobUserApi/getVerifyCodeByTel'
  	})
  } 
  
  
 export function validateCode(formData) {
 	return request({
-		url: '/mobile/jobUserApi/validateCode',
+		url: '/mobile/jobUserApi/validateCodeByTel',
 		data: formData,
 		method: 'post',
 		

apis/job/job.js

@@ -12,12 +12,10 @@ export function getRelevantList(id) {
 		
 	})
 }
- export function getCompanyDetails(id) {
+ export function getCompanyDetails(data) {
  	return request({
  		url: '/mobile/recruitmentApi/getCompanyDetails',
- 	 	data: {
- 			id:id
- 		},
+ 	 	data: data,
  		method: 'post',
  		
  	})

components/Common.vue

@@ -1,11 +1,8 @@
 <template >
 	<view>
-	
-	
 		<u-navbar v-if="mytitle" :title="mytitle" :is-back="noback" :border-bottom="!noback">
 				<view class="slot-wrap"></view>	
 		</u-navbar>
- 		
 	</view>
 </template>
 

components/hr/ResumeItem.vue

@@ -18,7 +18,7 @@
 		</view>
 		<view class="jp-work-info">
 			<view class="u-flex">
-				<u-avatar :src="item.headImage" size="40"></u-avatar>
+				<u-avatar :src="item.headImage?item.headImage:item.headImageUrl" size="40"></u-avatar>
 				<p>{{item.realName}}</p>
 				<p v-if="mode==2" >{{item.address}}</p>
 			</view>
@@ -63,6 +63,7 @@
 		methods: {
 			setItem(){
 				if (this.obj) {
+					
 					var sz = this.obj.split(",");
 					for (var i in sz) {
 						var string1 = sz[i].split("=")[0];

components/job/ResumeAuth.vue

@@ -77,7 +77,7 @@
 						'photoFile': res.localData
 					}
 					uni.showLoading({
-					  	title:"加载中"
+					  	title:"加载中",mask:true,
 					  })
 					
 						API_Common.uploadBase64(formData).then(response => {
@@ -100,7 +100,7 @@
 			},
 			authSubmit(){
 				uni.showLoading({
-				  	title:"加载中"
+				  	title:"加载中",mask:true,
 				  })
 				  var checkIdCardResult = checkIdCard(this.authData.idCard);
 				  if (checkIdCardResult !== true) {

components/job/addResume.js

@@ -1,6 +1,6 @@
 //import * as WxJsApi from '@/utils/wxJsApi.js'
  import * as API from '@/apis/job/job.js'
-import * as API_common from '@/apis/common.js'
+import * as API_common from '@/apis/common.js'
  	import * as WxJsApi from '@/utils/wxJsApi.js'
 
 
@@ -93,7 +93,7 @@ export default {
 					'photoFile': res.localData
 				}
 				uni.showLoading({
-				  	title:"加载中"
+				  	title:"加载中",mask:true,
 				  })
 				
 					API_common.uploadBase64(formData).then(response => {
@@ -461,22 +461,22 @@ export default {
 		
 		
 		this.init();
-			this.isReady=true;
-		
-		},computed:{
-			getShowDataList(){
-				
-				var list=this.dataMap[this.dataList[this.selectShowIndex]];
-				if(list){
+			this.isReady=true;
+		
+		},computed:{
+			getShowDataList(){
+				
+				var list=this.dataMap[this.dataList[this.selectShowIndex]];
+				if(list){
 					var ls=list.map((it)=>{
 						it.text=it.name
 						return it
-					})
-					return ls;
-				}else{
-					return [];
-				}
-				
-			},
+					})
+					return ls;
+				}else{
+					return [];
+				}
+				
+			},
 		}
 }

components/job/companyInfo.vue

@@ -7,9 +7,9 @@
 					<view class="resumeInfo-company-name">
 						<h3>{{companyInfo.name}}</h3>
 						<view class="u-flex">
-							<span>{{companyInfo.scale}}</span>
+							<span>{{companyInfo.scaleName}}</span>
 							<u-line color="#ccc" length="20" direction="col" margin="0 20rpx"/>
-							<span>{{companyInfo.industry}}</span>
+							<span>{{companyInfo.industryName}}</span>
 						</view>
 					</view>	
 				</view>
@@ -30,7 +30,8 @@
 			</view>
 			<view class="jp-work-list">
 				  
-				 <RecruitmentItem v-for="(item ,index) in list" :key="item.id" :item="item" :ck="false" @ckItem="ckBtn" ></RecruitmentItem>
+				 <RecruitmentItem v-for="(item ,index) in list" :key="item.id" :item="item" :ck="vck" @ckItem="ckBtn" ></RecruitmentItem>
+				 <u-loadmore @loadmore="myLoadmore" :status="list.length<recordsTotal?'loadmore':'nomore'" ></u-loadmore>
 				 
 			</view>
 		</view>
@@ -50,6 +51,10 @@
 				require: true,
 				default: false,
 			},
+			vck: {
+				require: false,
+				default: true,
+			},
 			companyId:{
 				require: false,
 				default:""
@@ -60,14 +65,25 @@
 			}
 		},
 		components:{RecruitmentItem},
+		
 		data() {
 			return {
+				pageIndex:0,
 				recordsTotal:0,
 				 myCompanyId:null,
 				list:[],
 			};
 			
 		},methods:{
+			
+			myLoadmore(){
+				 
+				 if(this.list.length<this.recordsTotal){
+				  this.pageIndex+=1;
+				  this.getInfo()
+				 }
+				
+			},
 			back(){
 				this.$emit("back")
 			},
@@ -76,11 +92,22 @@
 			},
 			getInfo(){
 				uni.showLoading({
-					title:"加载中"
+					title:"加载中",mask:true,
 				})
-				API.getCompanyDetails(this.companyId).then((res)=>{
+				var data={
+					id:this.companyId,
+					pageIndex:this.pageIndex
+				};
+				API.getCompanyDetails(data).then((res)=>{
 					this.myCompanyId=this.companyId
-					  this.list=res.data.data;
+					  if(this.pageIndex==1){
+						  this.list=res.data.data;
+					  }else{
+						  this.list=[
+						  	...this.list,
+						  	...res.data.data
+						  ];
+					  }
 					  this.recordsTotal=res.data.recordsTotal
 					  
 					 //this.list=res
@@ -101,7 +128,13 @@
 			vshow:function(val) {
 				
 				if(val&&this.companyId&&(!this.myCompanyId||(this.myCompanyId&&this.companyId!=this.myCompanyId))){
+					this.pageIndex=1;
 					this.getInfo()
+					document.getElementsByTagName('uni-page-wrapper')[0].style="background-color: #F7F7F7;"
+					
+				}else{
+					document.getElementsByTagName('uni-page-wrapper')[0].style=""
+					
 				}
 			}
 		}
@@ -109,10 +142,8 @@
 	}
 </script>
 
-<style>
-	page{
-		background-color: #F7F7F7;
-	}
+<style >
+	
 </style>
  
 <style scoped lang="scss">

pages/hr/my/collection/index.js

@@ -1,85 +1,85 @@
 //import * as WxJsApi from '@/utils/wxJsApi.js'
 import * as API from '@/apis/hr/my.js'
 import ResumeItem from '@/components/hr/ResumeItem.vue'
-
+
 export default {
 		data() {
-			return {
-				keyword:"",
-				pageIndex:1,
-				recordsTotal:0,
+			return {
+				keyword:"",
+				pageIndex:1,
+				recordsTotal:0,
 				list: [ ],
 				isReady:false,
 				src: '/static/img/head.png',
 			}
-		},
-		components: {
-			ResumeItem
-		},
-		onLoad(op){
-			//this.id=op.id;
-		},
-		onReachBottom() {
-			if(this.result.length<this.recordsTotal){
-				this.myLoadmore();
-			}
 		},
-		methods: {
-			del(id){
-				uni.showLoading({
-					title:"加载中"
-				})
-				 
-			 
-				API.cancelCollectResume(id).then((res) => {
-					
-					this.getList(true); 
-					
-					uni.hideLoading()
-					 
-				}).catch(error => {
-						uni.showToast({
-							
-							title:error
-						})
-				})
+		components: {
+			ResumeItem
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		onReachBottom() {
+			if(this.result.length<this.recordsTotal){
+				this.myLoadmore();
+			}
+		},
+		methods: {
+			del(id){
+				uni.showLoading({
+					title:"加载中",mask:true,
+				})
+				 
+			 
+				API.cancelCollectResume(id).then((res) => {
+					
+					this.getList(true); 
+					
+					uni.hideLoading()
+					 
+				}).catch(error => {
+						uni.showToast({
+							
+							title:error
+						})
+				})
 			},
-			 myLoadmore(){
-			 	 
-			 	this.pageIndex+=1;
-			 	this.getList()
-			 },getList(bl){
-					uni.showLoading({
-						title:"加载中"
-					})
-					 if(bl){
-						 this.list=[];
-						 this.pageIndex=1;
-					 }
-					var data={
-						positionName:this.keyword,
-						pageIndex:this.pageIndex
-					};
-					API.loadCollectResumes(data).then((res) => {
-							 
-						this.list=[
-							...this.list,
-							...res.data.data
-						];
-						this.recordsTotal=res.data.recordsTotal
-						uni.hideLoading()
-						 
-					}).catch(error => {
-							uni.showToast({
-								
-								title:error
-							})
-					})
+			 myLoadmore(){
+			 	 
+			 	this.pageIndex+=1;
+			 	this.getList()
+			 },getList(bl){
+					uni.showLoading({
+						title:"加载中",mask:true,
+					})
+					 if(bl){
+						 this.list=[];
+						 this.pageIndex=1;
+					 }
+					var data={
+						positionName:this.keyword,
+						pageIndex:this.pageIndex
+					};
+					API.loadCollectResumes(data).then((res) => {
+							 
+						this.list=[
+							...this.list,
+							...res.data.data
+						];
+						this.recordsTotal=res.data.recordsTotal
+						uni.hideLoading()
+						 
+					}).catch(error => {
+							uni.showToast({
+								
+								title:error
+							})
+					})
 				}
 			
-		},onReady(){ 
+		},onReady(){ 
 			this.getList()
-			this.isReady=true;
+			this.isReady=true;
 		},onShow(){
 			if(this.isReady){
 				

pages/hr/my/enroll/index.js

@@ -1,60 +1,60 @@
 
  
-import * as API from '@/apis/hr/my.js'
- import ResumeItem from '@/components/hr/ResumeItem.vue'
-
+import * as API from '@/apis/hr/my.js'
+ import ResumeItem from '@/components/hr/ResumeItem.vue'
+
 //
-export default {
-		data() {
-			return {
-				isReady:false,
-				src: '/static/img/head/png',
-				keyword: '遥看瀑布挂前川',
-				list: [{
+export default {
+		data() {
+			return {
+				isReady:false,
+				src: '/static/img/head/png',
+				keyword: '遥看瀑布挂前川',
+				list: [{
 					name: '全部',
 					list:[],
 					status:"",
 					pageIndex:1,
-					recordsTotal:0,
-				}, {
+					recordsTotal:0,
+				}, {
 					name: '已投递',
 					list:[],
 					status:"1",
 					pageIndex:1,
-					recordsTotal:0,
-				}, {
+					recordsTotal:0,
+				}, {
 					name: '邀沟通',
 					list:[],
 					status:"2",
 					pageIndex:1,
-					recordsTotal:0,
-				},{
+					recordsTotal:0,
+				},{
 					name: '邀面试',
 					list:[],
 					status:"3",
 					pageIndex:1,
-					recordsTotal:0,
-				}, {
+					recordsTotal:0,
+				}, {
 					name: '邀入职',
 					list:[],
 					status:"4",
 					pageIndex:1,
-					recordsTotal:0,
-				},{
+					recordsTotal:0,
+				},{
 					name: '已入职',
 					list:[],
 					status:"5",
 					pageIndex:1,
-					recordsTotal:0,
-				}, {
+					recordsTotal:0,
+				}, {
 					name: '不合适',
 					list:[],
 					status:"6",
 					pageIndex:1,
-					recordsTotal:0,
-				}],
-				current: 0
-			}
+					recordsTotal:0,
+				}],
+				current: 0
+			}
 		},
 		onReachBottom() {
 			if(this.list[this.current].list.length<this.list[this.current].recordsTotal){
@@ -66,8 +66,8 @@ export default {
 		},
 		onLoad(op){
 			//this.id=op.id;
-		},
-		methods: {
+		},
+		methods: {
 			myLoadmore(){
 					var obj=this.list[this.current];
 					obj.pageIndex+=1;
@@ -83,7 +83,7 @@ export default {
 				},
 				getList(){
 					uni.showLoading({
-						title:"加载中"
+						title:"加载中",mask:true,
 					})
 					var obj=this.list[this.current];
 					var data={
@@ -108,11 +108,11 @@ export default {
 				}
 				
 			},onReady(){ 
-				this.getList()
+				this.getList()
 			this.isReady=true;
-		},onShow(){
-			if(this.isReady){
-				
-			}	
-		},
+		},onShow(){
+			if(this.isReady){
+				
+			}	
+		},
 	}

pages/hr/my/follow/index.js

@@ -1,71 +1,71 @@
 //import * as WxJsApi from '@/utils/wxJsApi.js'
 import * as API from '@/apis/hr/my.js'
-
+
 export default {
 		data() {
-			return {
-				pageIndex:1,
-				recordsTotal:0,
+			return {
+				pageIndex:1,
+				recordsTotal:0,
 				list: [ ],
 				isReady:false,
 				src: '/static/img/head.png',
 			}
-		},
-		onReachBottom() {
-			if(this.list.length<this.recordsTotal){
-				this.myLoadmore();
-			}
-		},
-		components: {
-		
-		},
-		onLoad(op){
-			//this.id=op.id;
 		},
-		methods: {
-			ckBtn(id){
-				if(id){
-					this.gotoUrl('pages/hr/index/resumeInfo/resumeInfo?id=' + id)
-					
-				}
+		onReachBottom() {
+			if(this.list.length<this.recordsTotal){
+				this.myLoadmore();
+			}
+		},
+		components: {
+		
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		methods: {
+			ckBtn(id){
+				if(id){
+					this.gotoUrl('pages/hr/index/resumeInfo/resumeInfo?id=' + id)
+					
+				}
 			},
-			 myLoadmore(){
-			 	 
-			 	this.pageIndex+=1;
-			 	this.getList()
-			 },
-			  change(index) {
-			 		this.current = index;
-			 	},
-			 	getList(){
-			 		uni.showLoading({
-			 			title:"加载中"
-			 		})
-			 		 
-			 		var data={
-			 		 
-			 			pageIndex:this.pageIndex
-			 		};
-			 		API.loadInterestList(data).then((res) => {
-			 				 
-			 			this.list=[
-			 				...this.list,
-			 				...res.data.data
-			 			];
-			 			this.recordsTotal=res.data.recordsTotal
-			 			uni.hideLoading()
-			 			 
-			 		}).catch(error => {
-			 				uni.showToast({
-			 					
-			 					title:error
-			 				})
-			 		})
+			 myLoadmore(){
+			 	 
+			 	this.pageIndex+=1;
+			 	this.getList()
+			 },
+			  change(index) {
+			 		this.current = index;
+			 	},
+			 	getList(){
+			 		uni.showLoading({
+			 			title:"加载中",mask:true,
+			 		})
+			 		 
+			 		var data={
+			 		 
+			 			pageIndex:this.pageIndex
+			 		};
+			 		API.loadInterestList(data).then((res) => {
+			 				 
+			 			this.list=[
+			 				...this.list,
+			 				...res.data.data
+			 			];
+			 			this.recordsTotal=res.data.recordsTotal
+			 			uni.hideLoading()
+			 			 
+			 		}).catch(error => {
+			 				uni.showToast({
+			 					
+			 					title:error
+			 				})
+			 		})
 			 	}
 			
-		},onReady(){ 
+		},onReady(){ 
 			this.getList()
-			this.isReady=true;
+			this.isReady=true;
 		},onShow(){
 			if(this.isReady){
 				

pages/hr/my/look/index.js

@@ -1,67 +1,67 @@
 //import * as WxJsApi from '@/utils/wxJsApi.js'
 import * as API from '@/apis/hr/my.js'
 import ResumeItem from '@/components/hr/ResumeItem.vue'
-
+
 export default {
 		data() {
-			return {
-				keyword:"",
-				pageIndex:1,
-				recordsTotal:0,
+			return {
+				keyword:"",
+				pageIndex:1,
+				recordsTotal:0,
 				list: [ ],
 				isReady:false,
 				src: '/static/img/head.png',
 			}
-		},
-		components: {
-			ResumeItem
-		},
-		onLoad(op){
-			//this.id=op.id;
-		},
-		onReachBottom() {
-			if(this.list.length<this.recordsTotal){
-				this.myLoadmore();
-			}
 		},
-		methods: {
+		components: {
+			ResumeItem
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		onReachBottom() {
+			if(this.list.length<this.recordsTotal){
+				this.myLoadmore();
+			}
+		},
+		methods: {
 			 
-			 myLoadmore(){
-			 	 
-			 	this.pageIndex+=1;
-			 	this.getList()
-			 },getList(bl){
-					uni.showLoading({
-						title:"加载中"
-					})
-					 if(bl){
-						 this.list=[];
-						 this.pageIndex=1;
-					 }
-					var data={
-						positionName:this.keyword,
-						pageIndex:this.pageIndex
-					};
-					API.pageListHR(data).then((res) => {
-							 
-						this.list=[
-							...this.list,
-							...res.data.data
-						];
-						this.recordsTotal=res.data.recordsTotal
-						uni.hideLoading()
-						 
-					}).catch(error => {
-							uni.showToast({
-								
-								title:error
-							})
-					})
+			 myLoadmore(){
+			 	 
+			 	this.pageIndex+=1;
+			 	this.getList()
+			 },getList(bl){
+					uni.showLoading({
+						title:"加载中",mask:true,
+					})
+					 if(bl){
+						 this.list=[];
+						 this.pageIndex=1;
+					 }
+					var data={
+						positionName:this.keyword,
+						pageIndex:this.pageIndex
+					};
+					API.pageListHR(data).then((res) => {
+							 
+						this.list=[
+							...this.list,
+							...res.data.data
+						];
+						this.recordsTotal=res.data.recordsTotal
+						uni.hideLoading()
+						 
+					}).catch(error => {
+							uni.showToast({
+								
+								title:error
+							})
+					})
 				}
 			
-		},onReady(){ 
+		},onReady(){ 
 			this.getList()
-			this.isReady=true;
+			this.isReady=true;
 		},onShow(){
 			if(this.isReady){
 				

pages/hr/my/position/index.js

@@ -1,40 +1,40 @@
 
 
-//import * as WxJsApi from '@/utils/wxJsApi.js'
-import * as API from '@/apis/hr/my.js'
+//import * as WxJsApi from '@/utils/wxJsApi.js'
+import * as API from '@/apis/hr/my.js'
 
-export default {
-		data() {
-			return {
-				isReady:false,
-				src: '/static/img/head/png',
-				keyword: '遥看瀑布挂前川',
+export default {
+		data() {
+			return {
+				isReady:false,
+				src: '/static/img/head/png',
+				keyword: '遥看瀑布挂前川',
 				list: [
-					{
+					{
 					name: '招聘中',
 					list:[],
 					status:"publish",
 					pageIndex:1,
-					recordsTotal:0
-				}, {
+					recordsTotal:0
+				}, {
 					name: '审核中',
 					list:[],
 					status:"approve",
 					pageIndex:1,
-					recordsTotal:0
-				}, {
+					recordsTotal:0
+				}, {
 					name: '已下架',
 					list:[],
 					status:"close",
 					pageIndex:1,
-					recordsTotal:0
-				}],
-				current: 0,
-				customStyle: {
-					margin: '0',
-					background: 'none!important'
-				}
-			}
+					recordsTotal:0
+				}],
+				current: 0,
+				customStyle: {
+					margin: '0',
+					background: 'none!important'
+				}
+			}
 		},
 		components: {
 		
@@ -46,11 +46,11 @@ export default {
 		},
 		onLoad(op){
 			//this.id=op.id;
-		},
+		},
 		methods: {
 			publish(count,id){
 				uni.showLoading({
-					title:"加载中"
+					title:"加载中",mask:true,
 				})
 			
 				var data={
@@ -72,23 +72,23 @@ export default {
 							title:error
 						})
 				})
-			},
+			},
 			 myLoadmore(){
 			 	var obj=this.list[this.current];
 			 	obj.pageIndex+=1;
 			 	this.getList()
-			 }, change(index) {
+			 }, change(index) {
 				this.current = index;
 				var obj=this.list[this.current];
 				
 				if(obj.list.length==0){
 					this.getList()
-				}
+				}
 			},
 			getList(){
 				
 				uni.showLoading({
-					title:"加载中"
+					title:"加载中",mask:true,
 				})
 				var obj=this.list[this.current];
 				var data={
@@ -110,14 +110,14 @@ export default {
 							title:error
 						})
 				})
-			}
-			
+			}
+			
 		},onReady(){ 
-			this.getList()
+			this.getList()
 			this.isReady=true;
-		},onShow(){
-			if(this.isReady){
-				
-			}	
-		},
+		},onShow(){
+			if(this.isReady){
+				
+			}	
+		},
 	}

pages/hr/newsIndex/index.js

@@ -3,7 +3,7 @@
 	
 	
 	//import * as WxJsApi from '@/utils/wxJsApi.js'
-import * as API from '@/apis/common.js'
+import * as API from '@/apis/common.js'
 
 	import TabbarHr from '@/components/TabbarHr.vue'
 	
@@ -16,12 +16,12 @@ import * as API from '@/apis/common.js'
 						backgroundColor: '#2295ff',
 					},
 					
-					src:['',
+					src:[
 						'/static/img/news1.png',
 						'/static/img/news2.png',
-						'/static/img/news3.png',
 						'/static/img/news4.png',
-						'/static/img/news5.png'
+						'/static/img/news5.png',
+						'/static/img/news3.png',
 					],
 				}
 			},
@@ -32,9 +32,24 @@ import * as API from '@/apis/common.js'
 				//this.id=op.id;
 			},
 		methods: {
+				gotoUrlNews(row){
+ 					var url='pages/hr/newsIndex/newsList/newsList?id='+row.classifyId;
+					if(row.classifyId=="5"){
+						url="pages/hr/newsIndex/servicesList/servicesList"
+					}
+					
+					if(row.classifyId=="4"){
+						url="pages/job/newsIndex/newsRecommend/newsRecommend"
+					}
+					
+					if(row.classifyId=="6"){
+						url="pages/hr/newsIndex/newsRecommend/newsRecommend"
+					}
+					this.gotoUrl(url)
+				},
 				 getList(){
 					 uni.showLoading({
-					 	title:"加载中"
+					 	title:"加载中",mask:true,
 					 })
 					API.messageClassifyHR().then((response) => {
 						this.list=response.data;

pages/hr/newsIndex/newsEntry/index.js

@@ -1,59 +1,75 @@
 //import * as WxJsApi from '@/utils/wxJsApi.js'
 import * as API from '@/apis/common.js'
-
+import CompanyInfo from '@/components/job/companyInfo.vue'
+
 export default {
 		data() {
-			return {
+			return {
 				id:"",
-				info:{
-					messageDetail:{}
+				showcompany:false,
+				companyId:"",
+				info:{
+					messageDetail:{},
+					company:{}
 				},
 				isReady:false,
 				src: '/static/img/head/png',
 			}
+		},
+		components: {
+			CompanyInfo
 		},
-		components: {
-		
-		},
-		onLoad(op){
-			this.id=op.id;
+		onReachBottom() {
+			
+			if(this.showcompany){
+				this.$refs.refCompanyInfo.myLoadmore()
+			}
+		},
+		onLoad(op){
+			this.id=op.id;
 		},
-		methods: {
-			changeAgree(i){
-				uni.showLoading({
-					title:"加载中"
-				})
-				API.changeAgree({
-					messageId:this.id,
-					isAgree:i
-				}).then((res)=>{
-					  //this.info=res.data;
-					  this.info.isAgree=i;
-					 uni.hideLoading()		
-				 }).catch(error => {
-						uni.showToast({
-							title:error
-						})
-				})
+		methods: {
+			changeAgree(i){
+				uni.showLoading({
+					title:"加载中",mask:true,
+				})
+				
+				
+				API.changeAgree({
+					messageId:this.id,
+					isAgree:i
+				}).then((res)=>{
+					  //this.info=res.data;
+					  this.info.isAgree=i;
+					// uni.hideLoading()	
+						 uni.showToast({
+						 	title:"操作成功"
+						 })
+				 }).catch(error => {
+						uni.showToast({
+							title:error
+						})
+				})
 			},
-			 getInfo(){
-			 	uni.showLoading({
-			 		title:"加载中"
-			 	})
-			 	API.messageDetail(this.id).then((res)=>{
+			 getInfo(){
+			 	uni.showLoading({
+			 		title:"加载中",mask:true,
+			 	})
+			 	API.messageDetail(this.id).then((res)=>{
 			 		  this.info=res.data;
-			 		 uni.hideLoading()		
-			 	 }).catch(error => {
-			 			uni.showToast({
-			 				title:error
-			 			})
-			 	})
-			 	
+					  this.companyId=this.info.company.id
+			 		 uni.hideLoading()		
+			 	 }).catch(error => {
+			 			uni.showToast({
+			 				title:error
+			 			})
+			 	})
+			 	
 			 }
 			
-		},onReady(){ 
+		},onReady(){ 
 			this.getInfo()
-			this.isReady=true;
+			this.isReady=true;
 		},onShow(){
 			if(this.isReady){
 				

pages/hr/newsIndex/newsEntry/newsEntry.vue

@@ -1,22 +1,40 @@
 <template>
 	<view>
-		<u-navbar title="详情" ></u-navbar>
-		<view class="company-logo">
-			<u-avatar :src="src" size="100" mode="square"></u-avatar>
-			<h3>湖北荆鹏软件集团有限公司</h3>
-		</view>
-		<view class="servicesInfo" v-if="info.messageDetail">
-			<view class="title">
-				<h2>{{info.messageDetail.title}}</h2>
-			</view>
-			<view class="main"  v-html="info.messageDetail.content">
+		<CompanyInfo ref="refCompanyInfo" v-show="showcompany" :vshow="showcompany"   :companyId="companyId" :companyInfo="info.company"   @back="showcompany=false" ></CompanyInfo>
+		
+		<view v-show="!showcompany">
+			<u-navbar title="详情"   >
+				<view slot="right">
+					<u-button  size="mini" :type="info.isAgree?'success':'error'"  v-if="info.isNeedAgree&&info.isAgree!=null" > {{info.isAgree?'已同意':'已拒绝'}}</u-button>
+					
+				</view>
+				
+				
+			</u-navbar>
+			 <view class="company-logo" v-if="info.company"
+				 style="
+				     border-bottom: 1px inset;
+				 "
 				 
+				 @click="showcompany=true">
+				<u-avatar :src="info.company.logo" size="100" mode="square"></u-avatar>
+				<h3>{{info.company.name}}</h3>
+			</view> 
+			<view class="servicesInfo" v-if="info.messageDetail" style="padding-bottom: 80px;">
+				<view class="title">
+					<h2>{{info.messageDetail.title}}</h2>
+				</view>
+				<view class="main"  v-html="info.messageDetail.content">
+					 
+				</view>
+			</view>
+			<view class="servicesInfo-foot" v-if="info.isNeedAgree&&info.isAgree==null">
+				<u-button class="servicesInfo-btn" shape="circle" @click="changeAgree(0)">拒绝</u-button>
+				<u-button class="servicesInfo-btn" type="success"  @click="changeAgree(1)" shape="circle">同意</u-button>
 			</view>
 		</view>
-		<view class="servicesInfo-foot" v-if="info.isNeedAgree">
-			<u-button class="servicesInfo-btn" shape="circle" @click="changeAgree(0)">拒绝</u-button>
-			<u-button class="servicesInfo-btn" type="success"  @click="changeAgree(1)" shape="circle">同意</u-button>
-		</view>
+		
+	 
 	</view>
 </template>
 

pages/hr/newsIndex/newsIndex.vue

@@ -2,8 +2,8 @@
 	<view>
 		<u-navbar :is-back="false" title="消息" :background="background" title-color="#fff"></u-navbar>
 		<view class="newsIndex">
-			<view class="newsIndex-item" v-for="(item,i) in list " :key="i" @click="gotoUrl('pages/job/newsIndex/newsList/newsList?id='+item.classifyId)">
-				<u-avatar :src="src[item.classifyId]"></u-avatar>
+			<view class="newsIndex-item" v-for="(item,i) in list " :key="i" @click="gotoUrlNews(item)">
+				<u-avatar :src="src[i]"></u-avatar>
 				<view class="newsIndex-text">
 					<view class="newsIndex-row">
 						<h3>{{item.classify}}</h3>

pages/hr/newsIndex/newsList/index.js

@@ -1,59 +1,59 @@
 //import * as WxJsApi from '@/utils/wxJsApi.js'
  import * as API from '@/apis/common.js'
-
+
 export default {
 		data() {
 			return {
-				isReady:false,
-				page:{
-					classifyId:0,
-					pageIndex:1,
-					pageSize:3,
-				
-				},
-				result:[],
+				isReady:false,
+				page:{
+					classifyId:0,
+					pageIndex:1,
+					pageSize:3,
+				
+				},
+				result:[],
 				recordsTotal:0,
 			}
-		},
-		components: {
-		
-		},
-		onPullDownRefresh() {
-			if(this.result.length<this.recordsTotal){
-				this.myLoadmore();
-			}
-		},
-		onLoad(op){
-			this.page.classifyId=op.id;
 		},
-		methods: {
-			myLoadmore(){
-				this.page.pageIndex++;
-				this.getList();
-			},
-			 getList(){
-				 uni.showLoading({
-				 	title:"加载中"
-				 })
-				API.messageList(this.page).then((response) => {
-					this.result=[
-						...response.data.data,
-						...this.result,
-						
-					];
-					this.recordsTotal=response.data.recordsTotal
-					    uni.stopPullDownRefresh();
-					uni.hideLoading()
-				}).catch(error => {
-						uni.showToast({
-							title:error
-						})
-				})
-			 },
-			
-		},onReady(){ 
-			this.getList();
-			this.isReady=true;
+		components: {
+		
+		},
+		onPullDownRefresh() {
+			if(this.result.length<this.recordsTotal){
+				this.myLoadmore();
+			}
+		},
+		onLoad(op){
+			this.page.classifyId=op.id;
+		},
+		methods: {
+			myLoadmore(){
+				this.page.pageIndex++;
+				this.getList();
+			},
+			 getList(){
+				 uni.showLoading({
+				 	title:"加载中",mask:true,
+				 })
+				API.messageList(this.page).then((response) => {
+					this.result=[
+						...response.data.data,
+						...this.result,
+						
+					];
+					this.recordsTotal=response.data.recordsTotal
+					    uni.stopPullDownRefresh();
+					uni.hideLoading()
+				}).catch(error => {
+						uni.showToast({
+							title:error
+						})
+				})
+			 },
+			
+		},onReady(){ 
+			this.getList();
+			this.isReady=true;
 		},onShow(){
 			if(this.isReady){
 				

pages/hr/newsIndex/newsRecommend/index.js

@@ -1,10 +1,15 @@
 //import * as WxJsApi from '@/utils/wxJsApi.js'
-import * as API from '@/apis/index.js'
+import * as API from '@/apis/hr/news.js'
+
+import ResumeItem from '@/components/hr/ResumeItem.vue'
 
 export default {
 		data() {
 			return {
-				isReady:false,
+				isReady:false,
+				list: [ ],
+				pageIndex:1,
+				recordsTotal:0,
 				src: '/static/img/head/png',
 				background: {
 					backgroundColor: '#2295ff',
@@ -12,16 +17,51 @@ export default {
 			}
 		},
 		components: {
-		
+		ResumeItem
 		},
 		onLoad(op){
 			//this.id=op.id;
+		},
+		onReachBottom() {
+			if(this.list.length<this.recordsTotal){
+				this.myLoadmore();
+			}
 		},
 		methods: {
-			 
+			 myLoadmore(){
+			 	 
+			 	this.pageIndex+=1;
+			 	this.getList()
+			 },getList(bl){
+			 					uni.showLoading({
+			 						title:"加载中",mask:true,
+			 					})
+			 					 if(bl){
+			 						 this.list=[];
+			 						 this.pageIndex=1;
+			 					 }
+			 					var data={
+ 			 						pageIndex:this.pageIndex
+			 					};
+			 					API.positionResumeList(data).then((res) => {
+			 							 
+			 						this.list=[
+			 							...this.list,
+			 							...res.data.data
+			 						];
+			 						this.recordsTotal=res.data.recordsTotal
+			 						uni.hideLoading()
+			 						 
+			 					}).catch(error => {
+			 							uni.showToast({
+			 								
+			 								title:error
+			 							})
+			 					})
+			 				}
 			
 		},onReady(){ 
-			
+			this.getList()
 			this.isReady=true;
 		},onShow(){
 			if(this.isReady){

pages/hr/newsIndex/newsRecommend/newsRecommend.vue

@@ -3,7 +3,16 @@
 		<u-navbar title="推荐简历" ></u-navbar>
 		<view class="jp-work">
 			<view class="jp-work-list">
-				<view class="jp-work-item">
+				
+				<ResumeItem v-for="(item ,index) in list" :key="item.id" :item="item"
+				 obj="userName=realName,dreamMoneyName=dreamMoney,sexName=sex,jobStatusName=jobStatus,userAge=age,workExpName=workExp,educationName=education,userAddress=address"
+				
+				 ></ResumeItem>
+				 
+				<u-loadmore @loadmore="myLoadmore" :status="list.length<recordsTotal?'loadmore':'nomore'" ></u-loadmore>
+				
+				
+			<!-- 	<view class="jp-work-item">
 					<view class="jp-work-name">
 						<h3>市场营销专员</h3>
 						<span>￥3000-5000/月</span>
@@ -26,9 +35,11 @@
 							<p>周凯</p><p>开发区</p>
 						</view>
 					</view>
-				</view>	
+				</view>	 -->
+				
+				
 			</view>
-			<view class="jp-work-list">
+		<!-- 	<view class="jp-work-list">
 				<view class="jp-work-item">
 					<view class="jp-work-name">
 						<h3>市场营销专员</h3>
@@ -54,7 +65,7 @@
 					</view>
 				</view>	
 			</view>
-		</view>
+		 --></view>
 	</view>
 </template>
 

pages/hr/newsIndex/servicesInfo/index.js

@@ -22,7 +22,7 @@ export default {
 			 				 	 title: '加载中'
 			 				 })
 			 				 API.getLabourDetails(this.id).then((res)=>{
-			 					  this.company=res.data.company
+			 					  this.company=res.data;
 			 					 this.info=res.data.labourServices;
 			 					uni.hideLoading()
 								this.$nextTick(()=>{

pages/hr/newsIndex/servicesList/index.js

@@ -1,80 +1,80 @@
 //import * as WxJsApi from '@/utils/wxJsApi.js'
 import * as API from '@/apis/hr/news.js'
-
+
 export default {
 		data() {
 			return {
 				isReady:false,
 				list: [{
-					name: '我要用人',
-					list:[],
-					approvalStatus:"1",
-					pageIndex:1,
+					name: '我要用人',
+					list:[],
+					approvalStatus:"1",
+					pageIndex:1,
 					recordsTotal:0
 				}, {
-					name: '我有工人',
-					list:[],
-					approvalStatus:"0",
-					pageIndex:1,
+					name: '我有工人',
+					list:[],
+					approvalStatus:"0",
+					pageIndex:1,
 					recordsTotal:0
 				}],
 				current: 0
 			}
-		},
-		components: {
-		
-		},
-		onReachBottom() {
-			if(this.list[this.current].list.length<this.list[this.current].recordsTotal){
-				this.myLoadmore();
-			}
-		},
-		onLoad(op){
-			//this.id=op.id;
 		},
-		methods: {
-			change(index) {
-				this.current = index;
-				var obj=this.list[this.current];
-				
-				if(obj.list.length==0){
-					this.getLabourList()
-				}
-			},
-			myLoadmore(){
-				var obj=this.list[this.current];
-				obj.pageIndex+=1;
-				this.getLabourList()
+		components: {
+		
+		},
+		onReachBottom() {
+			if(this.list[this.current].list.length<this.list[this.current].recordsTotal){
+				this.myLoadmore();
+			}
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		methods: {
+			change(index) {
+				this.current = index;
+				var obj=this.list[this.current];
+				
+				if(obj.list.length==0){
+					this.getLabourList()
+				}
+			},
+			myLoadmore(){
+				var obj=this.list[this.current];
+				obj.pageIndex+=1;
+				this.getLabourList()
 			},
-			 getLabourList(){
-				 uni.showLoading({
-				 	title:"加载中"
-				 })
-				 var obj=this.list[this.current];
-				 var data={
-				 	typeB:obj.approvalStatus,
-				 	pageIndex:obj.pageIndex
-				 };
-				 API.getLabourList(data).then((res) => {
-				 		 
-				 	obj.list=[
-				 		...obj.list,
-				 		...res.data.data
-				 	];
-				 	obj.recordsTotal=res.data.recordsTotal
-				 	uni.hideLoading()
-				 	console.log(this.list)
-				 }).catch(error => {
-				 		uni.showToast({
-				 			
-				 			title:error
-				 		})
-				 })
+			 getLabourList(){
+				 uni.showLoading({
+				 	title:"加载中",mask:true,
+				 })
+				 var obj=this.list[this.current];
+				 var data={
+				 	typeB:obj.approvalStatus,
+				 	pageIndex:obj.pageIndex
+				 };
+				 API.getLabourList(data).then((res) => {
+				 		 
+				 	obj.list=[
+				 		...obj.list,
+				 		...res.data.data
+				 	];
+				 	obj.recordsTotal=res.data.recordsTotal
+				 	uni.hideLoading()
+				 	console.log(this.list)
+				 }).catch(error => {
+				 		uni.showToast({
+				 			
+				 			title:error
+				 		})
+				 })
 			 }
 			
-		},onReady(){ 
+		},onReady(){ 
 			this.getLabourList()
-			this.isReady=true;
+			this.isReady=true;
 		},onShow(){
 			if(this.isReady){
 				

pages/job/index/index.js

@@ -1,7 +1,7 @@
 //import * as WxJsApi from '@/utils/wxJsApi.js'
 import * as API from '@/apis/job/index.js'
 import * as API_common from '@/apis/common.js'
-
+
 import TabbarJob from '@/components/TabbarJob.vue'
 import RecruitmentItem from '@/components/job/RecruitmentItem.vue'
 import ResumeAuth from '@/components/job/ResumeAuth.vue'
@@ -34,15 +34,15 @@ export default {
 					name: '最新',
 					list:[],
 					status:"1",
-					isend:false,
-					pageIndex:1,
+					isend:false,
+					pageIndex:1,
 					recordsTotal:0,
 				}, {
 					status:"2",
 					name: '最热',
 					list:[],
-					isend:false,
-					pageIndex:1,
+					isend:false,
+					pageIndex:1,
 					recordsTotal:0,
 				}],
 				current: 0,
@@ -67,7 +67,7 @@ export default {
 			},
 			getResumeStatus(){
 
-				API.resumeStatus().then((response) => {
+				API.resumeStatus().then((response) => {
 					
 					if("未创建"!=response.data){
 						
@@ -86,7 +86,7 @@ export default {
 				API_common.getScreenList().then((response) => {
 					
 					var list=response.data;
-					this.popupList=list
+					this.popupList=list
 					// .map((item)=>{
 					// 	return item.name;
 					// })
@@ -96,55 +96,55 @@ export default {
 							title:error
 						})
 				})
-			},
-			change(index) {
-				this.current = index;
-				var obj=this.list[this.current];
-				
-				if(obj.list.length==0){
-					this.getList()
-				}
 			},
-			getList(){
-				uni.showLoading({
-					title:"加载中"
-				})
-				var obj=this.list[this.current];
-				var data={
-					type:obj.status,
-					pageSize:5
-				};
+			change(index) {
+				this.current = index;
+				var obj=this.list[this.current];
+				
+				if(obj.list.length==0){
+					this.getList()
+				}
+			},
+			getList(){
+				uni.showLoading({
+					title:"加载中",mask:true,
+				})
+				var obj=this.list[this.current];
+				var data={
+					type:obj.status,
+					pageSize:5
+				};
 				
-				 API.getRecruitmentList(data).then((response) => {
-					 
-				 	uni.hideLoading()
-				 	var list=response.data.data;
-				 	obj.list=list;
-				 	obj.isend=(response.data.totalPage>1)
-				 	
-					if(!this.isReady){
-						this.isReady=true;
-						//this.islogin=this.carhelp.getToken();
-						var person=this.carhelp.getPersonInfo();
-						
-						var bl=["1","2"].indexOf(person.isAuthentication)>-1
-						
-						if(person&&!bl){
-							this.auth=true;
-						}
-						
-						this.getBanner()
-						this.getScreenList();
-						this.getResumeStatus();
-					}
-					
-					
-				 }).catch(error => {
-				 		uni.showToast({
-				 			
-				 			title:error
-				 		})
-				 })
+				 API.getRecruitmentList(data).then((response) => {
+					 
+				 	uni.hideLoading()
+				 	var list=response.data.data;
+				 	obj.list=list;
+				 	obj.isend=(response.data.totalPage>1)
+				 	
+					if(!this.isReady){
+						this.isReady=true;
+						//this.islogin=this.carhelp.getToken();
+						var person=this.carhelp.getPersonInfo();
+						
+						var bl=["1","2"].indexOf(person.isAuthentication)>-1
+						
+						if(person&&!bl){
+							this.auth=true;
+						}
+						
+						this.getBanner()
+						this.getScreenList();
+						this.getResumeStatus();
+					}
+					
+					
+				 }).catch(error => {
+				 		uni.showToast({
+				 			
+				 			title:error
+				 		})
+				 })
 				
 			},
 			

pages/job/index/recruitInfo/index.js

@@ -28,6 +28,12 @@ export default {
 		},
 		components: {
 			CompanyInfo,RecruitmentItem
+		},
+		onReachBottom() {
+			
+			if(this.showcompany){
+				this.$refs.refCompanyInfo.myLoadmore()
+			}
 		},
 		onLoad(op){
 			
@@ -112,10 +118,10 @@ export default {
 					  this.company={
 						  id:this.info.companyId,
 						  name:this.info.companyName,
-						  scale:this.info.companyScaleN,
+						  scaleName:this.info.companyScaleN,
 						   logo:this.info.companyLogo,
 						    address:this.info.address,
-							industry:this.info.companyIndustryN
+							industryName:this.info.companyIndustryN
 					  };
 					  this.isDeliver=res.data.deliveryStatus;
 					  this.isCollect=res.data.collectionStatus;

pages/job/index/recruitInfo/recruitInfo.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<CompanyInfo v-show="showcompany" :vshow="showcompany" :companyId="companyId" :companyInfo="company" @ckItem="setId" @back="showcompany=false" ></CompanyInfo>
+		<CompanyInfo ref="refCompanyInfo" v-show="showcompany" :vshow="showcompany" :vck="false" :companyId="companyId" :companyInfo="company" @ckItem="setId" @back="showcompany=false" ></CompanyInfo>
 		<view v-show="!showcompany" >
 			<u-navbar title="职位详情" ></u-navbar>
 			<view class="resumeInfo">
@@ -10,22 +10,24 @@
 				</view>
 				<view class="resumeInfo-row">
 				
-					<view class="jp-work-tag" v-if="info.requirements">
-						<u-tag  v-for="(text,index) in spiltItem(info.requirements)" :key="index"  :text="text" mode="dark" bg-color="#f1f1f7" color="#999" size="mini"/>
-					</view>
-					
 					<h2>{{info.wageTypeName}}</h2>
 				</view>
+				<view class="resumeInfo-row">
 				
+					<view class="jp-work-tag" v-if="info.tagList">
+						<u-tag  v-for="(text,index) in  info.tagList" :key="index"  :text="text" mode="dark" bg-color="#f1f1f7" color="#999" size="mini"/>
+					</view>
+					
+				</view>
 				<view class="resumeInfo-company"   @click="showcompany=true">
 					<u-avatar :src="company.logo" size="80" mode="square"></u-avatar>
 					<view class="resumeInfo-company-text">
 						<view class="resumeInfo-company-name">
 							<p>{{company.name}}</p>
 							<view class="u-flex">
-								<span>{{company.scale}}</span>
+								<span>{{company.scaleName}}</span>
 								<u-line color="#ccc" length="20" direction="col" margin="0 20rpx"/>
-								<span>{{company.industry}}</span>
+								<span>{{company.industryName}}</span>
 							</view>
 						</view>	
 						<u-icon name="arrow-right" color="#999" size="24"></u-icon>

pages/job/newsIndex/index.js

@@ -1,36 +1,52 @@
 //import * as WxJsApi from '@/utils/wxJsApi.js'
 import * as API from '@/apis/common.js'
 import TabbarJob from '@/components/TabbarJob.vue'
-
+
 export default {
 		data() {
-			return {
+			return {
 				list:[],
 				isReady:false,
 				background: {
 					backgroundColor: '#2295ff',
-				},
+				},
 				
-				src:['',
-					'/static/img/news1.png',
+				src:['',
+					'/static/img/news1.png',
 					'/static/img/news2.png',
-					'/static/img/news3.png',
-					'/static/img/news4.png'
+					'/static/img/news4.png',
+					'/static/img/news3.png',
+				
 				],
 			 
 			}
-		},
-		components: {
-			TabbarJob
-		},
-		onLoad(op){
-			//this.id=op.id;
 		},
-		methods: {
-			 getList(){
-				 uni.showLoading({
-				 	title:"加载中"
-				 })
+		components: {
+			TabbarJob
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		methods: {
+			gotoUrlNews(row){
+				var url='pages/hr/newsIndex/newsList/newsList?id='+row.classifyId;
+				if(row.classifyId=="5"){
+					url="pages/hr/newsIndex/servicesList/servicesList"
+				}
+				
+				if(row.classifyId=="4"){
+					url="pages/job/newsIndex/newsRecommend/newsRecommend"
+				}
+				
+				if(row.classifyId=="6"){
+					url="pages/hr/newsIndex/newsRecommend/newsRecommend"
+				}
+				this.gotoUrl(url)
+			},
+			 getList(){
+				 uni.showLoading({
+				 	title:"加载中",mask:true,
+				 })
 				API.messageClassify().then((response) => {
 					this.list=response.data;
 					uni.hideLoading()
@@ -39,12 +55,12 @@ export default {
 							
 							title:error
 						})
-				})
+				})
 			 },
 			
-		},onReady(){ 
+		},onReady(){ 
 			this.getList();
-			this.isReady=true;
+			this.isReady=true;
 		},onShow(){
 			if(this.isReady){
 				

pages/job/newsIndex/newsEntry/index.js

@@ -1,59 +1,75 @@
 //import * as WxJsApi from '@/utils/wxJsApi.js'
 import * as API from '@/apis/common.js'
-
+import CompanyInfo from '@/components/job/companyInfo.vue'
+
 export default {
 		data() {
-			return {
+			return {
 				id:"",
-				info:{
-					messageDetail:{}
+				showcompany:false,
+				companyId:"",
+				info:{
+					messageDetail:{},
+					company:{}
 				},
 				isReady:false,
 				src: '/static/img/head/png',
 			}
+		},
+		components: {
+			CompanyInfo
+		},
+		onLoad(op){
+			this.id=op.id;
 		},
-		components: {
-		
-		},
-		onLoad(op){
-			this.id=op.id;
+		onReachBottom() {
+			
+			if(this.showcompany){
+				this.$refs.refCompanyInfo.myLoadmore()
+			}
 		},
-		methods: {
-			changeAgree(i){
-				uni.showLoading({
-					title:"加载中"
-				})
-				API.changeAgree({
-					messageId:this.id,
-					isAgree:i
-				}).then((res)=>{
-					  //this.info=res.data;
-					  this.info.isAgree=i;
-					 uni.hideLoading()		
-				 }).catch(error => {
-						uni.showToast({
-							title:error
-						})
-				})
+		methods: {
+			changeAgree(i){
+				uni.showLoading({
+					title:"加载中",mask:true,
+				})
+				
+				
+				API.changeAgree({
+					messageId:this.id,
+					isAgree:i
+				}).then((res)=>{
+					  //this.info=res.data;
+					  this.info.isAgree=i;
+					// uni.hideLoading()	
+						 uni.showToast({
+						 	title:"操作成功"
+						 })
+				 }).catch(error => {
+						uni.showToast({
+							title:error
+						})
+				})
 			},
-			 getInfo(){
-			 	uni.showLoading({
-			 		title:"加载中"
-			 	})
-			 	API.messageDetail(this.id).then((res)=>{
+			 getInfo(){
+			 	uni.showLoading({
+			 		title:"加载中",mask:true,
+			 	})
+			 	API.messageDetail(this.id).then((res)=>{
 			 		  this.info=res.data;
-			 		 uni.hideLoading()		
-			 	 }).catch(error => {
-			 			uni.showToast({
-			 				title:error
-			 			})
-			 	})
-			 	
+					  this.companyId=this.info.company.id
+			 		 uni.hideLoading()		
+			 	 }).catch(error => {
+			 			uni.showToast({
+			 				title:error
+			 			})
+			 	})
+			 	
 			 }
 			
-		},onReady(){ 
+		},onReady(){ 
 			this.getInfo()
-			this.isReady=true;
+			this.isReady=true;
 		},onShow(){
 			if(this.isReady){
 				

pages/job/newsIndex/newsEntry/newsEntry.vue

@@ -1,22 +1,37 @@
 <template>
 	<view>
-		<u-navbar title="详情" ></u-navbar>
-		<view class="company-logo">
-			<u-avatar :src="src" size="100" mode="square"></u-avatar>
-			<h3>湖北荆鹏软件集团有限公司</h3>
-		</view>
-		<view class="servicesInfo" v-if="info.messageDetail">
-			<view class="title">
-				<h2>{{info.messageDetail.title}}</h2>
+		<CompanyInfo  ref="refCompanyInfo" v-show="showcompany"   :vshow="showcompany" :companyId="companyId" :companyInfo="info.company"   @back="showcompany=false" ></CompanyInfo>
+		
+		<view v-show="!showcompany">
+			<u-navbar title="详情"   >
+				<view slot="right">
+					<u-button  size="mini" :type="info.isAgree?'success':'error'"  v-if="info.isNeedAgree&&info.isAgree!=null" > {{info.isAgree?'已同意':'已拒绝'}}</u-button>
+					
+				</view>
+				
+				
+			</u-navbar>
+			 <view class="company-logo" v-if="info.company"  style="
+    border-bottom: 1px inset;
+"   @click="showcompany=true">
+				<u-avatar :src="info.company.logo" size="100" mode="square"></u-avatar>
+				<h3>{{info.company.name}}</h3>
+			</view> 
+			<view class="servicesInfo" v-if="info.messageDetail" style="padding-bottom: 80px;">
+				<view class="title">
+					<h2>{{info.messageDetail.title}}</h2>
+				</view>
+				<view class="main"  v-html="info.messageDetail.content">
+					 
+				</view>
 			</view>
-			<view class="main"  v-html="info.messageDetail.content">
-				 
+			<view class="servicesInfo-foot" v-if="info.isNeedAgree&&info.isAgree==null">
+				<u-button class="servicesInfo-btn" shape="circle" @click="changeAgree(0)">拒绝</u-button>
+				<u-button class="servicesInfo-btn" type="success"  @click="changeAgree(1)" shape="circle">同意</u-button>
 			</view>
 		</view>
-		<view class="servicesInfo-foot" v-if="info.isNeedAgree">
-			<u-button class="servicesInfo-btn" shape="circle" @click="changeAgree(0)">拒绝</u-button>
-			<u-button class="servicesInfo-btn" type="success"  @click="changeAgree(1)" shape="circle">同意</u-button>
-		</view>
+		
+	 
 	</view>
 </template>
 

pages/job/newsIndex/newsIndex.vue

@@ -2,7 +2,7 @@
 	<view>
 		<u-navbar :is-back="false" title="消息" :background="background" title-color="#fff"></u-navbar>
 		<view class="newsIndex">
-			<view class="newsIndex-item" v-for="(item,i) in list " :key="i" @click="gotoUrl('pages/hr/newsIndex/newsList/newsList?id='+item.classifyId)">
+			<view class="newsIndex-item" v-for="(item,i) in list " :key="i" @click="gotoUrlNews(item)">
 				<u-avatar :src="src[item.classifyId]"></u-avatar>
 				<view class="newsIndex-text">
 					<view class="newsIndex-row">

pages/job/newsIndex/newsList/index.js

@@ -1,59 +1,59 @@
 //import * as WxJsApi from '@/utils/wxJsApi.js'
  import * as API from '@/apis/common.js'
-
+
 export default {
 		data() {
 			return {
-				isReady:false,
-				page:{
-					classifyId:0,
-					pageIndex:1,
-					pageSize:3,
-				
-				},
-				result:[],
+				isReady:false,
+				page:{
+					classifyId:0,
+					pageIndex:1,
+					pageSize:3,
+				
+				},
+				result:[],
 				recordsTotal:0,
 			}
-		},
-		components: {
-		
-		},
-		onPullDownRefresh() {
-			if(this.result.length<this.recordsTotal){
-				this.myLoadmore();
-			}
-		},
-		onLoad(op){
-			this.page.classifyId=op.id;
 		},
-		methods: {
-			myLoadmore(){
-				this.page.pageIndex++;
-				this.getList();
-			},
-			 getList(){
-				 uni.showLoading({
-				 	title:"加载中"
-				 })
-				API.messageList(this.page).then((response) => {
-					this.result=[
-						...response.data.data,
-						...this.result,
-						
-					];
-					this.recordsTotal=response.data.recordsTotal
-					    uni.stopPullDownRefresh();
-					uni.hideLoading()
-				}).catch(error => {
-						uni.showToast({
-							title:error
-						})
-				})
-			 },
-			
-		},onReady(){ 
-			this.getList();
-			this.isReady=true;
+		components: {
+		
+		},
+		onPullDownRefresh() {
+			if(this.result.length<this.recordsTotal){
+				this.myLoadmore();
+			}
+		},
+		onLoad(op){
+			this.page.classifyId=op.id;
+		},
+		methods: {
+			myLoadmore(){
+				this.page.pageIndex++;
+				this.getList();
+			},
+			 getList(){
+				 uni.showLoading({
+				 	title:"加载中",mask:true,
+				 })
+				API.messageList(this.page).then((response) => {
+					this.result=[
+						...response.data.data,
+						...this.result,
+						
+					];
+					this.recordsTotal=response.data.recordsTotal
+					    uni.stopPullDownRefresh();
+					uni.hideLoading()
+				}).catch(error => {
+						uni.showToast({
+							title:error
+						})
+				})
+			 },
+			
+		},onReady(){ 
+			this.getList();
+			this.isReady=true;
 		},onShow(){
 			if(this.isReady){
 				

pages/job/newsIndex/newsRecommend/index.js

@@ -1,24 +1,67 @@
 //import * as WxJsApi from '@/utils/wxJsApi.js'
-import * as API from '@/apis/index.js'
+import * as API from '@/apis/hr/news.js'
+
+import RecruitmentItem from '@/components/job/RecruitmentItem.vue'
 
 export default {
 		data() {
 			return {
-				isReady:false,
-				src:'/static/img/logo.png'
+				isReady:false,
+				list: [ ],
+				pageIndex:1,
+				recordsTotal:0,
+				src: '/static/img/head/png',
+				background: {
+					backgroundColor: '#2295ff',
+				},
 			}
 		},
 		components: {
-		
+		RecruitmentItem
 		},
 		onLoad(op){
 			//this.id=op.id;
+		},
+		onReachBottom() {
+			if(this.list.length<this.recordsTotal){
+				this.myLoadmore();
+			}
 		},
 		methods: {
-			 
+			 myLoadmore(){
+			 	 
+			 	this.pageIndex+=1;
+			 	this.getList()
+			 },getList(bl){
+			 					uni.showLoading({
+			 						title:"加载中",mask:true,
+			 					})
+			 					 if(bl){
+			 						 this.list=[];
+			 						 this.pageIndex=1;
+			 					 }
+			 					var data={
+ 			 						pageIndex:this.pageIndex
+			 					};
+			 					API.positionRecruitmentList(data).then((res) => {
+			 							 
+			 						this.list=[
+			 							...this.list,
+			 							...res.data.data
+			 						];
+			 						this.recordsTotal=res.data.recordsTotal
+			 						uni.hideLoading()
+			 						 
+			 					}).catch(error => {
+			 							uni.showToast({
+			 								
+			 								title:error
+			 							})
+			 					})
+			 				}
 			
 		},onReady(){ 
-			
+			this.getList()
 			this.isReady=true;
 		},onShow(){
 			if(this.isReady){

pages/job/newsIndex/newsRecommend/newsRecommend.vue

@@ -2,78 +2,14 @@
 	<view>
 		<u-navbar title="推荐职位" ></u-navbar>
 		<view class="jp-work-list">
-			<view class="jp-work-item">
-				<view class="jp-work-name">
-					<h3>JAVA开发工程师</h3>
-					<span>面议</span>
-				</view>
-				<view class="jp-work-tag">
-					<u-tag text="雪月夜"  mode="dark" bg-color="#f1f1f7" color="#999" size="mini"/>
-					<u-tag text="雪月夜"  mode="dark" bg-color="#f1f1f7" color="#999" size="mini"/>
-					<u-tag text="雪月夜"  mode="dark" bg-color="#f1f1f7" color="#999" size="mini"/>
-				</view>
-				<view class="jp-work-info">
-					<view class="u-flex">
-						<u-avatar :src="src" size="40"></u-avatar>
-						<p>湖北荆鹏软件集团有限公司 1-50人</p>
-					</view>
-					<p>开发区</p>
-				</view>
-			</view>	
-			<view class="jp-work-item">
-				<view class="jp-work-name">
-					<h3>JAVA开发工程师</h3>
-					<span>面议</span>
-				</view>
-				<view class="jp-work-tag">
-					<u-tag text="雪月夜"  mode="dark" bg-color="#f1f1f7" color="#999" size="mini"/>
-					<u-tag text="雪月夜"  mode="dark" bg-color="#f1f1f7" color="#999" size="mini"/>
-					<u-tag text="雪月夜"  mode="dark" bg-color="#f1f1f7" color="#999" size="mini"/>
-				</view>
-				<view class="jp-work-info">
-					<view class="u-flex">
-						<u-avatar :src="src" size="40"></u-avatar>
-						<p>湖北荆鹏软件集团有限公司 1-50人</p>
-					</view>
-					<p>开发区</p>
-				</view>
-			</view>
-			<view class="jp-work-item">
-				<view class="jp-work-name">
-					<h3>JAVA开发工程师</h3>
-					<span>面议</span>
-				</view>
-				<view class="jp-work-tag">
-					<u-tag text="雪月夜"  mode="dark" bg-color="#f1f1f7" color="#999" size="mini"/>
-					<u-tag text="雪月夜"  mode="dark" bg-color="#f1f1f7" color="#999" size="mini"/>
-					<u-tag text="雪月夜"  mode="dark" bg-color="#f1f1f7" color="#999" size="mini"/>
-				</view>
-				<view class="jp-work-info">
-					<view class="u-flex">
-						<u-avatar :src="src" size="40"></u-avatar>
-						<p>湖北荆鹏软件集团有限公司 1-50人</p>
-					</view>
-					<p>开发区</p>
-				</view>
-			</view>
-			<view class="jp-work-item">
-				<view class="jp-work-name">
-					<h3>JAVA开发工程师</h3>
-					<span>面议</span>
-				</view>
-				<view class="jp-work-tag">
-					<u-tag text="雪月夜"  mode="dark" bg-color="#f1f1f7" color="#999" size="mini"/>
-					<u-tag text="雪月夜"  mode="dark" bg-color="#f1f1f7" color="#999" size="mini"/>
-					<u-tag text="雪月夜"  mode="dark" bg-color="#f1f1f7" color="#999" size="mini"/>
-				</view>
-				<view class="jp-work-info">
-					<view class="u-flex">
-						<u-avatar :src="src" size="40"></u-avatar>
-						<p>湖北荆鹏软件集团有限公司 1-50人</p>
-					</view>
-					<p>开发区</p>
-				</view>
-			</view>
+			
+			<RecruitmentItem v-for="(item ,index) in list" :key="index" :item="item"
+			 obj="wageTypeName=wageTypeN,companyScaleN=scaleName,companyName=name,companyLogo=logo,address=cityName"
+			 ></RecruitmentItem>
+			 
+			<u-loadmore @loadmore="myLoadmore" :status="list.length<recordsTotal?'loadmore':'nomore'" ></u-loadmore>
+			 
+			 
 		</view>
 		 
 	</view>

pages/job/personal/install/account/passwordB/index.js

@@ -11,7 +11,7 @@ export default {
 				isReady:false,
 				vcode:"",
 				isSendMsgIng: false,
-				sendMsgSecond: 60*5,
+				sendMsgSecond: 60*2,
 			}
 		},
 		components: {
@@ -56,8 +56,8 @@ export default {
 				 if(time){
 					var nowtime= new Date().getTime()
 					var  differ=(nowtime-time)/1000
-					if(differ<5*60){
-						this.sendMsgSecond=5*60 - parseInt(differ)
+					if(differ<2*60){
+						this.sendMsgSecond=2*60 - parseInt(differ)
 						this.msgTimeInterval();
 					} 
 					 
@@ -98,7 +98,7 @@ export default {
 						_this.sendMsgSecond = time--;
 					} else {
 						_this.isSendMsgIng = false;
-						_this.sendMsgSecond = 5*60;
+						_this.sendMsgSecond = 2*60;
 						clearInterval(_this.timer)
 					}
 				}, 1000)

pages/job/personal/install/account/phoneA/index.js

@@ -6,16 +6,17 @@ import {
 	} from '@/utils'
 export default {
 	data() {
-		return {
+		return {
 			isOk:false,
 			maxlength: 6,
-			value: '',
+			value: '',
+			value2:'',
 			tel: "",
 			step: true,
 			isReady: false,
 			show: false,
 			error: "",
-			sendMsgSecond: 60 * 5,
+			sendMsgSecond: 60 * 2,
 			isSendMsgIng: false,
 			showTel: "",
 		}
@@ -28,14 +29,14 @@ export default {
 	},
 	methods: {
 		send() {
-
+			
 			var time = this.carhelp.get("getvcodetime");
 
 			if (time) {
 				var nowtime = new Date().getTime()
 				var differ = (nowtime - time) / 1000
-				if (differ < 5 * 60) {
-					this.sendMsgSecond = 5 * 60 - parseInt(differ)
+				if (differ < 2 * 60) {
+					this.sendMsgSecond = 2 * 60 - parseInt(differ)
 					this.tab = 4;
 					this.msgTimeInterval();
 				}
@@ -56,16 +57,17 @@ export default {
 					})
 					API.getVerifyCode(this.showTel).then((response) => {
 
-					 
+					  
 						uni.hideLoading();
-						this.carhelp.set("getvcodetime", new Date().getTime());
-						 
-						if (!"") { //response.message
-							//倒计时
+						
+						if (response.message) { //response.message
+							//倒计时
+							this.carhelp.set("getvcodetime", new Date().getTime());
+							 
 							this.msgTimeInterval();
 						} else {
 							uni.showToast({
-								title: "您的验证码已经发送[5分钟有效]，请勿重复点击"
+								title: "上一个验证码尚未过期，可继续使用"
 							})
 						}
 					}).catch(error => {
@@ -89,87 +91,97 @@ export default {
 		// change事件侦听
 		change(value) {
 			// console.log('change', value);
-		},
+		},
 		submit(){
-			var checkPhoneResult = checkPhone(this.tel);
-			
-			if (checkPhoneResult !== true) {
-				uni.showToast({
-					title: checkPhoneResult,
-			
-				})
-				return;
-			}
-			
-			this.showTel=this.tel;
-			this.step=true;
-			this.send()
+			 
+			this.value="";
+			this.sendMsgSecond=60 * 2,
+		 
+			this.isSendMsgIng = false;
+			this.carhelp.set("getvcodetime",null)
+			var checkPhoneResult = checkPhone(this.tel);
+			
+			if (checkPhoneResult !== true) {
+				uni.showToast({
+					title: checkPhoneResult,
+			
+				})
+				return;
+			}
+			
+			this.showTel=this.tel;
+			this.step=true;
+			this.send()
 		},
 		// 输入完验证码最后一位执行
-		finish(value) {
-			uni.showLoading({
-			  	title:"加载中"
-			  })
-			 API.validateCode({
-								verifyCode:  value,
-								telephone:this.showTel,
-								openId:this.carhelp.getOpenId(),
-			 }).then((response) => {
-					 
-					 if(this.tel){
-						 this.rebuildTel()
-					 }else{
-						 uni.hideLoading()
-						 this.step=false
-					 }
-			}).catch(error => {
-				uni.showToast({
-							title:error,
-							icon:"none"
-				})
+		finish(value) {
+			
+			 
+			uni.showLoading({
+			  	title:"加载中",mask:true,
+			  })
+			 API.validateCode({
+								verifyCode:  value,
+								telephone:this.showTel,
+								openId:this.carhelp.getOpenId(),
+			 }).then((response) => {
+					 
+					 if(this.tel){
+						 this.rebuildTel()
+					 }else{
+						 uni.hideLoading()
+						 this.step=false
+					 }
+			}).catch(error => {
+				uni.showToast({
+							title:error,
+							icon:"none"
+				})
 			})
-		},
-		rebuildTel(){
-			uni.showLoading({
-			  	title:"加载中"
-			  })
-			 API.rebuildTel({
-								tel:  this.tel,
-								
-			 }).then((response) => {
-					this.isOk=true;
-					
-					var obj= this.carhelp.getPersonInfo();
+		},
+		rebuildTel(){
+			uni.showLoading({
+			  	title:"加载中",mask:true,
+			  })
+			 API.rebuildTel({
+								tel:  this.tel,
+								
+			 }).then((response) => {
+					this.isOk=true;
+					uni.hideLoading()
+					var obj= this.carhelp.getPersonInfo();
 					obj.tel=this.showTel;
-					uni.showModal({
-						content:response.data,
-						showCancel:false,
-						success() {
-							uni.redirectTo({
-							    url: '/pages/job/personal/my/my'
-							});
-						}
-					})
-					
-					
-			}).catch(error => {
-				uni.showToast({
-							title:error,
-							icon:"none"
-				})
-			})
+					this.carhelp.setPersonInfo(obj);
+					uni.showModal({
+						content:response.data,
+						showCancel:false,
+						success() {
+							uni.redirectTo({
+							    url: '/pages/job/personal/my/my'
+							});
+						}
+					})
+					
+					
+			}).catch(error => {
+				uni.showToast({
+							title:error,
+							icon:"none"
+				})
+			})
 		},
 		//倒计时
 		msgTimeInterval() {
 			this.isSendMsgIng = true;
 			var time = this.sendMsgSecond;
-			var _this = this;
+			var _this = this;
+			
 			this.timer = setInterval(() => {
-				if (time > 0) {
+				if (time > 0&&_this.isSendMsgIng) {
 					_this.sendMsgSecond = time--;
 				} else {
 					_this.isSendMsgIng = false;
-					_this.sendMsgSecond = 5 * 60;
+					_this.sendMsgSecond = 2 * 60;
 					clearInterval(_this.timer)
 				}
 			}, 1000)
@@ -179,8 +191,8 @@ export default {
 	onReady() {
 		this.showTel = this.carhelp.getPersonInfo().tel;
 
-		this.isReady = true;
-		
+		this.isReady = true;
+		
 		 
 	},
 	onShow() {
@@ -198,4 +210,4 @@ export default {
 			return style;
 		}
 	},
-}
+}

pages/job/personal/install/account/phoneA/phoneA.vue

@@ -10,7 +10,12 @@
 		<view class="key-input" v-show="step">
 			<view class="title">输入验证码</view>
 			<view class="tips">验证码发送至 {{showTel}}</view>
-			<u-message-input :focus="true" :value="value" @change="change" @finish="finish" mode="bottomLine" :maxlength="maxlength"></u-message-input>
+			<u-message-input v-model="value" v-show="!tel" :focus="true"   @change="change" @finish="finish" mode="bottomLine" :maxlength="maxlength"></u-message-input>
+		
+		 <u-message-input v-model="value2" v-show="tel"  :focus="true"   @change="change" @finish="finish" mode="bottomLine" :maxlength="maxlength"></u-message-input>
+		 
+ 			
+			
 			<view class="captcha">
 				<text :class="{ noCaptcha: !isSendMsgIng }" @tap="noCaptcha">发送验证码</text>
 				<text :class="{ regain: isSendMsgIng }">{{ sendMsgSecond }}秒后重新获取验证码</text>

pages/job/personal/install/index.js

@@ -1,5 +1,5 @@
 //import * as WxJsApi from '@/utils/wxJsApi.js'
-import * as API from '@/apis/index.js'
+ import * as API from '@/apis/job/install.js'
 
 export default {
 	data() {
@@ -17,12 +17,46 @@ export default {
 		}
 	},
 	methods: {
-		signOut(){
-			
+		logout(){
+			 
+			uni.showLoading({
+				title:"加载中",mask:true,
+			})
+			API.logout().then((res)=>{
+				
+				this.carhelp.setToken("");
+				this.carhelp.set("token_tdate","")
+				this.carhelp.setPersonInfo("");
+				uni.reLaunch({
+				    url: '/pages/job/index/index'
+				});
+				
+				 uni.hideLoading()		
+			 }).catch(error => {
+				 
+				uni.showToast({
+					title:error
+				})
+			})
+			
 		},
-	},
-	onReady(){ 
-		//document.getElementsByTagName('uni-page-wrapper')[0].style="background-color: #eff1f7;"
-		
+		signOut(){
+			var _this=this;
+			uni.showModal({
+				title:"提示",
+				content:"确认是否退出",
+				success: (res) => {
+					
+					if (res.confirm) {
+						_this.logout()
+					}
+				}
+			})
+			
+		},
+	},
+	onReady(){ 
+		//document.getElementsByTagName('uni-page-wrapper')[0].style="background-color: #eff1f7;"
+		
 	}
 }

pages/job/personal/install/myInfo/index.js

@@ -1,13 +1,13 @@
 //import * as WxJsApi from '@/utils/wxJsApi.js'
- import * as API from '@/apis/job/install.js'
+ import * as API from '@/apis/job/install.js'
 import * as API_common from '@/apis/common.js'
- 	import * as WxJsApi from '@/utils/wxJsApi.js'
+ 	import * as WxJsApi from '@/utils/wxJsApi.js'
 
 export default {
 	data() {
-		return {
-			isReady:true,
-			endyear:2020,
+		return {
+			isReady:true,
+			endyear:2020,
 		 pickerShow:false,
 			form: {
 				name: '',
@@ -18,152 +18,152 @@ export default {
 				color: '#2979ff',
 				fontSize:'32rpx',
 			},
-			actionSheetList: [
-				{
-					id:1,
-					text: '男'
-				},
-				{
-					id:0,
-					text: '女'
-				},
-				{
-					id:2,
-					text: '保密'
-				}
-			],
-				pickerShowSList:[],
+			actionSheetList: [
+				{
+					id:1,
+					text: '男'
+				},
+				{
+					id:0,
+					text: '女'
+				},
+				{
+					id:2,
+					text: '保密'
+				}
+			],
+				pickerShowSList:[],
 			 pickerShowS:false,
 			actionSheetShow: false,
 		}
 	},
-	methods: {
-		uploadPic(){
-			if(!this.isReady){
-				return
-			}
-			 WxJsApi.chooseImage().then(res=>{
-				 
-				var formData = {
-					'photoName': '1.jpg',
-					'photoFile': res.localData
-				}
-				uni.showLoading({
-				  	title:"加载中"
-				  })
-				
-					API_common.uploadBase64(formData).then(response => {
-						
-						this.form.headImageUrl=response.data;
-						
-						uni.showToast({
-									title:"上传成功",
-									icon:"none"
-						})
-						this.$forceUpdate()
-					}).catch(error => {
-						uni.showToast({
-									title:error,
-									icon:"none"
-						})	
-					})
-			 })
-		 
-		},
-		selectpicker(item){
-			
-			this.form.birthday=item.year+"-"+item.month+"-"+item.day;
+	methods: {
+		uploadPic(){
+			if(!this.isReady){
+				return
+			}
+			 WxJsApi.chooseImage().then(res=>{
+				 
+				var formData = {
+					'photoName': '1.jpg',
+					'photoFile': res.localData
+				}
+				uni.showLoading({
+				  	title:"加载中",mask:true,
+				  })
+				
+					API_common.uploadBase64(formData).then(response => {
+						
+						this.form.headImageUrl=response.data;
+						
+						uni.showToast({
+									title:"上传成功",
+									icon:"none"
+						})
+						this.$forceUpdate()
+					}).catch(error => {
+						uni.showToast({
+									title:error,
+									icon:"none"
+						})	
+					})
+			 })
+		 
 		},
-		// 点击actionSheet回调
-		save(){
-			
-			var form=this.form;
-			var error=""
-			if(!form.realName){
-				 error="请输入姓名"
-			}else if(!form.sex){
-				 error="请选择性别"
-			}else if(!form.birthday){
-				 error="请选择出生年月"
-			}else if(!form.address){
-				 error="请输入常驻地区"
-			}else if(!form.firstJobTime){
-				 error="请选择参加工作时间"
-			}
-			
-			if(error){
-				uni.showToast({
-					title:error
-				})
-				return false;
-			}
-			
-			uni.showLoading({
-				title:"加载中"
-			})
-			API.saveInformation(this.form).then((res)=>{
-			uni.showToast({
-				title:res.data
-			})
-			this.carhelp.setPersonInfo(this.form);
-				// uni.hideLoading()
-			 }).catch(error => {
-				uni.showToast({
-					title:error
-				})
-			})
-		},
-		selectpickerS(item){
-				
-			this.form.firstJobTime=item[0].label+item[1].label;
+		selectpicker(item){
+			
+			this.form.birthday=item.year+"-"+item.month+"-"+item.day;
+		},
+		// 点击actionSheet回调
+		save(){
+			
+			var form=this.form;
+			var error=""
+			if(!form.realName){
+				 error="请输入姓名"
+			}else if(!form.sex){
+				 error="请选择性别"
+			}else if(!form.birthday){
+				 error="请选择出生年月"
+			}else if(!form.address){
+				 error="请输入常驻地区"
+			}else if(!form.firstJobTime){
+				 error="请选择参加工作时间"
+			}
+			
+			if(error){
+				uni.showToast({
+					title:error
+				})
+				return false;
+			}
+			
+			uni.showLoading({
+				title:"加载中",mask:true,
+			})
+			API.saveInformation(this.form).then((res)=>{
+			uni.showToast({
+				title:res.data
+			})
+			this.carhelp.setPersonInfo(this.form);
+				// uni.hideLoading()
+			 }).catch(error => {
+				uni.showToast({
+					title:error
+				})
+			})
+		},
+		selectpickerS(item){
+				
+			this.form.firstJobTime=item[0].label+item[1].label;
 		},
 		getInfo() {
-			uni.showLoading({
-				title:"加载中"
-			})
-			API.myInformation().then((res)=>{
-			
-				this.form=res.data;
-				uni.hideLoading()
-				
-			 }).catch(error => {
-				uni.showToast({
-					title:error
-				})
-					
+			uni.showLoading({
+				title:"加载中",mask:true,
+			})
+			API.myInformation().then((res)=>{
+			
+				this.form=res.data;
+				uni.hideLoading()
+				
+			 }).catch(error => {
+				uni.showToast({
+					title:error
+				})
+					
 			})
 		},
-	},
-	onReady(){
-		WxJsApi.getWxConfig(['chooseImage']).then(()=>{
-				this.isReady=true	 	
-		});
-		
-		var list=["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"]
-			 list=list.map((item)=>{
-				 return {
-					 value:item,
-					 label:item,
-				 }
-			 })
-			var year=new Date().getYear()+1900;
-			
-			this.endyear=year-5;
-			
-			
-			console.log(this.endyear)
-			var list2=[];
-			
-			for(var i=0;i< 40;i++){
-				list2.push({
-					value:year-i+"年",
-					label:year-i+"年",
-					children:list
-				})
-			}
-			this.pickerShowSList.push(list2)
-			this.pickerShowSList.push(list)
-			
-		this.getInfo()
+	},
+	onReady(){
+		WxJsApi.getWxConfig(['chooseImage']).then(()=>{
+				this.isReady=true	 	
+		});
+		
+		var list=["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"]
+			 list=list.map((item)=>{
+				 return {
+					 value:item,
+					 label:item,
+				 }
+			 })
+			var year=new Date().getYear()+1900;
+			
+			this.endyear=year-5;
+			
+			
+			console.log(this.endyear)
+			var list2=[];
+			
+			for(var i=0;i< 40;i++){
+				list2.push({
+					value:year-i+"年",
+					label:year-i+"年",
+					children:list
+				})
+			}
+			this.pickerShowSList.push(list2)
+			this.pickerShowSList.push(list)
+			
+		this.getInfo()
 	}
 }

pages/job/personal/install/resume/index.js

@@ -68,7 +68,7 @@ export default {
 		getInfo(){
 			 
 			uni.showLoading({
-				title:"加载中"
+				title:"加载中",mask:true,
 			})
 			API.resumeDetail(this.id,this.isHr).then((res)=>{
 				this.workExpList=res.data.workExpList;

pages/job/personal/my/resumeCollect/index.js

@@ -2,66 +2,66 @@
 
 import * as API from '@/apis/job/resume.js'
 import RecruitmentItem from '@/components/job/RecruitmentItem.vue'
-
+
 export default {
 		data() {
 			return {
 				isReady:false,
-				pageIndex:1,
+				pageIndex:1,
 				recordsTotal:0,
 				list: [ ],
 				current: 0
 			}
-		},
-		components: {
-		RecruitmentItem
-		},
-		onReachBottom() {
-			if(this.list.length<this.recordsTotal){
-				this.myLoadmore();
-			}
-		},
-		onLoad(op){
-			//this.id=op.id;
 		},
-		methods: {
-			myLoadmore(){
-				 
-				this.pageIndex+=1;
-				this.getList()
+		components: {
+		RecruitmentItem
+		},
+		onReachBottom() {
+			if(this.list.length<this.recordsTotal){
+				this.myLoadmore();
+			}
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		methods: {
+			myLoadmore(){
+				 
+				this.pageIndex+=1;
+				this.getList()
 			},
 			 change(index) {
 					this.current = index;
-				},
-				getList(){
-					uni.showLoading({
-						title:"加载中"
-					})
-					 
-					var data={
-						type:1,
-						pageIndex:this.pageIndex
-					};
-					API.pagedLoad(data).then((res) => {
-							 
-						this.list=[
-							...this.list,
-							...res.data.data
-						];
-						this.recordsTotal=res.data.recordsTotal
-						uni.hideLoading()
-						 
-					}).catch(error => {
-							uni.showToast({
-								
-								title:error
-							})
-					})
+				},
+				getList(){
+					uni.showLoading({
+						title:"加载中",mask:true,
+					})
+					 
+					var data={
+						type:1,
+						pageIndex:this.pageIndex
+					};
+					API.pagedLoad(data).then((res) => {
+							 
+						this.list=[
+							...this.list,
+							...res.data.data
+						];
+						this.recordsTotal=res.data.recordsTotal
+						uni.hideLoading()
+						 
+					}).catch(error => {
+							uni.showToast({
+								
+								title:error
+							})
+					})
 				}
 			
-		},onReady(){ 
+		},onReady(){ 
 			this.getList()
-			this.isReady=true;
+			this.isReady=true;
 		},onShow(){
 			if(this.isReady){
 				

pages/job/personal/my/resumeList/index.js

@@ -1,102 +1,102 @@
 //import * as WxJsApi from '@/utils/wxJsApi.js'
 import * as API from '@/apis/job/resume.js'
 import RecruitmentItem from '@/components/job/RecruitmentItem.vue'
-
+
 export default {
 		data() {
 			return {
 				isReady:false,
 				src: 'http://pic2.sc.chinaz.com/Files/pic/pic9/202002/hpic2119_s.jpg',
 				list: [{
-					name: '全部',
-					list:[],
-					status:"",
-					pageIndex:1,
+					name: '全部',
+					list:[],
+					status:"",
+					pageIndex:1,
 					recordsTotal:0
 				}, {
-					name: '待沟通',
-					list:[],
-					status:"2",
-					pageIndex:1,
+					name: '待沟通',
+					list:[],
+					status:"2",
+					pageIndex:1,
 					recordsTotal:0,
 				}, {
-					name: '邀面试',
-					list:[],
-					status:"3",
-					pageIndex:1,
+					name: '邀面试',
+					list:[],
+					status:"3",
+					pageIndex:1,
 					recordsTotal:0,
 				},{
-					name: '邀入职',
-					list:[],
-					status:"4",
-					pageIndex:1,
+					name: '邀入职',
+					list:[],
+					status:"4",
+					pageIndex:1,
 					recordsTotal:0,
 				},{
-					name: '不合适',
-					list:[],
-					status:"6",
-					pageIndex:1,
+					name: '不合适',
+					list:[],
+					status:"6",
+					pageIndex:1,
 					recordsTotal:0,
-				}],
+				}],
 				
 				current: 0
 			}
-		},
-		components: {
-			RecruitmentItem
-		},
-		onLoad(op){
-			//this.id=op.id;
-		},
-		onReachBottom() {
-			if(this.list[this.current].list.length<this.list[this.current].recordsTotal){
-			
-				this.myLoadmore();
-			}
 		},
-		methods: {
-			myLoadmore(){
-				var obj=this.list[this.current];
-				obj.pageIndex+=1;
-				this.getList()
+		components: {
+			RecruitmentItem
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		onReachBottom() {
+			if(this.list[this.current].list.length<this.list[this.current].recordsTotal){
+			
+				this.myLoadmore();
+			}
+		},
+		methods: {
+			myLoadmore(){
+				var obj=this.list[this.current];
+				obj.pageIndex+=1;
+				this.getList()
 			},
 			 change(index) {
-				this.current = index;
-				var obj=this.list[this.current];
-				
-				if(obj.list.length==0){
-					this.getList()
+				this.current = index;
+				var obj=this.list[this.current];
+				
+				if(obj.list.length==0){
+					this.getList()
 				}
-			},
-			getList(){
-				uni.showLoading({
-					title:"加载中"
-				})
-				var obj=this.list[this.current];
-				var data={
-					chatStatus:obj.status,
-					pageIndex:obj.pageIndex
-				};
-				API.deliveryRecord(data).then((res) => {
-						 
-					obj.list=[
-						...obj.list,
-						...res.data.data
-					];
-					obj.recordsTotal=res.data.recordsTotal
-					uni.hideLoading()
-					console.log(this.list)
-				}).catch(error => {
-						uni.showToast({
-							
-							title:error
-						})
-				})
+			},
+			getList(){
+				uni.showLoading({
+					title:"加载中",mask:true,
+				})
+				var obj=this.list[this.current];
+				var data={
+					chatStatus:obj.status,
+					pageIndex:obj.pageIndex
+				};
+				API.deliveryRecord(data).then((res) => {
+						 
+					obj.list=[
+						...obj.list,
+						...res.data.data
+					];
+					obj.recordsTotal=res.data.recordsTotal
+					uni.hideLoading()
+					console.log(this.list)
+				}).catch(error => {
+						uni.showToast({
+							
+							title:error
+						})
+				})
 			}
 			
-		},onReady(){ 
+		},onReady(){ 
 			this.getList()
-			this.isReady=true;
+			this.isReady=true;
 		},onShow(){
 			if(this.isReady){
 				

pages/job/personal/my/resumeLook/index.js

@@ -2,66 +2,67 @@
 
 import * as API from '@/apis/job/resume.js'
 import RecruitmentItem from '@/components/job/RecruitmentItem.vue'
-
+
 export default {
 		data() {
 			return {
 				isReady:false,
-				pageIndex:1,
-				recordsTotal:0,
+				pageIndex:1,
+				recordsTotal:0,
+				
 				list: [ ],
 				current: 0
 			}
-		},
-		components: {
-		RecruitmentItem
-		},
-		onReachBottom() {
-			if(this.list.length<this.recordsTotal){
-				this.myLoadmore();
-			}
-		},
-		onLoad(op){
-			//this.id=op.id;
 		},
-		methods: {
-			myLoadmore(){
-				 
-				this.pageIndex+=1;
-				this.getList()
+		components: {
+		RecruitmentItem
+		},
+		onReachBottom() {
+			if(this.list.length<this.recordsTotal){
+				this.myLoadmore();
+			}
+		},
+		onLoad(op){
+			//this.id=op.id;
+		},
+		methods: {
+			myLoadmore(){
+				 
+				this.pageIndex+=1;
+				this.getList()
 			},
 			 change(index) {
 					this.current = index;
-				},
-				getList(){
-					uni.showLoading({
-						title:"加载中"
-					})
-					 
-					var data={
-						type:2,
-						pageIndex:this.pageIndex
-					};
-					API.pagedLoad(data).then((res) => {
-							 
-						this.list=[
-							...this.list,
-							...res.data.data
-						];
-						this.recordsTotal=res.data.recordsTotal
-						uni.hideLoading()
-						 
-					}).catch(error => {
-							uni.showToast({
-								
-								title:error
-							})
-					})
+				},
+				getList(){
+					uni.showLoading({
+						title:"加载中",mask:true,
+					})
+					 
+					var data={
+						type:2,
+						pageIndex:this.pageIndex
+					};
+					API.pagedLoad(data).then((res) => {
+							 
+						this.list=[
+							...this.list,
+							...res.data.data
+						];
+						this.recordsTotal=res.data.recordsTotal
+						uni.hideLoading()
+						 
+					}).catch(error => {
+							uni.showToast({
+								
+								title:error
+							})
+					})
 				}
 			
-		},onReady(){ 
+		},onReady(){ 
 			this.getList()
-			this.isReady=true;
+			this.isReady=true;
 		},onShow(){
 			if(this.isReady){
 				

pages/job/query/index.js

@@ -64,7 +64,8 @@ export default {
 			RecruitmentItem
 		},
 		onReachBottom() {
-			if(this.result.length<this.result.recordsTotal){
+			
+			if(this.result.length<this.recordsTotal){
 				this.myLoadmore();
 			}
 		},

pages/login/index.js

@@ -7,7 +7,7 @@ import {
 	} from '@/utils'
 export default {
 		data() {
-			return {
+			return {
 				test:process.env.NODE_ENV === "development",
 				phone:"",
 				isReady:false,
@@ -19,7 +19,7 @@ export default {
 				value:"",
 				show:"",
 				isSendMsgIng: false,
-				sendMsgSecond: 60*5,
+				sendMsgSecond: 60*2,
 				tel:'',
 				tab:0,
 				message:"",
@@ -37,12 +37,12 @@ export default {
 			ResumeAuth
 		},
 		onLoad(op){
-			this.form=op.form;
-			if(this.form=="hr"){
-				this.tab=2
-			}
-			if(this.form=="job"){
-				this.tab=1
+			this.form=op.form;
+			if(this.form=="hr"){
+				this.tab=2
+			}
+			if(this.form=="job"){
+				this.tab=1
 			}
 			this.message=op.message;
 			this.backUrl=op.back;
@@ -59,15 +59,15 @@ export default {
 			}
 		},
 		methods: {
-			finish(e){
-				if(!this.carhelp.getOpenId()){
-					uni.showToast({
-						title:"请使用“微信”访问本系统登录"
-					})
-					return
+			finish(e){
+				if(!this.carhelp.getOpenId()){
+					uni.showToast({
+						title:"请使用“微信”访问本系统登录"
+					})
+					return
 				}
 				 uni.showLoading({
-				   	title:"加载中"
+				   	title:"加载中",mask:true,
 				   })
 				  API.validateCode({
 					verifyCode:  e,
@@ -108,8 +108,8 @@ export default {
 				  if(time){
 				 	var nowtime= new Date().getTime()
 				 	var  differ=(nowtime-time)/1000
-				 	if(differ<5*60){
-				 		this.sendMsgSecond=5*60 - parseInt(differ)
+				 	if(differ<2*60){
+				 		this.sendMsgSecond=2*60 - parseInt(differ)
 						 this.tab=4;
 				 		this.msgTimeInterval();
 				 	} 
@@ -126,7 +126,7 @@ export default {
 					  	return;
 					  }else{
 						  uni.showLoading({
-						    	title:"加载中"
+						    	title:"加载中",mask:true,
 						    })
 						   API.getVerifyCode(this.tel).then((response) => {
 						  		 
@@ -165,17 +165,17 @@ export default {
 			 			_this.sendMsgSecond = time--;
 			 		} else {
 			 			_this.isSendMsgIng = false;
-			 			_this.sendMsgSecond = 5*60;
+			 			_this.sendMsgSecond = 2*60;
 			 			clearInterval(_this.timer)
 			 		}
 			 	}, 1000)
 			 },
-			login3(){
-				if(!this.carhelp.getOpenId()){
-					uni.showToast({
-						title:"请使用“微信”访问本系统登录"
-					})
-					return
+			login3(){
+				if(!this.carhelp.getOpenId()){
+					uni.showToast({
+						title:"请使用“微信”访问本系统登录"
+					})
+					return
 				}
 				//var checkPhoneResult = checkPhone(this.tel);
 				
@@ -185,13 +185,13 @@ export default {
 						
 				// 	})
 				// 	return;
-				// }
-				if(!this.tel){
-					uni.showToast({
-						title: "请输入账号",
-						
-					})
-					return;
+				// }
+				if(!this.tel){
+					uni.showToast({
+						title: "请输入账号",
+						
+					})
+					return;
 				}
 				if(!this.password){
 					uni.showToast({
@@ -202,7 +202,7 @@ export default {
 				}
 				
 				uni.showLoading({
-				  	title:"加载中"
+				  	title:"加载中",mask:true,
 				  })
 				 API.passwordLogin({
 					 phone:this.tel,
@@ -253,12 +253,12 @@ export default {
 					
 				}
 			},
-			 login(){
-				 if(!this.carhelp.getOpenId()){
-				 	uni.showToast({
-				 		title:"请使用“微信”访问本系统登录"
-				 	})
-				 	return
+			 login(){
+				 if(!this.carhelp.getOpenId()){
+				 	uni.showToast({
+				 		title:"请使用“微信”访问本系统登录"
+				 	})
+				 	return
 				 }
 				 if(!this.readme){
 					 uni.showToast({
@@ -292,11 +292,11 @@ export default {
 					title:this.message.split(",")[0],
 					icon:"none"
 				})
-			}
-			if(!this.carhelp.getOpenId()){
-				uni.showToast({
-					title:"请使用“微信”访问本系统登录"
-				})
+			}
+			if(!this.carhelp.getOpenId()){
+				uni.showToast({
+					title:"请使用“微信”访问本系统登录"
+				})
 			}
 			this.isReady=true;
 		},onShow(){

pages/login/vCode/index.js

@@ -11,7 +11,7 @@ export default {
 				isReady:false,
 				vcode:"",
 				isSendMsgIng: false,
-				sendMsgSecond: 60*5,
+				sendMsgSecond: 60*2,
 			}
 		},
 		components: {
@@ -56,8 +56,8 @@ export default {
 				 if(time){
 					var nowtime= new Date().getTime()
 					var  differ=(nowtime-time)/1000
-					if(differ<5*60){
-						this.sendMsgSecond=5*60 - parseInt(differ)
+					if(differ<2*60){
+						this.sendMsgSecond=2*60 - parseInt(differ)
 						this.msgTimeInterval();
 					} 
 					 
@@ -98,7 +98,7 @@ export default {
 						_this.sendMsgSecond = time--;
 					} else {
 						_this.isSendMsgIng = false;
-						_this.sendMsgSecond = 5*60;
+						_this.sendMsgSecond = 2*60;
 						clearInterval(_this.timer)
 					}
 				}, 1000)