diff --git a/common/textdata.js b/common/textdata.js
index 2a1f0c2..2f7f1c3 100644
--- a/common/textdata.js
+++ b/common/textdata.js
@@ -4719,6 +4719,7 @@ const education = {
     5: "高中",
     6: "中专/中技",
     7: "初中及以下",
+    8: "不限学历",
 };
 const experience = {
     不限经验: "不限经验",
diff --git a/manifest.json b/manifest.json
index 0dd18a9..ceef986 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,80 +1,80 @@
-{
-    "name": "招聘",
-    "appid": "__UNI__2BC0F87",
-    "description": "",
-    "versionName": "1.0.0",
-    "versionCode": "100",
-    "transformPx": false,
-    "app-plus": {
-        "usingComponents": true,
-        "compilerVersion": 3,
-        /* 5+App特有相关 */
-        "modules": {},
-        /* 模块配置 */
-        "distribute": {
-            /* 应用发布信息 */
-            "android": {
-                /* android打包配置 */
-                "permissions": [
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
-            },
-            "ios": {},
-            /* ios打包配置 */
-            "sdkConfigs": {}
-        }
-    },
-    /* SDK配置 */
-    "quickapp": {},
-    /* 快应用特有相关 */
-    "mp-weixin": {
-        /* 小程序特有相关 */
-        "appid": "wx77580889aaf15eb4",
-        "setting": {
-            "urlCheck": false,
-            "minified": true,
-            "es6": true
-        },
-        "usingComponents": true,
-        "permission": {
-            "scope.userLocation": {
-                "desc": "获取您的位置，以便给您推荐合适工作信息"
-            }
-        }
-    },
-    "h5": {
-        "sdkConfigs": {
-            "maps": {
-                "qqmap": {
-                    "key": "FW3BZ-6JTK6-GCUS5-MZCRR-3GPR5-HJFEI"
-                }
-            }
-        },
-        "template": "index.html",
-        "router": {
-            "base": "./",
-            "mode": "hash"
-        }
-    }
-}
\ No newline at end of file
+{
+    "name" : "招聘",
+    "appid" : "__UNI__2BC0F87",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    "app-plus" : {
+        "usingComponents" : true,
+        "compilerVersion" : 3,
+        /* 5+App特有相关 */
+        "modules" : {},
+        /* 模块配置 */
+        "distribute" : {
+            /* 应用发布信息 */
+            "android" : {
+                /* android打包配置 */
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            "ios" : {},
+            /* ios打包配置 */
+            "sdkConfigs" : {}
+        }
+    },
+    /* SDK配置 */
+    "quickapp" : {},
+    /* 快应用特有相关 */
+    "mp-weixin" : {
+        /* 小程序特有相关 */
+        "appid" : "wx77580889aaf15eb4",
+        "setting" : {
+            "urlCheck" : false,
+            "minified" : true,
+            "es6" : true
+        },
+        "usingComponents" : true,
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "获取您的位置，以便给您推荐合适工作信息"
+            }
+        }
+    },
+    "h5" : {
+        "sdkConfigs" : {
+            "maps" : {
+                "qqmap" : {
+                    "key" : "FW3BZ-6JTK6-GCUS5-MZCRR-3GPR5-HJFEI"
+                }
+            }
+        },
+        "template" : "index.html",
+        "router" : {
+            "base" : "./",
+            "mode" : "hash"
+        }
+    }
+}
diff --git a/pages.json b/pages.json
index 1627b61..68b71bc 100644
--- a/pages.json
+++ b/pages.json
@@ -40,6 +40,13 @@
                 "navigationBarBackgroundColor": "#FFFFFF"
             }
         },
