diff --git a/pages/home/index.vue b/pages/home/index.vue
index ef69097..d5c5b90 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -830,6 +830,7 @@ export default {
 			const idsArray = this.getFilterData.jobSpecialLabelObjects.map((obj) => obj.id);
 			// 将数组转换为字符串
 			this.getFilterData.jobSpecialLabelIds = idsArray.join(",");
+			this.getFilterData["jobRequestLabelIds"] = idsArray.join(",");
 			// console.log("deleteJobSpecialLabel", this.getFilterData);
 			this.getList();
 		},
diff --git a/pages/person/index.vue b/pages/person/index.vue
index 0db4901..2513992 100644
--- a/pages/person/index.vue
+++ b/pages/person/index.vue
@@ -71,7 +71,7 @@
 		</view>
 
 		<!-- v-if="!userInfo.agencyId && isLogin" -->
-		<view class="g_mt_10" v-if="(!userInfo.agencyId || !applystatys) && isLogin">
+		<view class="g_mt_10" v-if="(!userInfo.agencyId || !applystatys) && userInfo.agencyId != miniAppInfo.id && isLogin">
 			<g-panel-form-item
 				:list="[
 					{
@@ -168,7 +168,7 @@
 				@clickItem="goPage('/root/merchantManagement/teamManage')"
 			/>
 		</view>
-		<view class="g_bg_f g_h_56 g_ml_12 g_mr_12 g_mt_24 g_radius_8 g_flex_row_center flex_center g_position_rela" @click="goPage('/root/merchantManagement/merchantManagement')" hover-class="thover" v-if="isAdmin">
+		<view class="g_bg_f g_h_56 g_ml_12 g_mr_12 g_mt_24 g_radius_8 g_flex_row_center flex_center g_position_rela" @click="goPage('/root/merchantManagement/merchantManagement')" hover-class="thover" v-if="isAdmin && userInfo.agencyId == miniAppInfo.id">
 			<view class="iconfont icon-shangjiahoutai g_mr_6 g_mt_2"></view>
 			<view class="g_fw_600 g_fs_17">商家管理后台</view>
 			<view v-if="hasNewResume > 0" class="g_ml_4" style="font-size: 12px; color: #ffffff; background-color: #fa3534; display: inline-flex; justify-content: center; align-items: center; line-height: 24rpx; padding: 4rpx 8rpx; border-radius: 100rpx; z-index: 9">
@@ -800,6 +800,7 @@ export default {
 				this.api.person_dataValue + "?classify=1",
 				{
 					classify: 1,
+					jobAgencyId: uni.getStorageSync("miniApp-info").id,
 				},
 				(res) => {
 					// console.log("res", res);
diff --git a/root/detail/job.vue b/root/detail/job.vue
index cff12d9..933553f 100644
--- a/root/detail/job.vue
+++ b/root/detail/job.vue
@@ -1,8 +1,6 @@
 <template>
 	<view class="p-root-detail-job g_ml_10 g_mr_10 g_mt_10 g_kuaishou">
-		 
-		<view class="g_bg_f g_radius_8 g_mb_10 g_pl_10 g_pr_10" style="width: calc(100% - 0px); margin: 0 auto; margin-bottom: 10px"
-		>
+		<view class="g_bg_f g_radius_8 g_mb_10 g_pl_10 g_pr_10" style="width: calc(100% - 0px); margin: 0 auto; margin-bottom: 10px">
 			<view class="g_flex_row_between flex_center g_h_57 g_fs_16 g_border_e_b" v-if="isJm && jobDetail.newXmf">
 				<view class="g_flex_row_start" style="flex: none">
 					<view class="g_fw_600 g_mr_4 g_flex_column_center">项目方</view>
@@ -13,7 +11,7 @@
 					</span>
 				</view>
 			</view>
-			<view class="g_flex_row_between flex_center g_fs_16" @click="showFee" >
+			<view class="g_flex_row_between flex_center g_fs_16" @click="showFee">
 				<view class="g_flex_row_start" style="flex: none">
 					<view class="g_fw_600 g_mr_4 g_h_57 g_flex_column_center">代理佣金</view>
 				</view>
@@ -79,54 +77,44 @@
 						<view class="g_fs_16 g_fw_600 g_c_f40 g_lh_1_2 g_flex_column_center" v-if="jobDetail.priceStr">
 							{{ jobDetail.priceStr }}
 						</view>
-						<view class="g_fs_14 g_c_9" v-if="(jobDetail.minMonthlyPay && jobDetail.maxMonthlyPay) && jobDetail.monthPay && jobDetail.priceStr && jobDetail.priceStr.indexOf('元/月') == -1">
+						<view class="g_fs_14 g_c_9" v-if="jobDetail.minMonthlyPay && jobDetail.maxMonthlyPay && jobDetail.monthPay && jobDetail.priceStr && jobDetail.priceStr.indexOf('元/月') == -1">
 							{{ jobDetail.monthPay ? "丨" + jobDetail.monthPay : "" }}
 						</view>
 					</view>
-					<view class="g_flex_none g_flex_column_center" style="font-size: 14px;color: #999999;">
-						招聘人数：{{ jobDetail.headcount || recruitNum }}人
-					</view>
+					<view class="g_flex_none g_flex_column_center" style="font-size: 14px; color: #999999"> 招聘人数：{{ jobDetail.headcount || recruitNum }}人 </view>
 				</view>
 				<!-- 地址 -->
-				<div style="border-top: 1px solid #eee;margin: 10px auto 0;">
-					<div style="border-radius: 8px;margin: 0px auto;padding: 8px 0;" class="bossinfo_dom">
-						<view class="m-address " 
-									hover-class="thover" 
-									v-if="(jobDetail && jobDetail.store) || (jobDetail.storeLat && jobDetail.storeLng)">
-							<div class="store-item g_flex_row_start" v-if="jobDetail && jobDetail.store" style="margin-bottom: 6px;">
-								<view class="g_flex_none" style="font-size: 14px;color: #999;">
-									工作单位：
-								</view>
+				<div style="border-top: 1px solid #eee; margin: 10px auto 0">
+					<div style="border-radius: 8px; margin: 0px auto; padding: 8px 0" class="bossinfo_dom">
+						<view class="m-address" hover-class="thover" v-if="(jobDetail && jobDetail.store) || (jobDetail.storeLat && jobDetail.storeLng)">
+							<div class="store-item g_flex_row_start" v-if="jobDetail && jobDetail.store" style="margin-bottom: 6px">
+								<view class="g_flex_none" style="font-size: 14px; color: #999"> 工作单位： </view>
 								<view class="g_flex_1 g_flex_column_center" @click="showCompanyInfo">
-									<view class="g_ell_1 g_fw_600" style="font-size: 14px;color: #000;">
+									<view class="g_ell_1 g_fw_600" style="font-size: 14px; color: #000">
 										{{ jobDetail.store.aliasName || "-" }}
 									</view>
 								</view>
 							</div>
-							<div class="store-item g_flex_row_start" v-if="jobDetail && jobDetail.store" style="margin-bottom: 6px;">
-								<view class="g_flex_none" style="font-size: 14px;color: #999;">
-									企业简介：
-								</view>
+							<div class="store-item g_flex_row_start" v-if="jobDetail && jobDetail.store" style="margin-bottom: 6px">
+								<view class="g_flex_none" style="font-size: 14px; color: #999"> 企业简介： </view>
 								<view class="g_flex_1 g_flex_column_center" @click="showCompanyInfo">
-									<view class="g_ell_2" style="font-size: 14px;color: #999;">
+									<view class="g_ell_2" style="font-size: 14px; color: #999">
 										{{ jobDetail.store.storeInfo || "-" }}
 									</view>
 								</view>
-								<view class="g_flex_none g_flex_c" style="width: 24px;" @click="showCompanyInfo">
-									<i class="iconfont icon-gengduo11 g_c_9 g_w_14 g_h_14" style="font-size: 16px;color: #999999;"></i>
+								<view class="g_flex_none g_flex_c" style="width: 24px" @click="showCompanyInfo">
+									<i class="iconfont icon-gengduo11 g_c_9 g_w_14 g_h_14" style="font-size: 16px; color: #999999"></i>
 								</view>
 							</div>
-							<div class="store-item g_flex_row_start" >
-								<view class="g_flex_none" style="font-size: 14px;color: #999;">
-									工作地点：
-								</view>
+							<div class="store-item g_flex_row_start">
+								<view class="g_flex_none" style="font-size: 14px; color: #999"> 工作地点： </view>
 								<view class="g_flex_1 g_mr_4 g_flex_column_center" @click="goAddress">
-									<view class="g_ell_2" style="font-size: 14px;color: #999;">
+									<view class="g_ell_2" style="font-size: 14px; color: #999">
 										{{ jobDetail.storeAddr || "-" }}
 									</view>
 								</view>
-								<view class="g_flex_none g_flex_c" style="width: 24px;" @click="goAddress">
-									<i class="iconfont icon-dizhi1 g_c_9 g_w_14 g_h_14" style="font-size: 18px;color: #999999;"></i>
+								<view class="g_flex_none g_flex_c" style="width: 24px" @click="goAddress">
+									<i class="iconfont icon-dizhi1 g_c_9 g_w_14 g_h_14" style="font-size: 18px; color: #999999"></i>
 								</view>
 							</div>
 						</view>
@@ -155,8 +143,8 @@
 				</view>
 				<view class="" v-if="tabInfo.active == 0">
 					<view class="g_fs_15">
-						<view @click="copyJobDetail" v-if="hasJobDetailContent" style="padding-top: 12px;">
-							<span class="desp-copy" :style="{color: themeColor, border: '1px solid ' + themeColor}">复制</span>
+						<view @click="copyJobDetail" v-if="hasJobDetailContent" style="padding-top: 12px">
+							<span class="desp-copy" :style="{ color: themeColor, border: '1px solid ' + themeColor }">复制</span>
 						</view>
 						<template v-for="(item, index) in templateArr" :key="index">
 							<view class="g_flex_row_start flex_center g_fw_600 g_mt_12 g_mb_8 g_fs_18" v-if="item.show">
@@ -195,23 +183,24 @@
 						<!-- <view class="g_fw_600 g_flex_row_start flex_center g_mb_8 g_mt_16"> <view class="g_mr_12 g_bg_main" style="width: 4px; height: 19px; border-radius: 2px"> </view>职位描述 </view> -->
 						<view class="g_c_0 g_pt_12 g_fs_18" style="white-space: pre-line">
 							<view @click="setCopy" v-if="jobDetail.jobInfoWithoutReturnFee || jobDetail.jobInfo">
-								<span class="desp-copy" :style="{color: themeColor, border: '1px solid ' + themeColor}">复制</span>
+								<span class="desp-copy" :style="{ color: themeColor, border: '1px solid ' + themeColor }">复制</span>
 							</view>
 							{{ jobDetail.jobInfoWithoutReturnFee || jobDetail.jobInfo || "-" }}
 						</view>
 					</view>
 				</view>
-				
+
 				<view class="g_flex_column_center" v-if="tabInfo.active == 2 && jobDetail.newdesc">
 					<view class="g_fs_16">
 						<view class="g_c_0 g_pt_12 g_fs_18" style="white-space: pre-line">
 							<view @click="setCops" v-if="jobDetail.newdesc != '暂无脱敏版通告'">
-								<span class="desp-copy" :style="{color: themeColor, border: '1px solid ' + themeColor}">复制</span>
+								<span class="desp-copy" :style="{ color: themeColor, border: '1px solid ' + themeColor }">复制</span>
 							</view>
-							<div :style="{
-										'margin-top':jobDetail.newdesc == '暂无脱敏版通告' ? '0' : '26px'
-									 }"
-									 :class="jobDetail.newdesc == '暂无脱敏版通告' ? 'g_flex_row_center' : ''"
+							<div
+								:style="{
+									'margin-top': jobDetail.newdesc == '暂无脱敏版通告' ? '0' : '26px',
+								}"
+								:class="jobDetail.newdesc == '暂无脱敏版通告' ? 'g_flex_row_center' : ''"
 							>
 								{{ jobDetail.newdesc || "-" }}
 							</div>
@@ -243,7 +232,7 @@
 									<view class="g_fs_12 g_c_6" style="margin-top: 4px">客服</view>
 								</button>
 							</view>
-							<view class="g_flex_none g_flex_column_center" v-if="isAdmin">
+							<view class="g_flex_none g_flex_column_center" v-if="isAdmin && userInfo.agencyId == miniAppInfo.id">
 								<button class="g_pl_0 g_pr_0 g_bg_f g_mr_12 g_w_36" hover-class="thover" style="line-height: 1; border-radius: 0" @click="gojob">
 									<icon class="iconfont icon-edit-square" style="color: #787878; line-height: 1; margin-top: -5px; font-size: 20px !important"> </icon>
 									<view class="g_fs_12 g_c_6" style="margin-top: 4px">编辑</view>
@@ -255,7 +244,6 @@
 										<view v-if="!isLogin" class="g_flex_column_center">
 											<rh-quicklogin mobileToLogin="/appLoginByTelAssistant" codeToMobile="/getWechatTel" @exportSetToken="pushSetToken('relationService')">
 												<rh-button
-													
 													:cusStyle="{
 														position: 'relative',
 														top: '-1px',
@@ -269,7 +257,6 @@
 										</view>
 										<view v-else class="g_flex_column_center">
 											<rh-button
-												
 												btnText="联系客服"
 												class="g_fw_600 g_mr_12 g_w_100"
 												size="small_auto"
@@ -287,7 +274,6 @@
 										<view v-if="!isLogin" class="">
 											<rh-quicklogin mobileToLogin="/appLoginByTelAssistant" codeToMobile="/getWechatTel" @exportSetToken="pushSetToken('record')">
 												<rh-button
-													
 													:cusStyle="{
 														position: 'relative',
 														top: '-1px',
@@ -302,7 +288,6 @@
 										</view>
 										<view v-else class="">
 											<rh-button
-												
 												:cusStyle="{
 													position: 'relative',
 													top: '-1px',
@@ -324,48 +309,33 @@
 			</view>
 		</view>
 
-
-
-
-		<div class="other-dom" style="margin-top: 12px;background-color: #fff;border-radius: 8px;">
-			<div class="g_flex_row_start" style="padding: 10px 12px 0;">
-				<div style="font-size: 16px;color: #666;" class="g_flex_none">
-					信息来源：
-				</div>
-				<div style="font-size: 16px;color: #333;margin-left: 0px;" class="g_flex_1 g_flex_column_center">
+		<div class="other-dom" style="margin-top: 12px; background-color: #fff; border-radius: 8px">
+			<div class="g_flex_row_start" style="padding: 10px 12px 0">
+				<div style="font-size: 16px; color: #666" class="g_flex_none">信息来源：</div>
+				<div style="font-size: 16px; color: #333; margin-left: 0px" class="g_flex_1 g_flex_column_center">
 					{{ fullName || "-" }}
 				</div>
 			</div>
-			<div class="g_flex_row_start" style="padding: 2px 12px 10px;">
-				<div style="font-size: 16px;color: #666;" class="g_flex_none g_flex_column_center">
-					有效期限：
-				</div>
-				<div style="font-size: 16px;color: #333;margin-left: 0px;" class="g_flex_1 g_flex_column_center">
+			<div class="g_flex_row_start" style="padding: 2px 12px 10px">
+				<div style="font-size: 16px; color: #666" class="g_flex_none g_flex_column_center">有效期限：</div>
+				<div style="font-size: 16px; color: #333; margin-left: 0px" class="g_flex_1 g_flex_column_center">
 					{{ validEndTime }}
 				</div>
 			</div>
 		</div>
 
-		<div class="other-dom" style="margin-top: 12px;background-color: #fff;border-radius: 8px;">
-			<div class="g_flex_row_start" style="padding: 10px 16px;font-size: 17px;font-weight: bold;border-bottom: 1px solid #eee;">
-				{{_title}}安全提示
-			</div>
-			<div class="" style="padding: 8px 10px 10px;color: rgba(102, 102, 102, 1);font-size: 14px;">
-				本平台严禁用工方扣押证件、收取费用、集资入股、诱导异地入职、异地参加培训、违规使用求职者简历等侵害求职者权益的违规行为，发现请<text style="color: #027aff"  @click="goReport">立即举报</text>。
-			</div>
+		<div class="other-dom" style="margin-top: 12px; background-color: #fff; border-radius: 8px">
+			<div class="g_flex_row_start" style="padding: 10px 16px; font-size: 17px; font-weight: bold; border-bottom: 1px solid #eee">{{ _title }}安全提示</div>
+			<div class="" style="padding: 8px 10px 10px; color: rgba(102, 102, 102, 1); font-size: 14px">本平台严禁用工方扣押证件、收取费用、集资入股、诱导异地入职、异地参加培训、违规使用求职者简历等侵害求职者权益的违规行为，发现请<text style="color: #027aff" @click="goReport">立即举报</text>。</div>
 		</div>
 
-		
-
-
-
 		<view class="g_h_104s"></view>
 		<view class="g_pt_10 pop-container" :class="showServicePop ? 'show' : ''" v-if="false">
 			<view class="g_p_8 g_bg_f g_border_e">
 				<view class="g_flex_row_between">
 					<view class="g_flex_row_start flex_center">
 						<view>
-							<view class="g_c_f g_flex_row_center g_fs_24 flex_center g_w_36 g_h_36 g_mr_4 g_radius_50 icon-kefu iconfont" :style="{'background-color': themeColor}" />
+							<view class="g_c_f g_flex_row_center g_fs_24 flex_center g_w_36 g_h_36 g_mr_4 g_radius_50 icon-kefu iconfont" :style="{ 'background-color': themeColor }" />
 						</view>
 						<view>
 							<view class="g_fs_14">专属招聘客服</view>
@@ -439,7 +409,7 @@
 				</view>
 
 				<!-- #endif -->
-				<rh-button  btnText="保存到相册" type="primary" @clickBtn="saveToalbum"></rh-button>
+				<rh-button btnText="保存到相册" type="primary" @clickBtn="saveToalbum"></rh-button>
 			</view>
 		</u-popup>
 		<u-popup v-model="applyPopup.isShow" mode="center" negative-top="300" :uZindex="1" border-radius="12" :closeable="true" :mask-close-able="true">
@@ -489,8 +459,6 @@
 		</u-popup>
 
 		<canvas type="2d" style="position: absolute; left: -2000px; width: 425px; height: 350px; background: #fff" id="canvasId" ref="canvasId"></canvas>
-	
-		
 	</view>
 </template>
 
@@ -524,7 +492,7 @@ export default {
 					// console.log("getWXCanvas", res);
 					wx.hideLoading();
 					resolve({
-						title: uni.getStorageSync("apply-token") && uni.getStorageSync("apply-userinfo") ? (uni.getStorageSync("apply-userinfo").user.userName +'帮你挑选了一份靠谱好工作，快来看看是不是适合你~') : '',
+						title: uni.getStorageSync("apply-token") && uni.getStorageSync("apply-userinfo") ? uni.getStorageSync("apply-userinfo").user.userName + "帮你挑选了一份靠谱好工作，快来看看是不是适合你~" : "",
 						imageUrl: res.tempFilePath,
 						path,
 					});
@@ -547,23 +515,23 @@ export default {
 					// console.log("getWXCanvas", res);
 					wx.hideLoading();
 					// 构建分享文案：职位名、单价、月薪、标签
-					let title = '';
+					let title = "";
 					if (that.jobDetail.jobName) {
-						title += that.jobDetail.jobName + ' ';
+						title += that.jobDetail.jobName + " ";
 					}
 					if (that.jobDetail.priceStr) {
-						title += that.jobDetail.priceStr + ' ';
+						title += that.jobDetail.priceStr + " ";
 					}
 					if (that.jobDetail.monthPay) {
-						title += '月薪' + that.jobDetail.monthPay + ' ';
+						title += "月薪" + that.jobDetail.monthPay + " ";
 					}
 					if (that.jobDetail.jobSpecialLabelNames && that.jobDetail.jobSpecialLabelNames.length > 0) {
-						title += that.jobDetail.jobSpecialLabelNames.join(' ');
+						title += that.jobDetail.jobSpecialLabelNames.join(" ");
 					}
 					resolve({
 						title: title,
 						imageUrl: appInfo.logo,
-						query:path,
+						query: path,
 					});
 				});
 			}),
