diff --git a/api/order.js b/api/order.js
index 4f6e6fd..351fbab 100644
--- a/api/order.js
+++ b/api/order.js
@@ -8,6 +8,7 @@ let orderInfo = {
 	order_peopleList :"/yishoudan/user/getAgencyCorpUsers",// 报名人列表
 	order_submitPeople :"/yishoudan/user/apply/order/updateApplyUserAndStatistic",// 报名人提交修改
 	order_submitFellow :"/yishoudan/user/updateInfo",// 老乡编辑提交
+	order_submitFellowNew :"/yishoudan/user/apply/order/V2/updateUserInfo",// 老乡编辑提交
 	order_submitTime :"/assistant/apply/order/changeTime",// 时间编辑提交
 	order_residentList :"/assistant/agency/onsite/user/list",// 驻场列表
 	order_residentSubmit :"/assistant/apply/order/changeOnSiteUser",// 驻场提交
diff --git a/root/detail/apply.vue b/root/detail/apply.vue
index 32860a2..282a607 100644
--- a/root/detail/apply.vue
+++ b/root/detail/apply.vue
@@ -10,31 +10,40 @@
 				<view class="link g_bg_f g_pt_10">
 					<g-panel-detail-item label="状态" :value="orderDetail.status_text" valueColor="#ff4400" />
 					<!-- afterIcon="icon-gengduo11"  @clickItem="goBossDetail" -->
-					<g-panel-detail-item label="项目方" :value="orderDetail.upFullName || orderDetail.upAgencyName" valueColor="#333" />
+					<!-- <g-panel-detail-item label="项目方" :value="orderDetail.upFullName || orderDetail.upAgencyName" valueColor="#333" /> -->
 					<!-- @clickItem="handleOpenPeopleModal"  -->
-					<g-panel-detail-item label="报名人" from="resident-info" beforeIcon="icon-phone" @clickItem="goTel(orderDetail.agencyTel)" :remarkValue="orderDetail.agencyTel" v-if="!orderDetail.prevRecordId" :value="orderDetail.applyUserName" />
-					<g-panel-detail-item label="报名人" from="resident-info" beforeIcon="icon-phone" @clickItem="goTel(orderDetail.agencyTel)" :remarkValue="orderDetail.agencyTel" v-else :value="orderDetail.applyUserName" />
-
 					<view>
-						<view class="g_pt_10 " v-if="orderDetail.canEdit || (!orderDetail.canEdit && (orderDetail.statusId == 10 || orderDetail.statusId == 20 || orderDetail.statusId == 25))">
-							<g-panel-detail-item from="times" label="面试时间" :value="orderDetail.interview_time" afterType="time" @confirmChooseTime="handleMianshi" />
+            <view class="g_pt_10 " v-if="orderDetail.reception_time && (orderDetail.status== '10' ||orderDetail.status== '20' ||orderDetail.status== '21' ||orderDetail.status== '26')">
+							<g-panel-detail-item from="times" label="接待时间" :value="orderDetail.reception_time"   />
 						</view>
-						<view class="g_pt_10 " v-if="orderDetail.status == 30">
-							<g-panel-detail-item from="times" label="约入职时间" :value="orderDetail.willEntry_time" afterType="time" @confirmChooseTime="handleYueruzhi" />
+            <view class="g_pt_10 " v-if="orderDetail.interview_time && orderDetail.status!='50'">
+							<g-panel-detail-item from="times" label="面试时间" :value="orderDetail.interview_time"   />
 						</view>
-						<view class="g_pt_10 " v-if="orderDetail.status == 40">
-							<g-panel-detail-item from="times" label="入职时间" :value="orderDetail.entry_time" afterType="time" @confirmChooseTime="handleRuzhi" />
+            <view class="g_pt_10 " v-if="orderDetail.willEntry_time &&(orderDetail.status== '45' ||orderDetail.status== '30')">
+							<g-panel-detail-item from="times" label="约入职时间" :value="orderDetail.willEntry_time"   />
 						</view>
-						<view class="g_pt_10 " v-if="orderDetail.status == 48">
-							<g-panel-detail-item from="times" label="约离职时间" :value="orderDetail.willLeave_time" afterType="time" @confirmChooseTime="handleYuelizhi" />
+            <view class="g_pt_10 " v-if="orderDetail.entry_time &&(orderDetail.status== '40' ||orderDetail.status== '48' ||orderDetail.status== '50')">
+							<g-panel-detail-item from="times" label="入职时间" :value="orderDetail.entry_time"   />
 						</view>
-						<view class="g_pt_10 " v-if="orderDetail.status == 50">
-							<g-panel-detail-item from="times" label="离职时间" :value="orderDetail.leave_time" afterType="time" @confirmChooseTime="handleLizhi" />
+            <view class="g_pt_10 " v-if="orderDetail.willLeave_time &&orderDetail.status == 48">
+							<g-panel-detail-item from="times" label="约离职时间" :value="orderDetail.willLeave_time"   />
 						</view>
-						<view class="g_pt_10 " v-if="orderDetail.status == 21 || orderDetail.status == 26 || orderDetail.status == 35 || orderDetail.status == 45">
+            <view class="g_pt_10 " v-if="orderDetail.leave_time && orderDetail.status == 50">
+							<g-panel-detail-item from="times" label="离职时间" :value="orderDetail.leave_time"   />
+						</view> 
+            <view class="g_pt_10 " v-if="orderDetail.create_time && orderDetail.status != 50">
+							<g-panel-detail-item from="times" label="报名时间" :value="orderDetail.create_time"   />
+						</view> 
+            
+						<!-- <view class="g_pt_10 " v-if="orderDetail.status == 21 || orderDetail.status == 26 || orderDetail.status == 35 || orderDetail.status == 45">
 							<g-panel-detail-item from="times" label="更新时间" :value="orderDetail.update_time" />
-						</view>
+						</view> -->
 					</view>
+          <view class="g_pt_10 ">
+				  <g-panel-detail-item label="报名人" from="resident-info" beforeIcon="icon-phone" @clickItem="goTel(orderDetail.agencyTel)" :remarkValue="orderDetail.agencyTel" :value="orderDetail.downFullName ||orderDetail.downProviderName  " />
+
+          </view>
+
 				</view>
 			</view>
 			<!-- 用户信息 -->
@@ -85,17 +94,17 @@
 				</view>
 			</view>
 			<!-- 费用 -->
-			<view class="m-price">
+			<view class="m-price" v-if="false">
 				<view class="g_h_12"></view>
-				<view class="link g_bg_f g_pt_10">
+				<view class="link g_bg_f g_pt_10" >
 					<!-- v-if="(!orderDetail.nextRecordId && !orderDetail.prevRecordId && isCreator) || (isCreator && orderDetail.nextRecordId)" -->
-					<view>
-						<g-panel-detail-item label="服务费" :value="setReturnFee(orderDetail.returnFee, orderDetail.returnFeeType)" />
-						<g-panel-detail-item label="服务费详情" :value="orderDetail.returnFeeDesp" afterIcon="icon-gengduo11" @clickItem="goInfo(orderDetail.returnFeeDesp, '服务费详情', 'view')" />
+					<view >
+						<g-panel-detail-item label="上游佣金" :value="setReturnFee(orderDetail.returnFee, orderDetail.returnFeeType)" />
+						<g-panel-detail-item label="上游佣金详情" :value="orderDetail.returnFeeDesp" afterIcon="icon-gengduo11" @clickItem="goInfo(orderDetail.returnFeeDesp, '上游佣金详情', 'view')" />
 					</view>
 					<!-- <div v-if="(!orderDetail.nextRecordId && !orderDetail.prevRecordId) || orderDetail.prevRecordId || agencyId == orderDetail.agencyId">
-						<g-panel-detail-item :label="isCreator ? '代理费' : '代理费'" :value="setReturnFee(orderDetail.agencyReturnFee, orderDetail.agencyReturnFeeType)" afterIcon="icon-gengduo11" @clickItem="goInfo(orderDetail.agencyReturnFee / 100, '代理费', 'form', orderDetail.agencyReturnFeeType)" />
-						<g-panel-detail-item :label="isCreator ? '代理费详情' : '代理费详情'" :value="orderDetail.agencyReturnFeeDesp" afterIcon="icon-gengduo11" @clickItem="goInfo(orderDetail.agencyReturnFeeDesp, '代理费详情', 'edit')" />
+						<g-panel-detail-item :label="isCreator ? '佣金' : '佣金'" :value="setReturnFee(orderDetail.agencyReturnFee, orderDetail.agencyReturnFeeType)" afterIcon="icon-gengduo11" @clickItem="goInfo(orderDetail.agencyReturnFee / 100, '佣金', 'form', orderDetail.agencyReturnFeeType)" />
+						<g-panel-detail-item :label="isCreator ? '佣金详情' : '佣金详情'" :value="orderDetail.agencyReturnFeeDesp" afterIcon="icon-gengduo11" @clickItem="goInfo(orderDetail.agencyReturnFeeDesp, '佣金详情', 'edit')" />
 					</div> -->
 					<!-- <g-panel-detail-item label="政策模式" v-if="isCreator" :value="orderDetail.zhengceTextShow" afterIcon="icon-gengduo11" @clickItem="handleOpenZhengceModal" from="zhengce-info" /> -->
 					<g-panel-detail-item label="报名备注" :value="orderDetail.desp" />
@@ -112,11 +121,19 @@
 					<!-- 代理费/服务费 最下游不显示 orderDetail.prevRecordId为空 是最下游 -->
 
 					<!-- <g-panel-detail-item label="报名时间" :value="orderDetail.create_time" /> -->
-					<g-panel-detail-item label="职位说明" :value="orderDetail.employeeSalary" afterIcon="icon-gengduo11" @clickItem="goInfo(orderDetail.employeeSalary, '职位说明', 'edit')" />
+					<g-panel-detail-item label="薪资明细" :value="orderDetail.employeeSalary" afterIcon="icon-gengduo11" @clickItem="goInfo(orderDetail.employeeSalary, '薪资明细', 'view')" />
+          <view >
+						<g-panel-detail-item label="上游项目方" :value="orderDetail.upFullName || orderDetail.upProviderName || '-'" />
+						<g-panel-detail-item label="上游佣金" :value="setReturnFee(orderDetail.returnFee, orderDetail.returnFeeType)" />
+						<g-panel-detail-item label="上游佣金详情" :value="orderDetail.returnFeeDesp" afterIcon="icon-gengduo11" @clickItem="goInfo(orderDetail.returnFeeDesp, '上游佣金详情', 'view')" />
+					</view>
+					<g-panel-detail-item label="驻场信息" :labelSubStr="orderDetail.onSiteInfo ? '复制' :''" :value="orderDetail.onSiteInfo || '-'" from="resident-info" afterType="multi" @clickLabelBtn="handleClickLabelBtn(orderDetail.onSiteInfo || '-')" />
+					<g-panel-detail-item label="面试地址" :value="orderDetail.interviewAddress" afterIcon="icon-gengduo11" @clickItem="handleChooseAddressModal" />
+
 					<view class="g_h_15"></view>
 				</view>
 			</view>
-			<view class="m-price">
+			<!-- <view class="m-price">
 				<view class="g_h_12"></view>
 				<view class="link g_bg_f g_pt_10">
 					<g-panel-detail-item label="面试地址" :value="orderDetail.interviewAddress" afterIcon="icon-gengduo11" @clickItem="handleChooseAddressModal" />
@@ -126,7 +143,7 @@
 
 					<view class="g_h_15"></view>
 				</view>
-			</view>
+			</view> -->
 			<!-- 企业信息 -->
 			<!-- <view class="m-boss">
 				<view class="g_h_10"></view>
@@ -429,12 +446,16 @@ export default {
 		this.oid = options.id;
 		this.relationId = options.relationId;
 		this.type = options.type;
-	},
-	onShow() {
-		this.isCreator = uni.getStorageSync("IS_CREATOR") == 1 ? true : false;
+    	this.isCreator = uni.getStorageSync("IS_CREATOR") == 1 ? true : false;
 		this.getResident();
 		this.getPeople();
 		this.getDetail();
+    uni.$on("infoUpdate", () => {
+			this.getDetail();
+		});
+	},
+	onShow() {
+	
 	},
 	methods: {
 		handleClickLabelBtn($data) {
@@ -550,6 +571,9 @@ export default {
 					if (res.createTime) {
 						res.create_time = that.G.getPointTime(res.createTime, "YY--MM--DD HH:MM");
 					}
+          		if (res.receptionTime) {
+						res.reception_time = that.G.getPointTime(res.receptionTime, "YY--MM--DD HH:MM");
+					}
 					if (res.interviewTime) {
 						res.interview_time = that.G.getPointTime(res.interviewTime, "YY--MM--DD HH:MM");
 					}
@@ -708,27 +732,27 @@ export default {
 				// {{ orderDetail.userName }}{{ orderDetail.setTitle }}
 			params = {
 				"姓名：": this.orderDetail.userName + this.orderDetail.setTitle,
-				"身份证号：": this.orderDetail.idCard ? this.orderDetail.idCard : "-",
-				"企业岗位：": this.orderDetail.storeJobName ? this.orderDetail.storeJobName : "-",
-				'电话：': this.orderDetail.tel ? this.orderDetail.tel : "-",
+				"\n身份证号：": this.orderDetail.idCard ? this.orderDetail.idCard : "-",
+				"\n企业岗位：": this.orderDetail.storeJobName ? this.orderDetail.storeJobName : "-",
+				'\n电话：': this.orderDetail.tel ? this.orderDetail.tel : "-",
 			};
 			if (this.orderDetail.status == 10 || this.orderDetail.status == 20 || this.orderDetail.status == 25) {
-				params["面试时间"] = this.orderDetail.interview_time ? this.orderDetail.interview_time : "-";
+				params["\n面试时间"] = this.orderDetail.interview_time ? this.orderDetail.interview_time : "-";
 			}
 			if (this.orderDetail.status == 30) {
-				params["约入职时间"] = this.orderDetail.willEntry_time ? this.orderDetail.willEntry_time : "-";
+				params["\n约入职时间"] = this.orderDetail.willEntry_time ? this.orderDetail.willEntry_time : "-";
 			}
 			if (this.orderDetail.status == 40) {
-				params["入职时间"] = this.orderDetail.entry_time ? this.orderDetail.entry_time : "-";
+				params["\n入职时间"] = this.orderDetail.entry_time ? this.orderDetail.entry_time : "-";
 			}
 			if (this.orderDetail.status == 48) {
-				params["约离职时间"] = this.orderDetail.willLeave_time ? this.orderDetail.willLeave_time : "-";
+				params["\n约离职时间"] = this.orderDetail.willLeave_time ? this.orderDetail.willLeave_time : "-";
 			}
 			if (this.orderDetail.status == 50) {
-				params["离职时间"] = this.orderDetail.leave_time ? this.orderDetail.leave_time : "-";
+				params["\n离职时间"] = this.orderDetail.leave_time ? this.orderDetail.leave_time : "-";
 			}
 			if (this.orderDetail.status == 21 || this.orderDetail.status == 26 || this.orderDetail.status == 35 || this.orderDetail.status == 45) {
-				params["完成时间"] = this.orderDetail.update_time ? this.orderDetail.update_time : "-";
+				params["\n完成时间"] = this.orderDetail.update_time ? this.orderDetail.update_time : "-";
 			}
 			that.G.copyText(that.G.objToStr(params, "copy"));
 		},
@@ -736,6 +760,7 @@ export default {
 			let that = this,
 				params = {};
 			params = {
+        id:this.orderDetail.id,
 				name: this.orderDetail.userName,
 				sex: this.orderDetail.sex,
 				age: this.orderDetail.age,
@@ -789,7 +814,7 @@ export default {
 			} else {
 				uni.showToast({
 					icon: "none",
-					title: "请检查地址",
+					title: "地址无经纬度,无法打开地图",
 				});
 			}
 		},
diff --git a/root/detail/fellow.vue b/root/detail/fellow.vue
index 3a607b4..ec3e71a 100644
--- a/root/detail/fellow.vue
+++ b/root/detail/fellow.vue
@@ -222,6 +222,13 @@ export default {
     },
     handleSubmit() {
       let that = this
+      if (!that.info.tel && !that.info.idCard) {
+        uni.showToast({
+          icon: 'none',
+          title: '请至少输入手机号或者身份证号',
+        })
+        return false
+      }
       if (!that.G.setReg(that.info.tel, 'tel')) {
         uni.showToast({
           icon: 'none',
@@ -230,7 +237,7 @@ export default {
         return false
       }
 
-      if (!that.G.setReg(that.info.idCard, 'idcard')) {
+      if (!that.G.isValidIdCard(that.info.idCard)) {
         uni.showToast({
           icon: 'none',
           title: '请输入正确的身份证号',
@@ -241,11 +248,25 @@ export default {
       if (!that.info.nation) {
         that.info.nation = '汉族'
       }
-      that.G.Post(that.api.order_submitFellow, that.info, (res) => {
+      let submitInfo = {
+        name: that.info.userName,
+        sex: that.info.sex,
+        age: that.info.age,
+        nation: that.info.nation,
+        tel: that.info.tel,
+        idCard: that.info.idCard,
+        address: that.info.address,
+        idCardImageUrl: that.info.idCardImageUrl ? that.info.idCardImageUrl : '',
+        userName: that.info.userName,
+        userId: that.info.userId,
+        orderId: that.info.id,
+      }
+      that.G.Post(that.api.order_submitFellowNew, submitInfo, (res) => {
         uni.showToast({
           icon: 'success',
           title: '保存成功',
         })
+				uni.$emit("infoUpdate");
         setTimeout(() => {
           that.goReturn()
         }, 300)
diff --git a/root/detail/job.vue b/root/detail/job.vue
index 775de7b..beb11ce 100644
--- a/root/detail/job.vue
+++ b/root/detail/job.vue
@@ -1023,7 +1023,7 @@ export default {
 				});
 				return false;
 			}
-			if (!that.G.setReg(that.formInfo.idCard, "idcard")) {
+			if (!that.G.isValidIdCard(that.formInfo.idCard)) {
 				uni.showToast({
 					icon: "none",
 					title: "请输入正确的身份证号",