+        {
+            "path": "pages/projectInfo/userrecruitWorkInfo",
+            "style": {
+                "navigationBarTitleText": "招工详情",
+                "navigationBarBackgroundColor": "#FFFFFF"
+            }
+        },
         {
             "path": "pages/projectInfo/signContract",
             "style": {
diff --git a/pages/project/project.vue b/pages/project/project.vue
index a55e366..f5be90b 100644
--- a/pages/project/project.vue
+++ b/pages/project/project.vue
@@ -175,7 +175,7 @@
                 searchData: {},
 
                 // nonReactiveArray: ["推荐任务", "推荐岗位", "个体户招工"],
-                nonReactiveArray: ["推荐零工任务", "推荐企业岗位"],
+                nonReactiveArray: ["推荐零工任务", "推荐岗位"],
             }
         },
         onLoad: function() {
diff --git a/pages/projectInfo/projectInfo.vue b/pages/projectInfo/projectInfo.vue
index aa26442..bc65067 100644
--- a/pages/projectInfo/projectInfo.vue
+++ b/pages/projectInfo/projectInfo.vue
@@ -23,9 +23,9 @@
             <view class="prolist">
                 零工工种：{{info.worktypeNames || '暂无'}}
             </view>
-            <view class="fee">
+            <!-- <view class="fee">
                 {{info.wage || '暂无'}}
-            </view>
+            </view> -->
         </view>
         <view class="head">
             <view class="proname proneed">
diff --git a/pages/projectInfo/userrecruitInfo.vue b/pages/projectInfo/userrecruitInfo.vue
index e865b12..597e4ce 100644
--- a/pages/projectInfo/userrecruitInfo.vue
+++ b/pages/projectInfo/userrecruitInfo.vue
@@ -1,582 +1,636 @@
-<template>
-	<view v-if="showDetail">
-		<view class="head">
-			<view class="proname">
-				{{info.jobName}}
-			</view>
-			<!-- <view class="prolist">
-				任务编码：{{info.missionNo}}
-			</view> -->
-			<view class="prolist">
-				发布日期：{{ info.stime ? dateFormat((info.stime)) : null }}
-			</view>
-			<view class="prolist">
-				招聘人数：{{info.peopleNum}}
-			</view>
-			<view class="prolist">
-				行业类型：{{info.tradeNames?info.tradeNames:info.jobCompanyIndustry}}
-			</view>
-			<view class="prolist">
-				工种类型：{{info.skillNames}}
-			</view>
-			<!-- <view class="fee">
-				{{info.wage}}{{wageUnit[info.wageUnitCategory]}}
-			</view> -->
-		</view>
-		<view class="head">
-			<view class="proname proneed">
-				招工要求
-			</view>
-			<!-- <view class="prolist">
-				<view class="protype">
-					年龄要求：{{age[info.ageDesc]}}
-				</view>
-			</view> -->
-			<view class="prolist">
-				<view class="protype">
-					学历要求：{{info.education}}
-				</view>
-				<view class="protype">
-					经验要求：{{info.experienceDesc}}
-				</view>
-			</view>
-			<view class="prolist">
-				招工地址：{{info.jobAddress}}
-			</view>
-			<view class="prolist proint" style="font-weight: bold;color:#333;">
-				招工描述
-			</view>
-			<view class="prolist description">
-				{{info.jobDescription}}
-			</view>
-			<!-- 技能标签 start -->
-			<view class="ask">
-				<view class="askList" v-for="(item,index) in skillNames" :key="index">
-					{{item}}
-				</view>
-			</view>
-			<!-- 技能标签 end -->
-<!-- 			<view v-if="info.jobSources" class="prolist">
-				来源：{{info.jobSources}}
-			</view> -->
-		</view>
-		<view class="head">
-			<!-- <view class="proname proneed">
-				企业信息
-			</view> -->
-			<!-- <view class="prolist">
-				{{info.companyName}}
-			</view> -->
-			<!-- <view class="prolist">
-				企业名称：{{info.jobCompanyName}}
-			</view> -->
-			<view style="display: flex;align-items: center;">
-				<image src="../../static/img/city.png" style="width: 40rpx;height: 40rpx;margin-right: 20rpx;" mode=""></image>
-				<view style="font-size: 30rpx;">{{info.jobCompanyName}}</view>
-			</view>
-		</view>
-		<view class="head">
-			<view class="proname proneed">
-				地址
-			</view>
-			<!-- <view class="prolist">
-				<view class="protype">
-					联系人：{{info.callName}}
-				</view>
-				<view class="protype">
-					联系方式：{{info.callTel}}
-				</view>
-			</view> -->
-			<!-- <view class="prolist" v-if="info.callNumber">
-				座机号：{{info.callNumber}}
-			</view> -->
-			<view class="prolist">
-				岗位地址：{{info.address}}
-			</view>
-			<map class="map" :latitude="latitude" :longitude="longitude" :markers="covers"></map>
-		</view>
-		<view class="" style="height:200rpx;background-color: #f6f6f6;" v-if="isShow!=='0'"></view>
-		<view class="btn"  v-if="isShow!=='0'&&status===0">
-			<view @click="collect" style="display: flex;align-items: center;margin-right: 10rpx;flex-direction: column;">
-				<image v-if="collectStatus == 0" src="../../static/img/collect.png" style="width: 36rpx;height: 36rpx;" mode=""></image>
-				<image v-if="collectStatus == 1" src="../../static/img/collect_yes.png" style="width: 36rpx;height: 36rpx;" mode=""></image>
-				<view v-if="collectStatus == 0" style="font-size: 26rpx;color:#707070;margin-top:10rpx;">收藏</view>
-				<view v-if="collectStatus == 1" style="font-size: 20rpx;color:#707070;margin-top:10rpx;">已收藏</view>
-			</view>
-			
-			<view @click="callPhone" class="bottombtn flexbtn" style="margin-right: 10rpx;background-color: #FBAD17;border-radius: 45rpx;">
-				电话联系
-			</view>
-			<view @click="submit" class="bottombtn flexbtn" style="border-radius: 45rpx;">
-				申请
-			</view>
-		</view>
-		<view class="btn" v-if="!jobType && isShow!=='0' && status!==0">
-			<!-- <view class="bottombtn lookContract" @click="lookMask">查看合同</view> -->
-			<view @click="collect" style="display: flex;align-items: center;margin-right: 10rpx;flex-direction: column;">
-				<image v-if="collectStatus == 0" src="../../static/img/collect.png" style="width: 36rpx;height: 36rpx;" mode=""></image>
-				<image v-if="collectStatus == 1" src="../../static/img/collect_yes.png" style="width: 36rpx;height: 36rpx;" mode=""></image>
-				<view v-if="collectStatus == 0" style="font-size: 26rpx;color:#707070;margin-top:10rpx;">收藏</view>
-				<view v-if="collectStatus == 1" style="font-size: 20rpx;color:#707070;margin-top:10rpx;">已收藏</view>
-			</view>
-			
-			<view @click="callPhone" class="bottombtn flexbtn" style="margin-right: 10rpx;background-color: #FBAD17;border-radius: 45rpx;">
-				电话联系
-			</view>
-			<view class="bottombtn disabledBtn flexbtn" style="border-radius: 45rpx;">已申请</view>
-		</view>
-		<uniMask :maskShow="maskShow">
-			<view class="contractMask">
-				<!-- #ifdef H5 || APP-PLUS -->
-				<view class="close" @click="close" style="top: 124rpx;">+</view>
-				<!-- #endif -->
-				<!-- #ifdef MP-WEIXIN -->
-				<view class="close" @click="close">+</view>
-				<!-- #endif -->
-				<view style="height: 30px;"></view>
-				<img :src="src" alt="" style="width:100%;height: 1000px;">
-				<view v-if="nextBtn" class="down" @click="next">下一步</view>
-			</view>
-		</uniMask>
-		<u-popup closeable :show="showPopUp" mode="bottom" @close="closePopUp">
-			<view style="height: 200rpx;padding: 20rpx 40rpx;">
-			    <view style="font-size: 28rpx;font-weight: bold;">重要提示：</view>
-				<view style="font-size: 24rpx;color:#707070;margin-top:10rpx;">为保障个人基本劳动权益，建议通过平台用工的形式就业</view>
-				<view style="text-align: center;font-size:28rpx;margin-top: 30rpx;"> {{ info.callName }} : {{ info.callTel }}</view>
-			</view>
-		</u-popup>
-	</view>
-	
-	<view v-else-if="showCode" class="codeSealBox">
-		<!-- #ifdef H5 || APP-PLUS -->
-		<view class="closeCode" @click="closeShowCode" style="top: 124rpx;">+</view>
-		<!-- #endif -->
-		<!-- #ifdef MP-WEIXIN -->
-		<view class="closeCode" @click="closeShowCode">+</view>
-		<!-- #endif -->
-
-		<view class="title">
-			<view class="name">签名密码</view>
-			<view class="tip">6位数字签名密码</view>
-		</view>
-		<view style="height: 36px;"></view>
-		<valid-code ref="validCode" @finish="getInpCode" :maxlength="maxlength"></valid-code>
-		<view style="height: 36px;"></view>
-		<view class="forget" @click="forget">忘记密码？</view>
-	</view>
-</template>
-
-<script>
-	import {mapGetters} from 'vuex'
-	import {missionDetail,submit, getCollectState, updateCollectStatus, workDetail} from '@/api/mission.js';
-	import {GoLogin} from '@/untils/AxiosUtils.js';
-	import {setRead} from '@/api/news.js';
-	import {checkPass} from '@/api/auth.js';
-	import dictionary from '@/common/textdata.js';
-	import {dateFormat} from "../../untils/format.js";
-    import {userrecruitDetail} from '@/api/userrecruit.js'
-	import uniMask from '@/components/uni-mask/mask.vue'
-	import validCode from '@/components/p-valid-code/p-valid-code.vue'
-    import {getuserrecruitDetailApp} from '@/api/userrecruit.js'
-	export default {
-		data() {
-			return {
-				...dictionary,
-				info: {},
-				status: null,
-				showDetail: false,
-				showCode: false,
-				maskShow: false,
-				nextBtn: false,
-				loading: false,
-				latitude: 39.909, //中心点
-				longitude: 116.39742,
-				covers: [{ //marker标记位置
-					id: 0,
-					latitude: 0,
-					longitude: 0,
-					// width:30,
-					// height:30,
-					iconPath: '../../static/img/location.png'
-				}],
-				missionNo: "",
-				isShow: '',
-				type: '',
-				id: '',
-				src: 'https://jlfiles.oss-cn-zhangjiakou.aliyuncs.com/jobslink-api/doc/%E7%94%B5%E5%AD%90%E5%90%88%E5%90%8C%E9%A2%84%E8%A7%88%E5%9B%BE%E7%89%87.png',
-				maxlength: 6,
-				collectStatus: 0, // 收藏状态
-				showPopUp: false,
-                jobType: null
-			}
-		},
-		components: {uniMask,validCode},
-		onLoad: function(option) { //option为object类型，会序列化上个页面传递的参数
-			// this.$store.dispatch('setAutograph')
-			if (option.workId) {
-				this.workId = decodeURIComponent(option.workId);
-			}
-			if (option.isCan) {
-				this.isShow = option.isCan; //isShow为'0'则为我的任务、我的评价过来的，需要隐藏抢任务按钮
-			}
-			if (option.type) {
-				this.type = option.type; //type为1则为消息邀请过来的,需要设置消息已读;
-			}
-			if (option.id) {
-				this.id = option.id; //消息id
-			}
-            if(option.jobType) {
-                this.jobType = option.jobType
-            }
-		},
-		onShow: function() {
-			this.showDetail = true
-			this.getData();
-			
-		},
-		onShareAppMessage(obj) {
-			return {
-				title: this.info.missionTitle,
-				path: `/pages/projectInfo/projectInfo?missionNo=${this.info.missionNo}`
-			}
-		},
-		methods: {
-			dateFormat,
-			collect() {
-				// console.log('收藏，取消收藏')
-				const status = this.collectStatus == 0 ? 1 : 0;
-				updateCollectStatus(this.info.id, status, 2).then(res => {
-					if(res.data.code == 200) {
-						this.getCollectStatus()
-					}
-				})
-			},
-			callPhone() {
-				this.showPopUp = true;
-			},
-			closePopUp() {
-				this.showPopUp = false;
-			},
-			// 获取收藏状态
-			getCollectStatus() {
-				getCollectState(this.info.id, 2).then(res => {
-					// 0 未收藏，1 已收藏
-					// console.log(res)
-					this.collectStatus = res.data.data;
-				})
-			},
-		 	async getData() {
-				const self = this;
-				let resData = null
-                if(this.jobType) {
-                    resData = await getuserrecruitDetailApp({id: this.id, jobType: this.jobType})
-                } else {
-                    resData = await userrecruitDetail(self.workId)
-                }
-                if(resData.data?.code === 200) {
-                    self.info = resData.data.data;
-                    self.status = resData.data.data.status;
-                    self.missionNo = resData.data.data.missionNo;
-                    self.latitude = self.info.lat;
-                    self.longitude = self.info.lon;
-                    self.covers[0].latitude = self.info.lat;
-                    self.covers[0].longitude = self.info.lon;
-                    self.showDetail = true;
-                    if(!this.seeDeatil) {
-                        self.getCollectStatus();
-                          if (self.type === 1) {
-                            // 设置已读
-                            setRead(self.id).then(res => {
-                                self.$store.commit("SET_READ");
-                            })
-                          }
-                    }
-                }
-			},
-			submit: function() {
-				if (!this.$store.state.user.token) {
-					GoLogin()
-					return
-				}
-				if(this.loading) return
-				const auth = this.auth
-				const contractOn = this.info.contractOn
-				const sealOk = this.autograph && this.autograph.data && this.autograph.data.signSrcUrl
-				// if (sealOk) {
-				// 	console.log('直接抢任务')
-				// 	this.submitTask()
-				// } else
-				// if (!auth.realNameState || !auth.laborState || !auth.insureState) {
-				// 	this.goSign(0)
-				// } else if (!auth.bankCardState){
-				// 	this.goSign(1)
-				// } else
-				if (contractOn && !sealOk) {
-					this.goSign(2)
-				} else if (sealOk && contractOn){
-					this.nextBtn = true
-					this.lookMask()
-				} else {
-					this.submitTask()
-				}
-			},
-			// 查看合同
-			lookMask(){
-				this.maskShow = true
-			},
-			// 岗位申请
-			submitTask(){
-				submit(this.missionNo,2).then(res => {
-					uni.hideLoading()
-					uni.showToast({
-						title: '操作成功',
-						icon: 'none'
-					});
-					this.status = null;
-					this.loading = false
-				}, error => {
-					this.loading = false
-				});
-			},
-			// 步骤
-			goSign(active){
-				uni.navigateTo({
-					url: `/pages/projectInfo/signContract?active=${active}`
-				})
-			},
-			// 关闭弹窗
-			close(){
-				this.maskShow = false
-			},
-			// 合同下一步
-			next(){
-				this.maskShow = false
-				this.showDetail = false
-				this.showCode = true
-			},
-			// 输入签名密码
-			getInpCode(password){
-				uni.showLoading({
-					title:"请求中..."
-				})
-				this.loading = true
-				var obj = {
-					pass: password
-				}
-				checkPass(obj).then(res => {
-					this.submitTask()
-					this.closeShowCode()
-				}).catch(err => {
-					this.loading = false
-				})
-			},
-			// 关闭签名密码弹窗
-			closeShowCode(){
-				this.showCode = false
-				this.showDetail = true
-			},
-			// 忘记密码
-			forget(){
-				uni.navigateTo({
-					url: `/pageMy/setUserBase/seal/forget?forget=true`
-				})
-			}
-		},
-		computed: {
-			...mapGetters(['auth', 'autograph']),
-			skillNames() {
-				if (this.info.skillNames) {
-					return this.info.skillNames.split(',')
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.codeSealBox{
-		padding: 285rpx 72rpx 0 72rpx;
-		.closeCode{
-			position: absolute;
-			right: 36rpx;
-			top: 120rpx;
-			color: #1B66FF;
-			transform: rotate(45deg);
-			font-size: 40px;
-		}
-		.title{
-			display: flex;
-			align-items: center;
-		}
-		.name{
-			height: 46rpx;
-			font-size: 46rpx;
-			font-family: PingFangSC-Medium, PingFang SC;
-			font-weight: 500;
-			color: #333333;
-			line-height: 46rpx;
-			margin-right: 28rpx;
-		}
-		.tip{
-			height: 38rpx;
-			font-size: 28rpx;
-			font-family: PingFangSC-Regular, PingFang SC;
-			font-weight: 400;
-			color: #999999;
-			line-height: 38rpx;
-		}
-		.forget{
-			height: 38rpx;
-			font-size: 28rpx;
-			font-family: PingFangSC-Regular, PingFang SC;
-			font-weight: 400;
-			color: #5AA0FA;
-			line-height: 38rpx;
-			text-align: right;
-		}
-
-	}
-	.contractMask{
-		background-color: #FFFFFF;
-		margin: 30rpx;
-		position: relative;
-		border-radius: 4px;
-		height: 96%;
-		overflow: auto;
-		.close{
-			width: 23px;
-			height: 23px;
-			color: #1B66FF;
-			position: fixed;
-			right: 60rpx;
-			top: 60rpx;
-			transform: rotate(45deg);
-			font-size: 40px;
-		}
-		.down{
-			position:fixed;
-			bottom: 30px;
-			left:14%;
-			width: 545rpx;
-			height: 90rpx;
-			line-height: 90rpx;
-			text-align: center;
-			background: #1B66FF;
-			font-size: 36rpx;
-			font-weight: 400;
-			color: #FFFFFF;
-		}
-	}
-	.lookContract{
-		width: 30%;
-		margin-right: 30rpx;
-	}
-	.flexbtn{
-		flex:1;
-	}
-	.bottombtn {
-		background-color: #1B66FF;
-		color: #fff;
-		text-align: center;
-		border-radius: 10rpx;
-		font-family: PingFangSC-Medium;
-		font-size: 32rpx;
-		height: 90rpx;
-		line-height: 90rpx;
-	}
-
-	.btn {
-		background-color: #fefefe;
-		width: 690rpx;
-		padding: 30rpx;
-		padding-bottom: 80rpx;
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		display:flex;
-	}
-
-	.disabledBtn {
-		background-color: #c8c9cc;
-	}
-
-	.map {
-		width: 100%;
-		height: 350rpx;
-		margin-top: 30rpx;
-	}
-
-	.askList {
-		font-family: PingFangSC-Regular;
-		font-size: 24rpx;
-		color: #666666;
-		background-color: #f6f6f6;
-		padding: 5rpx 15rpx;
-		margin-right: 10rpx;
-		margin-top: 15rpx;
-	}
-
-	.ask {
-		overflow: hidden;
-		width: 100%;
-		display: flex;
-		align-items: center;
-		flex-wrap: wrap;
-		justify-content: flex-start;
-		margin: 20rpx 0;
-
-	}
-
-	.proint {
-		margin-top: 30rpx;
-		font-size: 30rpx !important;
-	}
-
-	.proneed {
-		font-size: 32rpx !important;
-
-	}
-
-	.fee {
-		font-family: PingFangSC-Medium;
-		font-size: 32rpx;
-		color: #F46161;
-		margin-top: 30rpx;
-	}
-
-	.protype {
-		width: 50%;
-	}
-
-	.prolist {
-		font-family: PingFangSC-Regular;
-		font-size: 28rpx;
-		color: #666666;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		text-align: left;
-		padding: 5rpx 0;
-	}
-
-	.proname {
-		font-weight: bold;
-		font-family: PingFangSC-Medium;
-		font-size: 40rpx;
-		color: #333333;
-		width: 90%;
-		overflow: hidden;
-		padding-bottom: 20rpx;
-	}
-
-	.head {
-		padding: 30rpx;
-		background: #fefefe;
-		border-bottom: 20rpx solid #f6f6f6;
-	}
-
-	.description {
-		word-break: break-all;
-		white-space: pre-line;
-	}
-</style>
+<template>
+    <view v-if="showDetail">
+        <view class="head">
+            <view class="proname">
+                {{info.missionTitle || '暂无'}}
+            </view>
+            <!-- <view class="prolist">
+				任务编码：{{info.missionNo}}
+			</view> -->
+            <view class="prolist">
+                <!-- 开始时间：{{dateFormat((info.stime))}}至{{dateFormat((info.etime))}} -->
+                开始时间：{{dateFormat((info.stime)) || '暂无'}}
+            </view>
+            <!-- <view class="prolist">
+				报名截止：{{dateFormat((info.etimePub))}}
+			</view> -->
+            <view class="prolist">
+                招聘人数：{{info.peopleNum || '暂无'}}
+            </view>
+            <view class="prolist">
+                行业类型：{{info.tradeNames || '暂无'}}
+            </view>
+            <view class="prolist">
+                零工工种：{{info.worktypeNames || '暂无'}}
+            </view>
+            <!-- <view class="fee">
+		        {{info.wage || '暂无'}}
+		    </view> -->
+        </view>
+        <view class="head">
+            <view class="proname proneed">
+                任务要求
+            </view>
+            <view class="prolist">
+                <view class="protype">
+                    年龄要求：{{age[info.ageDesc] || '暂无'}}
+                </view>
+            </view>
+            <view class="prolist">
+                <view class="protype">
+                    学历要求：{{education[info.education] || '暂无'}}
+                </view>
+            </view>
+            <view class="prolist">
+                <view class="protype">
+                    经验要求：{{experience[info.experienceDesc] || '暂无'}}
+                </view>
+            </view>
+            <view class="prolist proint" style="font-weight: bold;color:#333;">
+                任务描述
+            </view>
+            <view class="prolist description">
+                {{info.missionDesc || '暂无'}}
+            </view>
+            <!-- 技能标签 start -->
+            <view class="ask">
+                <view class="askList" v-for="(item,index) in skillNames" :key="index">
+                    {{item}}
+                </view>
+            </view>
+            <!-- 技能标签 end -->
+            <view v-if="info.jobSources" class="prolist">
+                来源：{{info.jobSources || '暂无'}}
+            </view>
+        </view>
+        <view class="head">
+            <view style="display: flex;align-items: center;">
+                <image src="../../static/img/city.png" style="width: 40rpx;height: 40rpx;margin-right: 20rpx;" mode="">
+                </image>
+                <view style="font-size: 30rpx;">{{info.jobCompanyName || '暂无'}}</view>
+            </view>
+            <!-- <view class="proname proneed">
+		        企业信息
+		    </view>
+		    <view class="prolist">
+		        {{info.companyName}}
+		    </view> -->
+        </view>
+        <view class="head">
+            <view class="proname proneed">
+                地址
+            </view>
+            <!-- <view class="prolist">
+				<view class="protype">
+					联系人：{{info.callName}}
+				</view>
+				<view class="protype">
+					联系方式：{{info.callTel}}
+				</view>
+			</view>
+			<view class="prolist" v-if="info.callNumber">
+				座机号：{{info.callNumber}}
+			</view> -->
+            <!--           <view class="prolist">
+		        公司地址：{{info.companyAddress || '暂无'}}
+		    </view> -->
+            <view class="prolist">
+                工作地址：{{cityNamed || '暂无'}}
+            </view>
+            <view class="prolist">
+                详细地址：{{info.address || '暂无'}}
+            </view>
+            <map class="map" :latitude="latitude" :longitude="longitude" :markers="covers"></map>
+        </view>
+        <view class="" style="height:200rpx;background-color: #f6f6f6;" v-if="isShow!=='0'"></view>
+        <view class="btn" v-if="isShow!=='0'&&status===0">
+            <view @click="collect"
+                style="display: flex;align-items: center;margin-right: 10rpx;flex-direction: column;">
+                <image v-if="collectStatus == 0" src="../../static/img/collect.png" style="width: 36rpx;height: 36rpx;"
+                    mode=""></image>
+                <image v-if="collectStatus == 1" src="../../static/img/collect_yes.png"
+                    style="width: 36rpx;height: 36rpx;" mode=""></image>
+                <view v-if="collectStatus == 0" style="font-size: 26rpx;color:#707070;margin-top:10rpx;">收藏</view>
+                <view v-if="collectStatus == 1" style="font-size: 20rpx;color:#707070;margin-top:10rpx;">已收藏</view>
+            </view>
+
+            <view @click="callPhone" class="bottombtn flexbtn"
+                style="margin-right: 10rpx;background-color: #FBAD17;border-radius: 45rpx;">
+                电话联系
+            </view>
+            <view @click="submit" class="bottombtn flexbtn" style="border-radius: 45rpx;">
+                申请
+            </view>
+        </view>
+        <view class="btn" v-if="!jobType && isShow!=='0' && status!==0">
+            <!-- <view class="bottombtn lookContract" @click="lookMask">查看合同</view> -->
+            <view @click="collect"
+                style="display: flex;align-items: center;margin-right: 10rpx;flex-direction: column;">
+                <image v-if="collectStatus == 0" src="../../static/img/collect.png" style="width: 36rpx;height: 36rpx;"
+                    mode=""></image>
+                <image v-if="collectStatus == 1" src="../../static/img/collect_yes.png"
+                    style="width: 36rpx;height: 36rpx;" mode=""></image>
+                <view v-if="collectStatus == 0" style="font-size: 26rpx;color:#707070;margin-top:10rpx;">收藏</view>
+                <view v-if="collectStatus == 1" style="font-size: 20rpx;color:#707070;margin-top:10rpx;">已收藏</view>
+            </view>
+
+            <view @click="callPhone" class="bottombtn flexbtn"
+                style="margin-right: 10rpx;background-color: #FBAD17;border-radius: 45rpx;">
+                电话联系
+            </view>
+            <view class="bottombtn disabledBtn flexbtn" style="border-radius: 45rpx;">已申请</view>
+        </view>
+        <uniMask :maskShow="maskShow">
+            <view class="contractMask">
+                <!-- #ifdef H5 || APP-PLUS -->
+                <view class="close" @click="close" style="top: 124rpx;">+</view>
+                <!-- #endif -->
+                <!-- #ifdef MP-WEIXIN -->
+                <view class="close" @click="close">+</view>
+                <!-- #endif -->
+                <view style="height: 30px;"></view>
+                <img :src="src" alt="" style="width:100%;height: 1000px;">
+                <view v-if="nextBtn" class="down" @click="next">下一步</view>
+            </view>
+        </uniMask>
+        <u-popup closeable :show="showPopUp" mode="bottom" @close="closePopUp">
+            <view style="height: 200rpx;padding: 20rpx 40rpx;">
+                <view style="font-size: 28rpx;font-weight: bold;">重要提示：</view>
+                <view style="font-size: 24rpx;color:#707070;margin-top:10rpx;">为保障个人基本劳动权益，建议通过平台用工的形式就业</view>
+                <view style="text-align: center;font-size:28rpx;margin-top: 30rpx;"> {{ info.callName }} :
+                    {{ info.callTel }}
+                </view>
+            </view>
+        </u-popup>
+    </view>
+
+    <view v-else-if="showCode" class="codeSealBox">
+        <!-- #ifdef H5 || APP-PLUS -->
+        <view class="closeCode" @click="closeShowCode" style="top: 124rpx;">+</view>
+        <!-- #endif -->
+        <!-- #ifdef MP-WEIXIN -->
+        <view class="closeCode" @click="closeShowCode">+</view>
+        <!-- #endif -->
+
+        <view class="title">
+            <view class="name">签名密码</view>
+            <view class="tip">6位数字签名密码</view>
+        </view>
+        <view style="height: 36px;"></view>
+        <valid-code ref="validCode" @finish="getInpCode" :maxlength="maxlength"></valid-code>
+        <view style="height: 36px;"></view>
+        <view class="forget" @click="forget">忘记密码？</view>
+    </view>
+</template>
+
+<script>
+    import {
+        mapGetters
+    } from 'vuex'
+    import {
+        missionDetail,
+        submit,
+        getCollectState,
+        updateCollectStatus,
+        workDetail
+    } from '@/api/mission.js';
+    import {
+        GoLogin
+    } from '@/untils/AxiosUtils.js';
+    import {
+        setRead
+    } from '@/api/news.js';
+    import {
+        checkPass
+    } from '@/api/auth.js';
+    import dictionary from '@/common/textdata.js';
+    import {
+        dateFormat
+    } from "../../untils/format.js";
+    import {
+        userrecruitDetail
+    } from '@/api/userrecruit.js'
+    import uniMask from '@/components/uni-mask/mask.vue'
+    import validCode from '@/components/p-valid-code/p-valid-code.vue'
+    import {
+        getuserrecruitDetailApp
+    } from '@/api/userrecruit.js'
+    export default {
+        data() {
+            return {
+                ...dictionary,
+                info: {},
+                status: null,
+                showDetail: false,
+                showCode: false,
+                maskShow: false,
+                nextBtn: false,
+                loading: false,
+                latitude: 39.909, //中心点
+                longitude: 116.39742,
+                covers: [{ //marker标记位置
+                    id: 0,
+                    latitude: 0,
+                    longitude: 0,
+                    // width:30,
+                    // height:30,
+                    iconPath: '../../static/img/location.png'
+                }],
+                missionNo: "",
+                isShow: '',
+                type: '',
+                id: '',
+                src: 'https://jlfiles.oss-cn-zhangjiakou.aliyuncs.com/jobslink-api/doc/%E7%94%B5%E5%AD%90%E5%90%88%E5%90%8C%E9%A2%84%E8%A7%88%E5%9B%BE%E7%89%87.png',
+                maxlength: 6,
+                collectStatus: 0, // 收藏状态
+                showPopUp: false,
+                jobType: null
+            }
+        },
+        components: {
+            uniMask,
+            validCode
+        },
+        onLoad: function(option) { //option为object类型，会序列化上个页面传递的参数
+            // this.$store.dispatch('setAutograph')
+            if (option.workId) {
+                this.workId = decodeURIComponent(option.workId);
+            }
+            if (option.isCan) {
+                this.isShow = option.isCan; //isShow为'0'则为我的任务、我的评价过来的，需要隐藏抢任务按钮
+            }
+            if (option.type) {
+                this.type = option.type; //type为1则为消息邀请过来的,需要设置消息已读;
+            }
+            if (option.id) {
+                this.id = option.id; //消息id
+            }
+            if (option.jobType) {
+                this.jobType = option.jobType
+            }
+        },
+        onShow: function() {
+            this.showDetail = true
+            this.getData();
+
+        },
+        onShareAppMessage(obj) {
+            return {
+                title: this.info.missionTitle,
+                path: `/pages/projectInfo/projectInfo?missionNo=${this.info.missionNo}`
+            }
+        },
+        methods: {
+            dateFormat,
+            collect() {
+                // console.log('收藏，取消收藏')
+                const status = this.collectStatus == 0 ? 1 : 0;
+                updateCollectStatus(this.info.id, status, 2).then(res => {
+                    if (res.data.code == 200) {
+                        this.getCollectStatus()
+                    }
+                })
+            },
+            callPhone() {
+                this.showPopUp = true;
+            },
+            closePopUp() {
+                this.showPopUp = false;
+            },
+            // 获取收藏状态
+            getCollectStatus() {
+                getCollectState(this.info.id, 2).then(res => {
+                    // 0 未收藏，1 已收藏
+                    // console.log(res)
+                    this.collectStatus = res.data.data;
+                })
+            },
+            async getData() {
+                const self = this;
+                let resData = null
+                if (this.jobType) {
+                    resData = await getuserrecruitDetailApp({
+                        id: this.id,
+                        jobType: this.jobType
+                    })
+                } else {
+                    resData = await userrecruitDetail(self.workId)
+                }
+                if (resData.data?.code === 200) {
+                    self.info = resData.data.data;
+                    self.status = resData.data.data.status;
+                    self.missionNo = resData.data.data.missionNo;
+                    self.latitude = self.info.lat;
+                    self.longitude = self.info.lon;
+                    self.covers[0].latitude = self.info.lat;
+                    self.covers[0].longitude = self.info.lon;
+                    self.showDetail = true;
+                    if (!this.seeDeatil) {
+                        self.getCollectStatus();
+                        if (self.type === 1) {
+                            // 设置已读
+                            setRead(self.id).then(res => {
+                                self.$store.commit("SET_READ");
+                            })
+                        }
+                    }
+                }
+            },
+            submit: function() {
+                if (!this.$store.state.user.token) {
+                    GoLogin()
+                    return
+                }
+                if (this.loading) return
+                const auth = this.auth
+                const contractOn = this.info.contractOn
+                const sealOk = this.autograph && this.autograph.data && this.autograph.data.signSrcUrl
+                // if (sealOk) {
+                // 	console.log('直接抢任务')
+                // 	this.submitTask()
+                // } else
+                // if (!auth.realNameState || !auth.laborState || !auth.insureState) {
+                // 	this.goSign(0)
+                // } else if (!auth.bankCardState){
+                // 	this.goSign(1)
+                // } else
+                if (contractOn && !sealOk) {
+                    this.goSign(2)
+                } else if (sealOk && contractOn) {
+                    this.nextBtn = true
+                    this.lookMask()
+                } else {
+                    this.submitTask()
+                }
+            },
+            // 查看合同
+            lookMask() {
+                this.maskShow = true
+            },
+            // 岗位申请
+            submitTask() {
+                submit(this.missionNo, 2).then(res => {
+                    uni.hideLoading()
+                    uni.showToast({
+                        title: '操作成功',
+                        icon: 'none'
+                    });
+                    this.status = null;
+                    this.loading = false
+                }, error => {
+                    this.loading = false
+                });
+            },
+            // 步骤
+            goSign(active) {
+                uni.navigateTo({
+                    url: `/pages/projectInfo/signContract?active=${active}`
+                })
+            },
+            // 关闭弹窗
+            close() {
+                this.maskShow = false
+            },
+            // 合同下一步
+            next() {
+                this.maskShow = false
+                this.showDetail = false
+                this.showCode = true
+            },
+            // 输入签名密码
+            getInpCode(password) {
+                uni.showLoading({
+                    title: "请求中..."
+                })
+                this.loading = true
+                var obj = {
+                    pass: password
+                }
+                checkPass(obj).then(res => {
+                    this.submitTask()
+                    this.closeShowCode()
+                }).catch(err => {
+                    this.loading = false
+                })
+            },
+            // 关闭签名密码弹窗
+            closeShowCode() {
+                this.showCode = false
+                this.showDetail = true
+            },
+            // 忘记密码
+            forget() {
+                uni.navigateTo({
+                    url: `/pageMy/setUserBase/seal/forget?forget=true`
+                })
+            }
+        },
+        computed: {
+            ...mapGetters(['auth', 'autograph']),
+            skillNames() {
+                if (this.info.skillNames) {
+                    return this.info.skillNames.split(',')
+                }
+            }
+        }
+    }
+</script>
+
+<style lang="scss">
+    .codeSealBox {
+        padding: 285rpx 72rpx 0 72rpx;
+
+        .closeCode {
+            position: absolute;
+            right: 36rpx;
+            top: 120rpx;
+            color: #1B66FF;
+            transform: rotate(45deg);
+            font-size: 40px;
+        }
+
+        .title {
+            display: flex;
+            align-items: center;
+        }
+
+        .name {
+            height: 46rpx;
+            font-size: 46rpx;
+            font-family: PingFangSC-Medium, PingFang SC;
+            font-weight: 500;
+            color: #333333;
+            line-height: 46rpx;
+            margin-right: 28rpx;
+        }
+
+        .tip {
+            height: 38rpx;
+            font-size: 28rpx;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: 400;
+            color: #999999;
+            line-height: 38rpx;
+        }
+
+        .forget {
+            height: 38rpx;
+            font-size: 28rpx;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: 400;
+            color: #5AA0FA;
+            line-height: 38rpx;
+            text-align: right;
+        }
+
+    }
+
+    .contractMask {
+        background-color: #FFFFFF;
+        margin: 30rpx;
+        position: relative;
+        border-radius: 4px;
+        height: 96%;
+        overflow: auto;
+
+        .close {
+            width: 23px;
+            height: 23px;
+            color: #1B66FF;
+            position: fixed;
+            right: 60rpx;
+            top: 60rpx;
+            transform: rotate(45deg);
+            font-size: 40px;
+        }
+
+        .down {
+            position: fixed;
+            bottom: 30px;
+            left: 14%;
+            width: 545rpx;
+            height: 90rpx;
+            line-height: 90rpx;
+            text-align: center;
+            background: #1B66FF;
+            font-size: 36rpx;
+            font-weight: 400;
+            color: #FFFFFF;
+        }
+    }
+
+    .lookContract {
+        width: 30%;
+        margin-right: 30rpx;
+    }
+
+    .flexbtn {
+        flex: 1;
+    }
+
+    .bottombtn {
+        background-color: #1B66FF;
+        color: #fff;
+        text-align: center;
+        border-radius: 10rpx;
+        font-family: PingFangSC-Medium;
+        font-size: 32rpx;
+        height: 90rpx;
+        line-height: 90rpx;
+    }
+
+    .btn {
+        background-color: #fefefe;
+        width: 690rpx;
+        padding: 30rpx;
+        padding-bottom: 80rpx;
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        display: flex;
+    }
+
+    .disabledBtn {
+        background-color: #c8c9cc;
+    }
+
+    .map {
+        width: 100%;
+        height: 350rpx;
+        margin-top: 30rpx;
+    }
+
+    .askList {
+        font-family: PingFangSC-Regular;
+        font-size: 24rpx;
+        color: #666666;
+        background-color: #f6f6f6;
+        padding: 5rpx 15rpx;
+        margin-right: 10rpx;
+        margin-top: 15rpx;
+    }
+
+    .ask {
+        overflow: hidden;
+        width: 100%;
+        display: flex;
+        align-items: center;
+        flex-wrap: wrap;
+        justify-content: flex-start;
+        margin: 20rpx 0;
+
+    }
+
+    .proint {
+        margin-top: 30rpx;
+        font-size: 30rpx !important;
+    }
+
+    .proneed {
+        font-size: 32rpx !important;
+
+    }
+
+    .fee {
+        font-family: PingFangSC-Medium;
+        font-size: 32rpx;
+        color: #F46161;
+        margin-top: 30rpx;
+    }
+
+    .protype {
+        width: 50%;
+    }
+
+    .prolist {
+        font-family: PingFangSC-Regular;
+        font-size: 28rpx;
+        color: #666666;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        text-align: left;
+        padding: 5rpx 0;
+    }
+
+    .proname {
+        font-weight: bold;
+        font-family: PingFangSC-Medium;
+        font-size: 40rpx;
+        color: #333333;
+        width: 90%;
+        overflow: hidden;
+        padding-bottom: 20rpx;
+    }
+
+    .head {
+        padding: 30rpx;
+        background: #fefefe;
+        border-bottom: 20rpx solid #f6f6f6;
+    }
+
+    .description {
+        word-break: break-all;
+        white-space: pre-line;
+    }
+</style>
\ No newline at end of file
diff --git a/pages/projectInfo/userrecruitWorkInfo.vue b/pages/projectInfo/userrecruitWorkInfo.vue
new file mode 100644
index 0000000..786c06b
--- /dev/null
+++ b/pages/projectInfo/userrecruitWorkInfo.vue
@@ -0,0 +1,649 @@
+<template>
+    <view v-if="showDetail">
+        <view class="head">
+            <view class="proname">
+                {{info.jobName || '暂无'}}
+            </view>
+            <!-- <view class="prolist">
+        		任务编码：{{info.missionNo}}
+        	</view> -->
+            <view class="prolist">
+                发布日期：{{dateFormat((info.stime)) || '暂无'}}
+            </view>
+            <view class="prolist">
+                招聘人数：{{info.peopleNum || '暂无'}}
+            </view>
+            <view class="prolist">
+                行业类型：{{info.tradeNames?info.tradeNames:info.jobCompanyIndustry || '暂无'}}
+            </view>
+            <view class="prolist">
+                岗位工种：{{info.skillNames || '暂无'}}
+            </view>
+            <!-- <view class="fee">
+        		{{info.wage}}{{wageUnit[info.wageUnitCategory]}}
+        	</view> -->
+        </view>
+        <view class="head">
+            <view class="proname proneed">
+                岗位要求
+            </view>
+            <!-- <view class="prolist">
+        		<view class="protype">
+        			年龄要求：{{age[info.ageDesc]}}
+        		</view>
+        	</view> -->
+            <view class="prolist">
+                <view class="protype">
+                    年龄要求：{{age[info.ageDesc] || '暂无'}}
+                </view>
+            </view>
+            <view class="prolist">
+                <view class="protype">
+                    学历要求：{{education[info.education] || '暂无'}}
+                </view>
+            </view>
+            <view class="prolist">
+                <view class="protype">
+                    经验要求：{{info.experienceDesc || '暂无'}}
+                </view>
+            </view>
+
+            <!--   <view class="prolist">
+                岗位地址：{{info.jobAddress}}
+            </view> -->
+            <view class="prolist proint" style="font-weight: bold;color:#333;">
+                岗位描述
+            </view>
+            <view class="prolist description">
+                {{info.jobDescription}}
+            </view>
+            <!-- 技能标签 start -->
+            <view class="ask">
+                <view class="askList" v-for="(item,index) in skillNames" :key="index">
+                    {{item}}
+                </view>
+            </view>
+            <!-- 技能标签 end -->
+            <view v-if="info.jobSources" class="prolist">
+                来源：{{info.jobSources || '暂无'}}
+            </view>
+        </view>
+        <view class="head">
+            <!-- <view class="proname proneed">
+        		企业信息
+        	</view> -->
+            <!-- <view class="prolist">
+        		{{info.companyName}}
+        	</view> -->
+            <!-- <view class="prolist">
+        		企业名称：{{info.jobCompanyName}}
+        	</view> -->
+            <view style="display: flex;align-items: center;">
+                <image src="../../static/img/city.png" style="width: 40rpx;height: 40rpx;margin-right: 20rpx;" mode="">
+                </image>
+                <view style="font-size: 30rpx;">{{info.jobCompanyName}}</view>
+            </view>
+        </view>
+        <view class="head">
+            <view class="proname proneed">
+                地址
+            </view>
+            <!-- <view class="prolist">
+        		<view class="protype">
+        			联系人：{{info.callName}}
+        		</view>
+        		<view class="protype">
+        			联系方式：{{info.callTel}}
+        		</view>
+        	</view> -->
+            <!-- <view class="prolist" v-if="info.callNumber">
+        		座机号：{{info.callNumber}}
+        	</view> -->
+            <view class="prolist">
+                工作地址：{{`${info.province}${info.city}${info.county}` || '暂无'}}
+            </view>
+            <view class="prolist">
+                详细地址：{{info.address || '暂无'}}
+            </view>
+            <map class="map" :latitude="latitude" :longitude="longitude" :markers="covers"></map>
+        </view>
+        <view class="" style="height:200rpx;background-color: #f6f6f6;" v-if="isShow!=='0'"></view>
+        <view class="btn" v-if="isShow!=='0'&&status===0">
+            <view @click="collect"
+                style="display: flex;align-items: center;margin-right: 10rpx;flex-direction: column;">
+                <image v-if="collectStatus == 0" src="../../static/img/collect.png" style="width: 36rpx;height: 36rpx;"
+                    mode=""></image>
+                <image v-if="collectStatus == 1" src="../../static/img/collect_yes.png"
+                    style="width: 36rpx;height: 36rpx;" mode=""></image>
+                <view v-if="collectStatus == 0" style="font-size: 26rpx;color:#707070;margin-top:10rpx;">收藏</view>
+                <view v-if="collectStatus == 1" style="font-size: 20rpx;color:#707070;margin-top:10rpx;">已收藏</view>
+            </view>
+
+            <view @click="callPhone" class="bottombtn flexbtn"
+                style="margin-right: 10rpx;background-color: #FBAD17;border-radius: 45rpx;">
+                电话联系
+            </view>
+            <view @click="submit" class="bottombtn flexbtn" style="border-radius: 45rpx;">
+                申请
+            </view>
+        </view>
+        <view class="btn" v-if="!jobType && isShow!=='0' && status!==0">
+            <!-- <view class="bottombtn lookContract" @click="lookMask">查看合同</view> -->
+            <view @click="collect"
+                style="display: flex;align-items: center;margin-right: 10rpx;flex-direction: column;">
+                <image v-if="collectStatus == 0" src="../../static/img/collect.png" style="width: 36rpx;height: 36rpx;"
+                    mode=""></image>
+                <image v-if="collectStatus == 1" src="../../static/img/collect_yes.png"
+                    style="width: 36rpx;height: 36rpx;" mode=""></image>
+                <view v-if="collectStatus == 0" style="font-size: 26rpx;color:#707070;margin-top:10rpx;">收藏</view>
+                <view v-if="collectStatus == 1" style="font-size: 20rpx;color:#707070;margin-top:10rpx;">已收藏</view>
+            </view>
+
+            <view @click="callPhone" class="bottombtn flexbtn"
+                style="margin-right: 10rpx;background-color: #FBAD17;border-radius: 45rpx;">
+                电话联系
+            </view>
+            <view class="bottombtn disabledBtn flexbtn" style="border-radius: 45rpx;">已申请</view>
+        </view>
+        <uniMask :maskShow="maskShow">
+            <view class="contractMask">
+                <!-- #ifdef H5 || APP-PLUS -->
+                <view class="close" @click="close" style="top: 124rpx;">+</view>
+                <!-- #endif -->
+                <!-- #ifdef MP-WEIXIN -->
+                <view class="close" @click="close">+</view>
+                <!-- #endif -->
+                <view style="height: 30px;"></view>
+                <img :src="src" alt="" style="width:100%;height: 1000px;">
+                <view v-if="nextBtn" class="down" @click="next">下一步</view>
+            </view>
+        </uniMask>
+        <u-popup closeable :show="showPopUp" mode="bottom" @close="closePopUp">
+            <view style="height: 200rpx;padding: 20rpx 40rpx;">
+                <view style="font-size: 28rpx;font-weight: bold;">重要提示：</view>
+                <view style="font-size: 24rpx;color:#707070;margin-top:10rpx;">为保障个人基本劳动权益，建议通过平台用工的形式就业</view>
+                <view style="text-align: center;font-size:28rpx;margin-top: 30rpx;"> {{ info.callName }} :
+                    {{ info.callTel }}
+                </view>
+            </view>
+        </u-popup>
+    </view>
+
+    <view v-else-if="showCode" class="codeSealBox">
+        <!-- #ifdef H5 || APP-PLUS -->
+        <view class="closeCode" @click="closeShowCode" style="top: 124rpx;">+</view>
+        <!-- #endif -->
+        <!-- #ifdef MP-WEIXIN -->
+        <view class="closeCode" @click="closeShowCode">+</view>
+        <!-- #endif -->
+
+        <view class="title">
+            <view class="name">签名密码</view>
+            <view class="tip">6位数字签名密码</view>
+        </view>
+        <view style="height: 36px;"></view>
+        <valid-code ref="validCode" @finish="getInpCode" :maxlength="maxlength"></valid-code>
+        <view style="height: 36px;"></view>
+        <view class="forget" @click="forget">忘记密码？</view>
+    </view>
+</template>
+
+<script>
+    import {
+        mapGetters
+    } from 'vuex'
+    import {
+        missionDetail,
+        submit,
+        getCollectState,
+        updateCollectStatus,
+        workDetail
+    } from '@/api/mission.js';
+    import {
+        GoLogin
+    } from '@/untils/AxiosUtils.js';
+    import {
+        setRead
+    } from '@/api/news.js';
+    import {
+        checkPass
+    } from '@/api/auth.js';
+    import dictionary from '@/common/textdata.js';
+    import {
+        dateFormat
+    } from "../../untils/format.js";
+    import {
+        userrecruitDetail
+    } from '@/api/userrecruit.js'
+    import uniMask from '@/components/uni-mask/mask.vue'
+    import validCode from '@/components/p-valid-code/p-valid-code.vue'
+    import {
+        getuserrecruitDetailApp
+    } from '@/api/userrecruit.js'
+    export default {
+        data() {
+            return {
+                ...dictionary,
+                info: {},
+                status: null,
+                showDetail: false,
+                showCode: false,
+                maskShow: false,
+                nextBtn: false,
+                loading: false,
+                latitude: 39.909, //中心点
+                longitude: 116.39742,
+                covers: [{ //marker标记位置
+                    id: 0,
+                    latitude: 0,
+                    longitude: 0,
+                    // width:30,
+                    // height:30,
+                    iconPath: '../../static/img/location.png'
+                }],
+                missionNo: "",
+                isShow: '',
+                type: '',
+                id: '',
+                src: 'https://jlfiles.oss-cn-zhangjiakou.aliyuncs.com/jobslink-api/doc/%E7%94%B5%E5%AD%90%E5%90%88%E5%90%8C%E9%A2%84%E8%A7%88%E5%9B%BE%E7%89%87.png',
+                maxlength: 6,
+                collectStatus: 0, // 收藏状态
+                showPopUp: false,
+                jobType: null
+            }
+        },
+        components: {
+            uniMask,
+            validCode
+        },
+        onLoad: function(option) { //option为object类型，会序列化上个页面传递的参数
+            // this.$store.dispatch('setAutograph')
+            if (option.workId) {
+                this.workId = decodeURIComponent(option.workId);
+            }
+            if (option.isCan) {
+                this.isShow = option.isCan; //isShow为'0'则为我的任务、我的评价过来的，需要隐藏抢任务按钮
+            }
+            if (option.type) {
+                this.type = option.type; //type为1则为消息邀请过来的,需要设置消息已读;
+            }
+            if (option.id) {
+                this.id = option.id; //消息id
+            }
+            if (option.jobType) {
+                this.jobType = option.jobType
+            }
+        },
+        onShow: function() {
+            this.showDetail = true
+            this.getData();
+
+        },
+        onShareAppMessage(obj) {
+            return {
+                title: this.info.missionTitle,
+                path: `/pages/projectInfo/projectInfo?missionNo=${this.info.missionNo}`
+            }
+        },
+        methods: {
+            dateFormat,
+            collect() {
+                // console.log('收藏，取消收藏')
+                const status = this.collectStatus == 0 ? 1 : 0;
+                updateCollectStatus(this.info.id, status, 2).then(res => {
+                    if (res.data.code == 200) {
+                        this.getCollectStatus()
+                    }
+                })
+            },
+            callPhone() {
+                this.showPopUp = true;
+            },
+            closePopUp() {
+                this.showPopUp = false;
+            },
+            // 获取收藏状态
+            getCollectStatus() {
+                getCollectState(this.info.id, 2).then(res => {
+                    // 0 未收藏，1 已收藏
+                    // console.log(res)
+                    this.collectStatus = res.data.data;
+                })
+            },
+            async getData() {
+                const self = this;
+                let resData = null
+                if (this.jobType) {
+                    resData = await getuserrecruitDetailApp({
+                        id: this.id,
+                        jobType: this.jobType
+                    })
+                } else {
+                    resData = await userrecruitDetail(self.workId)
+                }
+                if (resData.data?.code === 200) {
+                    self.info = resData.data.data;
+                    self.status = resData.data.data.status;
+                    self.missionNo = resData.data.data.missionNo;
+                    self.latitude = self.info.lat;
+                    self.longitude = self.info.lon;
+                    self.covers[0].latitude = self.info.lat;
+                    self.covers[0].longitude = self.info.lon;
+                    self.showDetail = true;
+                    if (!this.seeDeatil) {
+                        self.getCollectStatus();
+                        if (self.type === 1) {
+                            // 设置已读
+                            setRead(self.id).then(res => {
+                                self.$store.commit("SET_READ");
+                            })
+                        }
+                    }
+                }
+            },
+            submit: function() {
+                if (!this.$store.state.user.token) {
+                    GoLogin()
+                    return
+                }
+                if (this.loading) return
+                const auth = this.auth
+                const contractOn = this.info.contractOn
+                const sealOk = this.autograph && this.autograph.data && this.autograph.data.signSrcUrl
+                // if (sealOk) {
+                // 	console.log('直接抢任务')
+                // 	this.submitTask()
+                // } else
+                // if (!auth.realNameState || !auth.laborState || !auth.insureState) {
+                // 	this.goSign(0)
+                // } else if (!auth.bankCardState){
+                // 	this.goSign(1)
+                // } else
+                if (contractOn && !sealOk) {
+                    this.goSign(2)
+                } else if (sealOk && contractOn) {
+                    this.nextBtn = true
+                    this.lookMask()
+                } else {
+                    this.submitTask()
+                }
+            },
+            // 查看合同
+            lookMask() {
+                this.maskShow = true
+            },
+            // 岗位申请
+            submitTask() {
+                submit(this.missionNo, 2).then(res => {
+                    uni.hideLoading()
+                    uni.showToast({
+                        title: '操作成功',
+                        icon: 'none'
+                    });
+                    this.status = null;
+                    this.loading = false
+                }, error => {
+                    this.loading = false
+                });
+            },
+            // 步骤
+            goSign(active) {
+                uni.navigateTo({
+                    url: `/pages/projectInfo/signContract?active=${active}`
+                })
+            },
+            // 关闭弹窗
+            close() {
+                this.maskShow = false
+            },
+            // 合同下一步
+            next() {
+                this.maskShow = false
+                this.showDetail = false
+                this.showCode = true
+            },
+            // 输入签名密码
+            getInpCode(password) {
+                uni.showLoading({
+                    title: "请求中..."
+                })
+                this.loading = true
+                var obj = {
+                    pass: password
+                }
+                checkPass(obj).then(res => {
+                    this.submitTask()
+                    this.closeShowCode()
+                }).catch(err => {
+                    this.loading = false
+                })
+            },
+            // 关闭签名密码弹窗
+            closeShowCode() {
+                this.showCode = false
+                this.showDetail = true
+            },
+            // 忘记密码
+            forget() {
+                uni.navigateTo({
+                    url: `/pageMy/setUserBase/seal/forget?forget=true`
+                })
+            }
+        },
+        computed: {
+            ...mapGetters(['auth', 'autograph', 'area']),
+            skillNames() {
+                if (this.info.skillNames) {
+                    return this.info.skillNames.split(',')
+                }
+            },
+            cityNamed() {
+                console.log('val', this.info, this.area.dic)
+                if (this.info && this.info.cityId !== -1 && this.area.dic) {
+                    return this.area.dic[this.info.cityId].label
+                } else {
+                    return '无'
+                }
+            }
+        }
+    }
+</script>
+
+<style lang="scss">
+    .codeSealBox {
+        padding: 285rpx 72rpx 0 72rpx;
+
+        .closeCode {
+            position: absolute;
+            right: 36rpx;
+            top: 120rpx;
+            color: #1B66FF;
+            transform: rotate(45deg);
+            font-size: 40px;
+        }
+
+        .title {
+            display: flex;
+            align-items: center;
+        }
+
+        .name {
+            height: 46rpx;
+            font-size: 46rpx;
+            font-family: PingFangSC-Medium, PingFang SC;
+            font-weight: 500;
+            color: #333333;
+            line-height: 46rpx;
+            margin-right: 28rpx;
+        }
+
+        .tip {
+            height: 38rpx;
+            font-size: 28rpx;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: 400;
+            color: #999999;
+            line-height: 38rpx;
+        }
+
+        .forget {
+            height: 38rpx;
+            font-size: 28rpx;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: 400;
+            color: #5AA0FA;
+            line-height: 38rpx;
+            text-align: right;
+        }
+
+    }
+
+    .contractMask {
+        background-color: #FFFFFF;
+        margin: 30rpx;
+        position: relative;
+        border-radius: 4px;
+        height: 96%;
+        overflow: auto;
+
+        .close {
+            width: 23px;
+            height: 23px;
+            color: #1B66FF;
+            position: fixed;
+            right: 60rpx;
+            top: 60rpx;
+            transform: rotate(45deg);
+            font-size: 40px;
+        }
+
+        .down {
+            position: fixed;
+            bottom: 30px;
+            left: 14%;
+            width: 545rpx;
+            height: 90rpx;
+            line-height: 90rpx;
+            text-align: center;
+            background: #1B66FF;
+            font-size: 36rpx;
+            font-weight: 400;
+            color: #FFFFFF;
+        }
+    }
+
+    .lookContract {
+        width: 30%;
+        margin-right: 30rpx;
+    }
+
+    .flexbtn {
+        flex: 1;
+    }
+
+    .bottombtn {
+        background-color: #1B66FF;
+        color: #fff;
+        text-align: center;
+        border-radius: 10rpx;
+        font-family: PingFangSC-Medium;
+        font-size: 32rpx;
+        height: 90rpx;
+        line-height: 90rpx;
+    }
+
+    .btn {
+        background-color: #fefefe;
+        width: 690rpx;
+        padding: 30rpx;
+        padding-bottom: 80rpx;
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        display: flex;
+    }
+
+    .disabledBtn {
+        background-color: #c8c9cc;
+    }
+
+    .map {
+        width: 100%;
+        height: 350rpx;
+        margin-top: 30rpx;
+    }
+
+    .askList {
+        font-family: PingFangSC-Regular;
+        font-size: 24rpx;
+        color: #666666;
+        background-color: #f6f6f6;
+        padding: 5rpx 15rpx;
+        margin-right: 10rpx;
+        margin-top: 15rpx;
+    }
+
+    .ask {
+        overflow: hidden;
+        width: 100%;
+        display: flex;
+        align-items: center;
+        flex-wrap: wrap;
+        justify-content: flex-start;
+        margin: 20rpx 0;
+
+    }
+
+    .proint {
+        margin-top: 30rpx;
+        font-size: 30rpx !important;
+    }
+
+    .proneed {
+        font-size: 32rpx !important;
+
+    }
+
+    .fee {
+        font-family: PingFangSC-Medium;
+        font-size: 32rpx;
+        color: #F46161;
+        margin-top: 30rpx;
+    }
+
+    .protype {
+        width: 50%;
+    }
+
+    .prolist {
+        font-family: PingFangSC-Regular;
+        font-size: 28rpx;
+        color: #666666;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        text-align: left;
+        padding: 5rpx 0;
+    }
+
+    .proname {
+        font-weight: bold;
+        font-family: PingFangSC-Medium;
+        font-size: 40rpx;
+        color: #333333;
+        width: 90%;
+        overflow: hidden;
+        padding-bottom: 20rpx;
+    }
+
+    .head {
+        padding: 30rpx;
+        background: #fefefe;
+        border-bottom: 20rpx solid #f6f6f6;
+    }
+
+    .description {
+        word-break: break-all;
+        white-space: pre-line;
+    }
+</style>
\ No newline at end of file
diff --git a/pages/projectInfo/workInfo.vue b/pages/projectInfo/workInfo.vue
index 92c20cd..76dd042 100644
--- a/pages/projectInfo/workInfo.vue
+++ b/pages/projectInfo/workInfo.vue
@@ -39,7 +39,7 @@
             </view>
             <view class="prolist">
                 <view class="protype">
-                    学历要求：{{info.education || '暂无'}}
+                    学历要求：{{education[info.education] || '暂无'}}
                 </view>
             </view>
             <view class="prolist">
@@ -422,6 +422,14 @@
                 if (this.info.skillNames) {
                     return this.info.skillNames.split(',')
                 }
+            },
+            cityNamed() {
+                console.log('val', this.info, this.area.dic)
+                if (this.info && this.info.cityId !== -1 && this.area.dic) {
+                    return this.area.dic[this.info.cityId].label
+                } else {
+                    return '无'
+                }
             }
         }
     }
diff --git a/pages/recruit/components/userrecruitList.vue b/pages/recruit/components/userrecruitList.vue
index 9f27587..2b35440 100644
--- a/pages/recruit/components/userrecruitList.vue
+++ b/pages/recruit/components/userrecruitList.vue
@@ -1,266 +1,283 @@
-<template>
-	<view class="body" @click="goInfo(companyitem.id)">
-		<view class="heads">
-			<view class="head_left">
-				<rich-text :nodes="string">
-				</rich-text>
-			</view>
-
-			<view class="head_right">
-				{{ companyitem.wage }}{{ wageUnit[companyitem.wageUnitCategory] }}
-			</view>
-		</view>
-		<view class="ask">
-			<view class="asj_content">
-			    <view class="askList">
-			    	{{ companyitem.tradeNames }}
-			    </view>
-			    <view class="askList" v-for="(item, index) in skillNames" :key="index">
-			    	{{ item }}
-			    </view>
-			</view>
-            <view class="ask_right">
-				<u-tag v-if="companyitem.reviewState == 1" :text="getReviewState(companyitem.reviewState)" type="success" plain shape="circle"></u-tag>
-				<u-tag v-if="companyitem.reviewState == 9" :text="getReviewState(companyitem.reviewState)" type="error" plain shape="circle"></u-tag>
-				<u-tag v-if="companyitem.reviewState == 0" :text="getReviewState(companyitem.reviewState)" plain shape="circle"></u-tag>
-            </view>
-		</view>
-		<!-- <view class="allName">
-			{{ companyitem.jobCompanyName }}
-		</view> -->
-		<view style="width: 100%;height: 1rpx;background-color: #999;margin: 0 auto;opacity: .5;"></view>
-		<view class="timeAddress" style="position: relative;">
-			<!-- <view v-if="companyitem.missionCompanyName">
-				{{ companyitem.missionCompanyName }}
-			</view> -->
-			<!-- <view>
-				<image src="../../static/img/city.png" style="width: 40rpx;height: 40rpx;" mode=""></image>
-				{{ companyitem.jobCompanyName }}
-			</view> -->
-			<view style="display: flex;align-items: center;">
-				<image src="../../../static/img/city.png" style="width: 40rpx;height: 40rpx;margin-right: 10rpx;" mode=""></image>
-				<view style="font-size: 26rpx;color:#333;">{{ companyitem.jobAddress }}</view>
-			</view>
-			<!-- <view v-if="near">
-				{{ companyitem.distanceStr }}km
-			</view>
-			<view v-else>
-				{{ getCity(companyitem.cityId) }}
-			</view> -->
-			<view style="display: flex;align-items: center;position:absolute;right:0;">
-				<image src="../../../static/img/location_new.png" style="width: 30rpx;height: 30rpx;" mode=""></image>
-				<view>2.2km</view>
-			</view>
-		</view>
-		<view class="comment" v-if='comment' @tap.stop="goComment(companyitem.missionNo)">
-			<view class="comment_content commentimg" v-if='companyitem.scoreAll > 0'>
-				<image class="commentimg_image" src="../../../static/img/star.full.svg" v-for="index1 in companyitem.scoreAll"
-					mode="" :key="index1"></image>
-				<image class="commentimg_image" src="../../../static/img/star.empty.svg"
-					v-for="index2 in (5 - companyitem.scoreAll)" mode="" :key="index2"></image>
-			</view>
-			<view class="comment_content allName gocomment" v-else>
-				评价
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-import {
-	toDoller,
-	dateFormat
-} from "../../../untils/format.js";
-import dictionary from '@/common/textdata.js';
-
-export default {
-	beforeCreate: function () { },
-	props: {
-		companyitem: {
-			type: Object,
-			default() { return [] }
-		},
-		comment: {
-			type: Boolean,
-			default: false
-		},
-		noApply: {
-			type: Boolean,
-			default: true
-		},
-		near: {
-			type: Boolean,
-			default: false
-		}
-	},
-	data() {
-		return {
-			...dictionary,
-			string: "<div style='overflow: hidden;white-space: nowrap;text-overflow: ellipsis;'>" + this.companyitem.jobName +
-				"</div>"
-		};
-	},
-	computed: {
-		skillNames() {
-			return this.companyitem.skillNames.split(',')
-		}
-	},
-	methods: {
-        getReviewState(type) {
-            switch(type) {
-                case 1: 
-                    return '已审核'
-                case 0:
-                    return '待审核'   
-                case 9:
-                    return '已驳回'
-            }
-        },
-		goComment: function (no) {
-			uni.navigateTo({
-				url: `../../pageMy/mycomment/mycomment?missionNo=${encodeURIComponent(no)}`
-			})
-		},
-		goInfo: function (no) {
-			const isCan = this.noApply === false ? '0' : '1'
-			uni.navigateTo({
-				url: `/pages/projectInfo/userrecruitInfo?workId=${encodeURIComponent(no)}&isCan=${isCan}&jobType=${this.companyitem.jobType
-                }&id=${this.companyitem.id}`
-			})
-		},
-		getCity: function (val) {
-			if (val) {
-				let areas = this.$store.getters.getAreaParents(val)
-				if (areas.length === 3) {
-					return areas[0].label + '-' + areas[1].label + '-' + areas[2].label
-				}
-			}
-		},
-		toDoller,
-		dateFormat
-	}
-}
-</script>
-
-<style>
-.commentimg_image {
-	width: 40rpx;
-	height: 40rpx;
-}
-
-.commentimg {
-	display: flex;
-	align-items: center;
-	justify-content: flex-end;
-}
-
-.gocomment {
-	font-size: 26rpx !important;
-	border-radius: 5rpx;
-	border: 1rpx solid #c3c3c3;
-	width: 160rpx;
-	text-align: center;
-	float: right;
-	height: 50rpx;
-	line-height: 50rpx;
-}
-
-.timeAddress {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	font-family: PingFangSC-Regular;
-	font-size: 24rpx;
-	color: #999999;
-	margin: 10rpx 0;
-	padding: 10rpx 0;
-}
-
-.allName {
-	font-family: PingFangSC-Regular;
-	font-size: 28rpx;
-	color: #666666;
-}
-
-.askList {
-	/* width: 14%; */
-	font-family: PingFangSC-Regular;
-	font-size: 24rpx;
-	color: #666666;
-	background-color: #f6f6f6;
-	padding: 5rpx 15rpx;
-	margin-right: 10rpx;
-	margin-bottom: 10rpx;
-}
-
-.ask {
-	overflow: hidden;
-	width: 100%;
-	display: flex;
-	align-items: center;
-	flex-wrap: wrap;
-	justify-content: space-between;
-	margin: 20rpx 0;
-}
-
-.asj_content{
-    display: flex;
-    align-items: center;
-    flex-wrap: wrap;
-    justify-content: flex-start;
-    flex: 1;
-}
-.ask_right{
-    font-family: PingFangSC-Regular;
-    font-size: 24rpx;
-    color: blue;
-    background-color: #FFFFFF;
-    /* border: 2rpx solid blue; */
-    border-radius: 6px;
-    /* padding: 2rpx 10rpx; */
-    margin-right: 10rpx;
-    margin-bottom: 10rpx;
-}
-
-.head_right {
-	font-family: PingFangSC-Medium;
-	font-size: 28rpx;
-	color: #F46161;
-	font-weight: bold;
-}
-
-.head_left {
-	font-family: PingFangSC-Medium;
-	font-size: 32rpx;
-	font-weight: bold;
-	color: #333333;
-	width: 350rpx;
-	overflow: hidden;
-	white-space: nowrap;
-	/*不换行*/
-	text-overflow: ellipsis;
-	/*超出部分文字以...显示*/
-}
-
-.highlight {
-	color: #F46161;
-}
-
-.body {
-	width: 690rpx;
-	margin: 0rpx auto;
-	background-color: #fefefe;
-	overflow: hidden;
-	box-sizing: border-box;
-	padding: 20rpx;
-	padding-bottom: 0;
-	border-radius: 20rpx;
-    margin-bottom: 20rpx;
-}
-
-.heads {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-}
-</style>
+<template>
+    <view class="body" @click="goInfo(companyitem)">
+        <view class="heads">
+            <view class="head_left">
+                <rich-text :nodes="string">
+                </rich-text>
+            </view>
+
+            <view class="head_right">
+                {{ companyitem.wage }}{{ wageUnit[companyitem.wageUnitCategory] }}
+            </view>
+        </view>
+        <view class="ask">
+            <view class="asj_content">
+                <view class="askList">
+                    {{ companyitem.tradeNames }}
+                </view>
+                <view class="askList" v-for="(item, index) in skillNames" :key="index">
+                    {{ item }}
+                </view>
+            </view>
+            <view class="ask_right">
+                <u-tag v-if="companyitem.reviewState == 1" :text="getReviewState(companyitem.reviewState)"
+                    type="success" plain shape="circle"></u-tag>
+                <u-tag v-if="companyitem.reviewState == 9" :text="getReviewState(companyitem.reviewState)" type="error"
+                    plain shape="circle"></u-tag>
+                <u-tag v-if="companyitem.reviewState == 0" :text="getReviewState(companyitem.reviewState)" plain
+                    shape="circle"></u-tag>
+            </view>
+        </view>
+        <!-- <view class="allName">
+			{{ companyitem.jobCompanyName }}
+		</view> -->
+        <view style="width: 100%;height: 1rpx;background-color: #999;margin: 0 auto;opacity: .5;"></view>
+        <view class="timeAddress" style="position: relative;">
+            <!-- <view v-if="companyitem.missionCompanyName">
+				{{ companyitem.missionCompanyName }}
+			</view> -->
+            <!-- <view>
+				<image src="../../static/img/city.png" style="width: 40rpx;height: 40rpx;" mode=""></image>
+				{{ companyitem.jobCompanyName }}
+			</view> -->
+            <view style="display: flex;align-items: center;">
+                <image src="../../../static/img/city.png" style="width: 40rpx;height: 40rpx;margin-right: 10rpx;"
+                    mode=""></image>
+                <view style="font-size: 26rpx;color:#333;">{{ companyitem.jobAddress }}</view>
+            </view>
+            <!-- <view v-if="near">
+				{{ companyitem.distanceStr }}km
+			</view>
+			<view v-else>
+				{{ getCity(companyitem.cityId) }}
+			</view> -->
+            <view style="display: flex;align-items: center;position:absolute;right:0;">
+                <image src="../../../static/img/location_new.png" style="width: 30rpx;height: 30rpx;" mode=""></image>
+                <view>2.2km</view>
+            </view>
+        </view>
+        <view class="comment" v-if='comment' @tap.stop="goComment(companyitem.missionNo)">
+            <view class="comment_content commentimg" v-if='companyitem.scoreAll > 0'>
+                <image class="commentimg_image" src="../../../static/img/star.full.svg"
+                    v-for="index1 in companyitem.scoreAll" mode="" :key="index1"></image>
+                <image class="commentimg_image" src="../../../static/img/star.empty.svg"
+                    v-for="index2 in (5 - companyitem.scoreAll)" mode="" :key="index2"></image>
+            </view>
+            <view class="comment_content allName gocomment" v-else>
+                评价
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import {
+        toDoller,
+        dateFormat
+    } from "../../../untils/format.js";
+    import dictionary from '@/common/textdata.js';
+
+    export default {
+        beforeCreate: function() {},
+        props: {
+            companyitem: {
+                type: Object,
+                default () {
+                    return []
+                }
+            },
+            comment: {
+                type: Boolean,
+                default: false
+            },
+            noApply: {
+                type: Boolean,
+                default: true
+            },
+            near: {
+                type: Boolean,
+                default: false
+            }
+        },
+        data() {
+            return {
+                ...dictionary,
+                string: "<div style='overflow: hidden;white-space: nowrap;text-overflow: ellipsis;'>" + this.companyitem
+                    .jobName +
+                    "</div>"
+            };
+        },
+        computed: {
+            skillNames() {
+                return this.companyitem.skillNames.split(',')
+            }
+        },
+        methods: {
+            getReviewState(type) {
+                switch (type) {
+                    case 1:
+                        return '已审核'
+                    case 0:
+                        return '待审核'
+                    case 9:
+                        return '已驳回'
+                }
+            },
+            goComment: function(no) {
+                uni.navigateTo({
+                    url: `../../pageMy/mycomment/mycomment?missionNo=${encodeURIComponent(no)}`
+                })
+            },
+            goInfo: function({
+                id,
+                jobType
+            }) {
+                const isCan = this.noApply === false ? '0' : '1'
+                switch (jobType) {
+                    case 0:
+                        this.navTo(`/pages/projectInfo/userrecruitInfo?workId=${encodeURIComponent(id)}&isCan=${isCan}&jobType=${
+                        this.companyitem.jobType}&id=${this.companyitem.id}`)
+                        break
+                    case 1:
+                        this.navTo(`/pages/projectInfo/userrecruitWorkInfo?workId=${encodeURIComponent(id)}&isCan=${isCan}&jobType=${
+                        this.companyitem.jobType}&id=${this.companyitem.id}`)
+                        break
+                }
+            },
+            getCity: function(val) {
+                if (val) {
+                    let areas = this.$store.getters.getAreaParents(val)
+                    if (areas.length === 3) {
+                        return areas[0].label + '-' + areas[1].label + '-' + areas[2].label
+                    }
+                }
+            },
+            toDoller,
+            dateFormat
+        }
+    }
+</script>
+
+<style>
+    .commentimg_image {
+        width: 40rpx;
+        height: 40rpx;
+    }
+
+    .commentimg {
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+    }
+
+    .gocomment {
+        font-size: 26rpx !important;
+        border-radius: 5rpx;
+        border: 1rpx solid #c3c3c3;
+        width: 160rpx;
+        text-align: center;
+        float: right;
+        height: 50rpx;
+        line-height: 50rpx;
+    }
+
+    .timeAddress {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        font-family: PingFangSC-Regular;
+        font-size: 24rpx;
+        color: #999999;
+        margin: 10rpx 0;
+        padding: 10rpx 0;
+    }
+
+    .allName {
+        font-family: PingFangSC-Regular;
+        font-size: 28rpx;
+        color: #666666;
+    }
+
+    .askList {
+        /* width: 14%; */
+        font-family: PingFangSC-Regular;
+        font-size: 24rpx;
+        color: #666666;
+        background-color: #f6f6f6;
+        padding: 5rpx 15rpx;
+        margin-right: 10rpx;
+        margin-bottom: 10rpx;
+    }
+
+    .ask {
+        overflow: hidden;
+        width: 100%;
+        display: flex;
+        align-items: center;
+        flex-wrap: wrap;
+        justify-content: space-between;
+        margin: 20rpx 0;
+    }
+
+    .asj_content {
+        display: flex;
+        align-items: center;
+        flex-wrap: wrap;
+        justify-content: flex-start;
+        flex: 1;
+    }
+
+    .ask_right {
+        font-family: PingFangSC-Regular;
+        font-size: 24rpx;
+        color: blue;
+        background-color: #FFFFFF;
+        /* border: 2rpx solid blue; */
+        border-radius: 6px;
+        /* padding: 2rpx 10rpx; */
+        margin-right: 10rpx;
+        margin-bottom: 10rpx;
+    }
+
+    .head_right {
+        font-family: PingFangSC-Medium;
+        font-size: 28rpx;
+        color: #F46161;
+        font-weight: bold;
+    }
+
+    .head_left {
+        font-family: PingFangSC-Medium;
+        font-size: 32rpx;
+        font-weight: bold;
+        color: #333333;
+        width: 350rpx;
+        overflow: hidden;
+        white-space: nowrap;
+        /*不换行*/
+        text-overflow: ellipsis;
+        /*超出部分文字以...显示*/
+    }
+
+    .highlight {
+        color: #F46161;
+    }
+
+    .body {
+        width: 690rpx;
+        margin: 0rpx auto;
+        background-color: #fefefe;
+        overflow: hidden;
+        box-sizing: border-box;
+        padding: 20rpx;
+        padding-bottom: 0;
+        border-radius: 20rpx;
+        margin-bottom: 20rpx;
+    }
+
+    .heads {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+    }
+</style>
\ No newline at end of file
diff --git a/pages/recruit/recruit.vue b/pages/recruit/recruit.vue
index 8e3abcb..48bc401 100644
--- a/pages/recruit/recruit.vue
+++ b/pages/recruit/recruit.vue
@@ -26,9 +26,7 @@
 
     export default {
         data() {
-            return {
-
-            }
+            return {}
         },
         computed: {
             ...mapState({
@@ -65,10 +63,10 @@
                         if (resData.data.data) {
                             resolve()
                         } else {
-                            // this.$api.msg('您未申请开通该功能，请联系工作人员')
-                            this.navTo(
-                                '/pages/recruit/subPage/enterpriceCertification/enterpriceCertification'
-                            )
+                            this.$api.msg('您未申请开通该功能，请联系工作人员')
+                            // this.navTo(
+                            //     '/pages/recruit/subPage/enterpriceCertification/enterpriceCertification'
+                            // )
                         }
                     } else {
                         reject()
diff --git a/pages/recruit/subPage/enterpriceCertification/enterpriceCertification.vue b/pages/recruit/subPage/enterpriceCertification/enterpriceCertification.vue
index 97c80c0..50bda2f 100644
--- a/pages/recruit/subPage/enterpriceCertification/enterpriceCertification.vue
+++ b/pages/recruit/subPage/enterpriceCertification/enterpriceCertification.vue
@@ -3,7 +3,7 @@
         <view class="content">
             <u--form labelPosition="left" :model="formData" :rules="rules" ref="formOne">
                 <view class="card">
-                    <view class="card_title">企业信息</view>
+                    <view class="card_title">企业认证信息</view>
                     <u-form-item label="企业名称" labelWidth="100" prop="comname" borderBottom ref="item1">
                         <u--input v-model="formData.comname" placeholder="请输入企业名称"></u--input>
                     </u-form-item>
@@ -45,7 +45,7 @@
                     </u-form-item>
                 </view>
                 <view class="card">
-                    <view class="card_title">用户信息</view>
+                    <view class="card_title">联系人信息</view>
                     <u-form-item label="联系人" labelWidth="100" prop="manager" borderBottom ref="item1">
                         <u--input v-model="formData.manager" placeholder="请输入联系人"></u--input>
                     </u-form-item>
@@ -55,7 +55,7 @@
                 </view>
 
                 <view class="card">
-                    <view class="card_title">相关资料</view>
+                    <view class="card_title">证件资料</view>
                     <view class="card_content">
                         <u-form-item labelWidth="100" prop="identityUrl4Id">
                             <UploadIdNumber v-model="formData.identityUrl4Id" backImg="/static/img/idcard.png">
@@ -210,6 +210,17 @@
                 uni.hideKeyboard()
             },
             async submit() {
+                let params = {
+                    ...this.formData,
+                    nature: Number(this.formData.nature),
+                    cityId: Number(this.formData.cityId),
+                    tradeId: Number(this.formData.tradeId),
+                }
+                let resData = await addInviteCompanyAuth(params)
+                console.log(resData)
+                if (resData.data.code === 200) {
+                    _this.$api.msg('已完成企业信息认证')
+                }
                 const _this = this
                 this.$refs.formOne.validate().then(async (res) => {
                     let params = {
@@ -229,7 +240,6 @@
                     console.log(errors)
                     _this.$api.msg('请完善内容')
                 })
-
             },
             reset() {
                 const _this = this
diff --git a/pages/recruit/subPage/task.vue b/pages/recruit/subPage/task.vue
index 9c89808..e4bcfe9 100644
--- a/pages/recruit/subPage/task.vue
+++ b/pages/recruit/subPage/task.vue
@@ -600,6 +600,9 @@
                         if (res.data.code == 200) {
                             that.reset()
                             uni.$u.toast('发布成功')
+                            setTimeout(() => {
+                                this.navTo('/pages/recruit/subPage/index')
+                            }, 1000)
                         }
                     })
                 }).catch(errors => {
diff --git a/pages/recruit/subPage/work.vue b/pages/recruit/subPage/work.vue
index 8609249..66210a1 100644
--- a/pages/recruit/subPage/work.vue
+++ b/pages/recruit/subPage/work.vue
@@ -595,6 +595,9 @@
                         if (res.data.code == 200) {
                             that.reset()
                             uni.$u.toast('发布成功')
+                            setTimeout(() => {
+                                this.navTo('/pages/recruit/subPage/index')
+                            }, 1000)
                         }
                     })
                 }).catch(errors => {
diff --git a/static/img/index/inLogo11.png b/static/img/index/inLogo11.png
new file mode 100644
index 0000000..ad11b25
Binary files /dev/null and b/static/img/index/inLogo11.png differ
diff --git a/vue.config.js b/vue.config.js
index 5771477..1f309b9 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -3,7 +3,7 @@ module.exports = {
         port: 1887,
         proxy: {
             '/api': {
-                target: 'http://10.165.0.173:8000',
+                target: 'http://localhost:8000',
                 ws: true,
                 pathRewrite: {
                     '^/api': '/'