@@ -583,10 +551,10 @@ export default {
 			themeColor: getApp().globalData.themeColor,
 			_title: getApp().globalData.title,
 			isAdmin: uni.getStorageSync("apply-userinfo").admin,
-			fullName:uni.getStorageSync("miniApp-info") && uni.getStorageSync("miniApp-info").agencyName,
-			isfensi:uni.getStorageSync("apply-userinfo") && uni.getStorageSync("apply-userinfo").isfensi,
-			isAgency:uni.getStorageSync("apply-userinfo") && uni.getStorageSync("apply-userinfo").agencyId,
-			isJm:uni.getStorageSync("apply-userinfo") && uni.getStorageSync("apply-userinfo").agencyId && uni.getStorageSync("apply-userinfo").agencyId == '114827',
+			fullName: uni.getStorageSync("miniApp-info") && uni.getStorageSync("miniApp-info").agencyName,
+			isfensi: uni.getStorageSync("apply-userinfo") && uni.getStorageSync("apply-userinfo").isfensi,
+			isAgency: uni.getStorageSync("apply-userinfo") && uni.getStorageSync("apply-userinfo").agencyId,
+			isJm: uni.getStorageSync("apply-userinfo") && uni.getStorageSync("apply-userinfo").agencyId && uni.getStorageSync("apply-userinfo").agencyId == "114827",
 			pushJobChecked: false, // 是否七天内显示
 			showPushJobPop: false,
 			showServicePop: false, // 显示客服下拉弹窗
@@ -748,7 +716,7 @@ export default {
 		this.getRecruitNum();
 		// console.log("=====================", that.api.hasSee);
 		this.getDetail().then((res) => {
-			console.log("详情页1123", res,'--',that.jobDetail);
+			console.log("详情页1123", res, "--", that.jobDetail);
 			let objMiddle = JSON.parse(res.cozeStructureRes);
 			console.log("objMiddle", objMiddle);
 			delete objMiddle["佣金"];
@@ -783,7 +751,7 @@ export default {
 			// 脱敏版 职位详情接口返回的cozeStructureRes里新增了一个safeNotice  是脱敏后的原始通告
 			// 原始版-lastNotice
 			// 标准版-jobInfo是toB标准版  jobInfoWithoutxx是toC标准版
-			that.jobDetail.newdesc = res.lastNotice || '暂无原单';  //objMiddle['safeNotice'] || '暂无脱敏版通告';				
+			that.jobDetail.newdesc = res.lastNotice || "暂无原单"; //objMiddle['safeNotice'] || '暂无脱敏版通告';
 		});
 		this.loginInfo = uni.getStorageSync("apply-userinfo");
 		if (uni.getStorageSync("apply-token")) {
@@ -815,8 +783,7 @@ export default {
 		// console.log("this.IS_CREATOR", this.IS_CREATOR);
 		this.corpUserFlag = uni.getStorageSync("apply-userinfo").corpUserFlag;
 
-
-		if(that.isJm){
+		if (that.isJm) {
 			that.tabInfo = {
 				list: [
 					{
@@ -834,7 +801,7 @@ export default {
 				],
 				active: 0,
 			};
-		}else{
+		} else {
 			that.tabInfo = {
 				list: [
 					{
@@ -850,7 +817,6 @@ export default {
 			};
 		}
 
-
 		uni.getSystemInfo({
 			success: function (res) {
 				// console.log(res);
@@ -861,8 +827,8 @@ export default {
 
 	computed: {
 		hasJobDetailContent() {
-			return this.templateArr.some(item => item.show);
-		}
+			return this.templateArr.some((item) => item.show);
+		},
 	},
 
 	methods: {
@@ -876,18 +842,18 @@ export default {
 			let now = new Date();
 			let endTime = new Date(now.getTime() + 48 * 60 * 60 * 1000);
 			let year = endTime.getFullYear();
-			let month = String(endTime.getMonth() + 1).padStart(2, '0');
-			let day = String(endTime.getDate()).padStart(2, '0');
-			let hour = String(endTime.getHours()).padStart(2, '0');
-			let minute = String(endTime.getMinutes()).padStart(2, '0');
+			let month = String(endTime.getMonth() + 1).padStart(2, "0");
+			let day = String(endTime.getDate()).padStart(2, "0");
+			let hour = String(endTime.getHours()).padStart(2, "0");
+			let minute = String(endTime.getMinutes()).padStart(2, "0");
 			this.validEndTime = `${year}年${month}月${day}日${hour}:${minute} 前有效`;
 		},
 		// 获取招聘人数（12小时内不更新，id变化时更新）
 		getRecruitNum() {
-			let storageKey = 'job_recruit_num_' + this.uid;
+			let storageKey = "job_recruit_num_" + this.uid;
 			let storedData = uni.getStorageSync(storageKey);
 			let now = new Date().getTime();
-			
+
 			if (storedData) {
 				let data = JSON.parse(storedData);
 				// 验证uid是否匹配，且12小时内不更新
@@ -896,28 +862,29 @@ export default {
 					return;
 				}
 			}
-			
+
 			// 生成新的随机数并存储（280-360之间，10的倍数）
 			let num = (Math.floor(Math.random() * 9) + 28) * 10;
 			this.recruitNum = num;
-			uni.setStorageSync(storageKey, JSON.stringify({
-				num: num,
-				timestamp: now,
-				uid: this.uid
-			}));
+			uni.setStorageSync(
+				storageKey,
+				JSON.stringify({
+					num: num,
+					timestamp: now,
+					uid: this.uid,
+				}),
+			);
 		},
 		showFee() {
 			let that = this;
 			if (uni.getStorageSync("apply-token")) {
-				if(that.isfensi != 2){
+				if (that.isfensi != 2) {
 					uni.showModal({
 						title: "",
 						content: "仅代理可见",
 						confirmText: "知道了",
 						showCancel: false,
-						success(res) {
-							
-						},
+						success(res) {},
 					});
 					return false;
 				}
@@ -939,8 +906,6 @@ export default {
 				return false;
 			}
 
-
-		
 			let content, title;
 			title = that.jobDetail.serverPrice;
 			content = that.jobDetail.returnFeeDesp;
@@ -961,8 +926,8 @@ export default {
 				url: `/root/detail/bossinfo?jobDetail=${jobDetailStr}`,
 				success: () => {},
 				fail: (err) => {
-					console.log('跳转失败', err);
-				}
+					console.log("跳转失败", err);
+				},
 			});
 		},
 		getCode(callback = () => {}) {
@@ -1152,12 +1117,12 @@ export default {
 					if (!res.hasOwnProperty("storeJobDetail")) {
 						res.storeJobDetail = {};
 					}
-					if(!res.storeDistrict && !res.storeAddr){
-						res.addss = '';
-					}else{
+					if (!res.storeDistrict && !res.storeAddr) {
+						res.addss = "";
+					} else {
 						res.addss = that.G.setJobInfoPositionv3(res.storeDistrict || res.storeAddr);
 					}
-					
+
 					// console.log("职位详情1------：", res);
 					that.isPerson = res.agencyId == uni.getStorageSync("apply-agencyId") ? true : false;
 					// res.serverPrice = that.G.setReturnFee(res.returnFee, res.returnFeeType);
@@ -1214,13 +1179,8 @@ export default {
 
 					// that.jobDetail.jobName = '三顿饭卡加斯冯老师独立开发技术的返利看打两发慷慨激昂收代理费'
 					that.jobDetail.logo = that.jobDetail.logo.indexOf("http:") > -1 ? that.jobDetail.logo.replace("http:", "https:") : that.jobDetail.logo;
-					that.jobDetail.newXmf = uni.getStorageSync('apply-agencyId') == uni.getStorageSync('pgy-agency-id') ?
-																 (res.agencyId == uni.getStorageSync('apply-agencyId') ? (res.upFullName || res.upAgencyName || res.upProviderName) : res.agencyName) : 
-																	'金马人力';
-																	
-							
-					
-					
+					that.jobDetail.newXmf = uni.getStorageSync("apply-agencyId") == uni.getStorageSync("pgy-agency-id") ? (res.agencyId == uni.getStorageSync("apply-agencyId") ? res.upFullName || res.upAgencyName || res.upProviderName : res.agencyName) : "金马人力";
+
 					setTimeout(() => {
 						that.speed = 1;
 					}, 100);
@@ -1747,23 +1707,23 @@ export default {
 		// 复制职位详情
 		copyJobDetail(e) {
 			var that = this;
-			let text = '';
+			let text = "";
 			that.templateArr.forEach((item) => {
 				if (item.show) {
-					let sectionText = '';
-					if (item.num == 1) sectionText += '一、';
-					if (item.num == 2) sectionText += '二、';
-					if (item.num == 3) sectionText += '三、';
-					if (item.num == 4) sectionText += '四、';
-					if (item.num == 5) sectionText += '五、';
-					if (item.num == 6) sectionText += '六、';
-					sectionText += item.type + '\n';
+					let sectionText = "";
+					if (item.num == 1) sectionText += "一、";
+					if (item.num == 2) sectionText += "二、";
+					if (item.num == 3) sectionText += "三、";
+					if (item.num == 4) sectionText += "四、";
+					if (item.num == 5) sectionText += "五、";
+					if (item.num == 6) sectionText += "六、";
+					sectionText += item.type + "\n";
 					item.children.forEach((inner) => {
 						if (inner.show) {
-							sectionText += inner.num + '. ' + inner.key + ': ' + inner.value + '\n';
+							sectionText += inner.num + ". " + inner.key + ": " + inner.value + "\n";
 						}
 					});
-					text += sectionText + '\n';
+					text += sectionText + "\n";
 				}
 			});
 			uni.setClipboardData({
@@ -1799,7 +1759,7 @@ export default {
 				},
 			});
 		},
-		setCops(e){
+		setCops(e) {
 			var that = this;
 			let text = that.jobDetail.newdesc;
 			uni.setClipboardData({
@@ -2091,7 +2051,7 @@ export default {
 		pushSetToken(_type) {
 			let that = this;
 			that.G.checkToken().then(() => {
-				that.getDetail().then(()=>{
+				that.getDetail().then(() => {
 					that.isLogin = true;
 					that.loginInfo = uni.getStorageSync("apply-userinfo");
 					//联系客服
@@ -2104,19 +2064,19 @@ export default {
 					} else if (_type == "pushJob") {
 						that.handlePushJob("allow");
 					}
-				})
+				});
 			});
 		},
 		setType(e) {
 			this.tabInfo.active = e;
 		},
-		gojob(){
+		gojob() {
 			let that = this;
-			if(that.isLogin){
+			if (that.isLogin) {
 				uni.navigateTo({
-					url: '/root/merchantManagement/jobForm?id=' + that.uid
+					url: "/root/merchantManagement/jobForm?id=" + that.uid,
 				});
-			}else{
+			} else {
 				uni.navigateTo({
 					url: "/root/person/loginIndex",
 				});
@@ -2124,20 +2084,23 @@ export default {
 		},
 		goIm() {
 			let that = this;
-			if(that.isJm){
+			if (that.isJm) {
 				uni.showToast({
 					title: "暂未开通客服",
 					icon: "none",
 				});
-			}else{
+			} else {
 				that.F.wyyxGet(that.api.job_get_cus + "?jobId=" + that.jobDetail.id, {}, (cusData) => {
-					uni.setStorageSync("jobim", JSON.stringify({
-						cusData: cusData,
-						jobDetail: that.jobDetail,
-						uid: that.uid,
-					}));
+					uni.setStorageSync(
+						"jobim",
+						JSON.stringify({
+							cusData: cusData,
+							jobDetail: that.jobDetail,
+							uid: that.uid,
+						}),
+					);
 					uni.navigateTo({
-						url: "/root/NEUIKit/index?item=" + (uni.getStorageSync("im-accid") + '|1|' + cusData.accid) + '&f=1',
+						url: "/root/NEUIKit/index?item=" + (uni.getStorageSync("im-accid") + "|1|" + cusData.accid) + "&f=1",
 					});
 				});
 			}
diff --git a/root/merchantManagement/child/workbench.vue b/root/merchantManagement/child/workbench.vue
index 86e99f0..4bfdcbc 100644
--- a/root/merchantManagement/child/workbench.vue
+++ b/root/merchantManagement/child/workbench.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="" style="overflow:hidden">
+	<div class="" style="overflow: hidden">
 		<!-- 今日数据 -->
 		<div class="g_bg_f g_radius_8 g_ml_10 g_mr_10 g_mt_10" v-if="isAdmin">
 			<div class="content g_flex_row_start g_h_92">
@@ -375,24 +375,30 @@ export default {
 
 					that.$forceUpdate();
 					console.log("that.applyData", that.applyData);
-				}
+				},
 			);
 		},
 		getData() {
-			this.G.Get(this.api.person_dataValue, {}, (res) => {
-				console.log(res);
-				// 空值测试
-				// for (var k in res) {
-				// 	if (typeof res[k] != "object") {
-				// 		res[k] = 0;
-				// 	} else {
-				// 		for (var j in res[k]) {
-				// 			res[k][j] = 0;
-				// 		}
-				// 	}
-				// }
-				this.map = res;
-			});
+			this.G.Get(
+				this.api.person_dataValue,
+				{
+					jobAgencyId: uni.getStorageSync("miniApp-info").id,
+				},
+				(res) => {
+					console.log(res);
+					// 空值测试
+					// for (var k in res) {
+					// 	if (typeof res[k] != "object") {
+					// 		res[k] = 0;
+					// 	} else {
+					// 		for (var j in res[k]) {
+					// 			res[k][j] = 0;
+					// 		}
+					// 	}
+					// }
+					this.map = res;
+				},
+			);
 		},
 		goDetail(e, _item) {
 			console.log("_item", _item);
diff --git a/utils/common.js b/utils/common.js
index e65cc43..3ce64ee 100644
--- a/utils/common.js
+++ b/utils/common.js
@@ -16,6 +16,7 @@ let data = {
       baseUrl: "https://daotian.matripe.com.cn",// 网络请求的基础路径
       // baseUrl: "http://192.168.3.83:8001", // 网络请求的基础路径
       // baseUrl: "http://192.168.1.3:8001",// tom3
+      // baseUrl: "http://192.168.1.58:8001",// tom
       // #ifdef MP-WEIXIN
       version: uni.getAccountInfoSync().miniProgram.version || "1.0.0",
       mapKey: 'LHQBZ-MLTEG-BO4QK-QJ2TH-NLGZJ-7GFAS',