From 2128f28f84c89b7e3809ce4bfd3f3e6d0a132f78 Mon Sep 17 00:00:00 2001
From: wangxia <779219182@qq.com>
Date: Fri, 21 Mar 2025 16:24:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=8C=E4=BD=8D=E9=A6=96=E9=A1=B5,=20?=
 =?UTF-8?q?=E8=81=8C=E4=BD=8D=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/job.js                            |   2 +-
 components/list/yiJob.vue             | 126 +++++----
 pages/home/child/filter.vue           | 122 +++++----
 pages/home/index.vue                  | 205 ++++++++++-----
 root/detail/work.vue                  | 470 +++++++++++++++++++++-------------
 root/merchantManagement/jobForm.vue   |   2 +-
 static/css/base.scss                  |   8 +-
 static/css/filtercss.css              |  12 +-
 static/image/xmf.svg                  |  10 +
 static/image/zhen.svg                 |   1 +
 utils/common.js                       |  19 +-
 uview-ui/components/u-tabs/u-tabs.vue |   1 +
 12 files changed, 599 insertions(+), 379 deletions(-)
 create mode 100644 static/image/xmf.svg
 create mode 100644 static/image/zhen.svg

diff --git a/api/job.js b/api/job.js
index 4c8ff07..b6d21d5 100644
--- a/api/job.js
+++ b/api/job.js
@@ -2,7 +2,7 @@ let jobInfo = {
 	job_list: "/assistant/custom/job/v2/list", // 职位列表
 	job_myJobList: "/yishoudan/custom/job/list", // 我的职位列表
 	job_detail: "/assistant/custom/job/v2/detail", // 职位详情
-	job_personDetail: "/yishoudan/custom/job/detailApp", // 获取自有职位详情
+	job_personDetail: "/yishoudan/custom/job/detailV2", // 获取自有职位详情
 	job_getJobQRCode: '/yishoudan/custom/job/qrcode', // 获取共享职位政策
 	job_recordJob: "/assistant/apply/handler/add", // 职位报名
 	job_watch: "/assistant/custom/job/ignore/add", // 查看职位次数
diff --git a/components/list/yiJob.vue b/components/list/yiJob.vue
index d371747..847247e 100644
--- a/components/list/yiJob.vue
+++ b/components/list/yiJob.vue
@@ -12,33 +12,31 @@
 			<g-empty :text="emptyText" style="margin-top: 30px" />
 		</view>
 		<view v-if="speed > 0" class="link">
-			<view class="">
-				<view class="g_p_10 item g_position_rela g_mb_10 g_ml_12 g_mr_12 g_bg_f g_radius_8" :class="from == 'share' ? 'g_pr_32' : ''" style="border-bottom: 1px solid #f3f3f3" v-for="(item, index) in jobArray" :key="index" @click="handleCard(item, index)">
-					<image v-if="item.recruitment == 2" src="http://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/tingzhao.svg" class="g_w_82 g_h_65" style="position: absolute; left: 50%; top: 0; transform: translateX(-50%)"> </image>
-					<view class="m-top g_flex_row_between">
-						<view class="g_flex_none g_mr_8 g_w_53 g_h_53 g_flex_c g_position_rela" style="overflow: hidden" v-if="appid != 'wxb0c590fd696b79be' && !isUseNewJob">
-							<image :src="item.logo ? item.logo : defaultLogo" class="g_w_53" mode="widthFix"></image>
-							<view class="r-obj" hover-class="none" v-if="item.recommend == 1"> 主推 </view>
-						</view>
-						<view class="g_flex_1 g_flex_column_between">
-							<view class="g_flex_1 g_flex_row_between g_lh_1">
-								<view class="g_flex_none g_flex_column_start">
-									<view class="g_ell_1 g_fs_18 g_fw_600" style="color: rgba(0, 0, 0, 0.85); max-width: 500rpx">{{ item.jobName }}</view>
-								</view>
-								<!-- {{item.cus_price}} -->
-								<view class="g_fs_14 g_flex_row_end" style="color: rgba(0, 0, 0, 0.45)">
-									<view v-if="isuse == 'fujin'">{{ Number(Number(item.distance) / 1000).toFixed(2) + "km" }} </view>
-									<view v-if="isuse != 'fujin'">{{ dateUtil.timeShowXXX(item.updateTime) }}</view>
+			<block class="" v-for="(item, index) in jobArray" :key="index">
+				<view class="item g_position_rela g_mb_10 g_ml_12 g_mr_12 g_bg_f g_radius_8" :class="from == 'share' ? 'g_pr_32' : ''" style="border-bottom: 1px solid #f3f3f3" @click="handleCard(item, index)">
+					<view class="g_p_10" hover-class="none" hover-stop-propagation="false">
+						<image v-if="item.recruitment == 2" src="http://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/tingzhao.svg" class="g_w_82 g_h_65" style="position: absolute; left: 50%; top: 0; transform: translateX(-50%)"> </image>
+						<view class="m-top g_flex_row_between">
+							<view class="g_flex_1 g_flex_column_between">
+								<view class="g_flex_1 g_flex_row_between g_lh_1">
+									<view class="g_flex_none g_flex_row_start flex_center">
+										<img class="g_w_32 g_h_16 g_mr_4" v-if="item.picked == 1" src="../../static/image/zhen.svg" alt="" />
+										<view class="g_ell_1 g_fs_18 g_fw_600" style="color: rgba(0, 0, 0, 0.85); max-width: 500rpx">{{ item.jobName }}</view>
+									</view>
+									<!-- {{item.cus_price}} -->
+									<view class="g_fs_14 g_flex_row_end" style="color: rgba(0, 0, 0, 0.45)">
+										<view v-if="isuse == 'fujin'">{{ Number(Number(item.distance) / 1000).toFixed(2) + "km" }} </view>
+										<view v-if="isuse != 'fujin'">{{ dateUtil.timeShowXXX(item.updateTime) }}</view>
+									</view>
 								</view>
-							</view>
 
-							<view class="g_flex_none g_flex_row_between g_mt_6">
-								<view class="g_flex_none g_flex_row_start g_fs_14" style="color: rgba(0, 0, 0, 0.45)">
-									<view class="g_ell_1" style="max-width: 124px; margin-right: 2px" hover-class="none" hover-stop-propagation="false"> {{ item.district }}{{ item.district ? "丨" : "" }} </view>
-									{{ item.gender + "丨" + item.age }}
-								</view>
-								<view class="g_flex_none g_flex_column_center b_btn" @click.stop="openApplyPop(item, index)" v-if="false"> 立即报名 </view>
-								<!-- <view class="g_flex_row_start g_fs_12 g_pr_4" v-if="from == 'tob'" style="background: linear-gradient(138deg, #fde0ad 22%, #fac474); border-radius: 2px; color: #754300; height: 20px">
+								<view class="g_flex_none g_flex_row_between g_mt_6">
+									<view class="g_flex_none g_flex_row_start g_fs_14" style="color: rgba(0, 0, 0, 0.45)">
+										<view class="g_ell_1" style="max-width: 124px; margin-right: 2px" hover-class="none" hover-stop-propagation="false"> {{ item.district }}{{ item.district ? "丨" : "" }} </view>
+										{{ item.gender + "丨" + item.age }}
+									</view>
+									<view class="g_flex_none g_flex_column_center b_btn" @click.stop="openApplyPop(item, index)" v-if="false"> 立即报名 </view>
+									<!-- <view class="g_flex_row_start g_fs_12 g_pr_4" v-if="from == 'tob'" style="background: linear-gradient(138deg, #fde0ad 22%, #fac474); border-radius: 2px; color: #754300; height: 20px">
 									<view class>
 										<image class="g_mr_4" style="width: 20px; height: 20px; display: block" src="../../static/image/fee.svg" mode="aspecFill" lazy-load="false"></image>
 									</view>
@@ -46,51 +44,67 @@
 										{{ item.fuWuFei }}
 									</view>
 								</view> -->
-								<!-- <view v-else-if="appInfo.applyNumDisplay == 1" class="g_flex_none g_flex_column_center g_fs_14" style="color: rgba(0, 0, 0, 0.45)">
+									<!-- <view v-else-if="appInfo.applyNumDisplay == 1" class="g_flex_none g_flex_column_center g_fs_14" style="color: rgba(0, 0, 0, 0.45)">
 									报名{{ item.id % 8 == 0 ? "200+" : (item.id % 8) * 100 + "+" }}
 								</view> -->
+								</view>
 							</view>
 						</view>
-					</view>
-					<view class="m-bottom g_flex_row_between g_mt_8">
-						<view class="g_flex_none g_mr_8 g_w_53" v-if="appid != 'wxb0c590fd696b79be' && !isUseNewJob">
-							<view class="collect g_flex_row_center flex_center" @click.stop="handleCollect(item, index)" :class="item.collected == 0 ? '' : 'collectred'" style="width: 52px">
-								<view class="g_flex_column_center g_h_20">
-									<icon class="iconfont icon-shoucang icon 0" style="color: #888" v-if="item.collected == 0"></icon>
-									<icon class="iconfont icon-yishoucang g_c_f40 icon 1" style v-else></icon>
+						<view class="m-bottom g_flex_row_between g_mt_8">
+							<view class="g_flex_none g_mr_8 g_w_53" v-if="appid != 'wxb0c590fd696b79be' && !isUseNewJob">
+								<view class="collect g_flex_row_center flex_center" @click.stop="handleCollect(item, index)" :class="item.collected == 0 ? '' : 'collectred'" style="width: 52px">
+									<view class="g_flex_column_center g_h_20">
+										<icon class="iconfont icon-shoucang icon 0" style="color: #888" v-if="item.collected == 0"></icon>
+										<icon class="iconfont icon-yishoucang g_c_f40 icon 1" style v-else></icon>
+									</view>
+									<view class="g_flex_column_center g_h_20">
+										<text class="f10" :class="item.collected == 0 ? 'g_c_8' : 'g_c_f40'" style="margin-left: 2px; height: 20px; line-height: 20px">
+											{{ item.collected == 0 ? "收藏" : "已收藏" }}
+										</text>
+									</view>
 								</view>
-								<view class="g_flex_column_center g_h_20">
-									<text class="f10" :class="item.collected == 0 ? 'g_c_8' : 'g_c_f40'" style="margin-left: 2px; height: 20px; line-height: 20px">
-										{{ item.collected == 0 ? "收藏" : "已收藏" }}
-									</text>
+							</view>
+							<view class="g_flex_1 g_flex_row_between flex_center">
+								<view class="g_flex_1 g_flex_row_between">
+									<view class="g_flex_row_start_none g_flex_1" style="max-width: 75%; flex-wrap: wrap; height: 22px; overflow: hidden">
+										<view class="label_btn" v-for="(itm, inx) in item.jobSpecialLabelNameArray" :key="inx">{{ itm }}</view>
+										<view class="label_btn" v-if="item.jobSpecialLabelNameArray.length == 0" hover-class="none" hover-stop-propagation="false"> 暂无特色 </view>
+									</view>
 								</view>
 							</view>
 						</view>
-						<view class="g_flex_1 g_flex_row_between flex_center">
-							<view class="g_flex_1 g_flex_row_between">
-								<view class="g_flex_row_start_none g_flex_1" style="max-width: 75%; flex-wrap: wrap; height: 22px; overflow: hidden">
-									<view class="label_btn" v-for="(itm, inx) in item.jobSpecialLabelNameArray" :key="inx">{{ itm }}</view>
-									<view class="label_btn" v-if="item.jobSpecialLabelNameArray.length == 0" hover-class="none" hover-stop-propagation="false"> 暂无特色 </view>
+						<view class="g_mt_6" hover-class="none" hover-stop-propagation="false">
+							<!-- v-if="isLogin" -->
+							<view class="g_flex_row_between flex_center g_fs_18 g_c_f40 g_fw_600">
+								<rich-text class="g_lh_1" :nodes="item.cus_price" v-if="item.cus_price != '月薪'"></rich-text>
+								<view v-else>{{ item.monthlyPay }}<span class="g_fs_14" hover-class="none" hover-stop-propagation="false"> 元/月 </span> </view>
+								<view class="g_flex_row_start g_fs_12 g_pr_4 g_h_20 g_fw_400" style="background: linear-gradient(138deg, #fde0ad 22%, #fac474); border-radius: 2px; color: #754300; line-height: 20px">
+									<view class>
+										<image class="g_mr_4" style="width: 20px; height: 20px; display: block" src="https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/fee.svg" mode="aspecFill" lazy-load="false"></image>
+									</view>
+									<view class="g_fs_13" v-if="!isLogin">登录查看</view>
+									<view class="g_fs_13" v-else-if="userinfo.agencyStatus == 1">{{ item.fuWuFei || "详询客服" }}</view>
+									<view class="biggerSize2 g_fs_13" v-else @click="tobeAgencyToast">{{ "仅代理可见" }}</view>
 								</view>
+								<!-- <text class="g_fs_14">元/月</text> -->
 							</view>
-						</view>
-					</view>
-					<view class="g_mt_6" hover-class="none" hover-stop-propagation="false">
-						<!-- v-if="isLogin" -->
-						<view class="g_flex_column_start g_fs_22 g_c_f40 g_fw_600">
-							<rich-text class="g_lh_1" :nodes="item.cus_price" v-if="item.cus_price != '月薪'"></rich-text>
-							<view v-else>{{ item.monthlyPay }}<span class="g_fs_14" hover-class="none" hover-stop-propagation="false"> 元/月 </span> </view>
-							<!-- <text class="g_fs_14">元/月</text> -->
-						</view>
-						<!-- <view class="g_flex_column_start g_fs_20 g_c_f40 g_c_9" v-else>
+
+							<!-- <view class="g_flex_column_start g_fs_20 g_c_f40 g_c_9" v-else>
 							<text class="g_fs_14">登录后查看</text>
 						</view> -->
+						</view>
+						<view class="checkBox" hover-class="none" v-if="from == 'share'" @click.stop="checkJob(item)">
+							<checkbox class="biggerSize" style="transform: scale(0.8, 0.8)" color="g_c_main" :checked="item.checked" :value="item.checked"></checkbox>
+						</view>
 					</view>
-					<view class="checkBox" hover-class="none" v-if="from == 'share'" @click.stop="checkJob(item)">
-						<checkbox class="biggerSize" style="transform: scale(0.8, 0.8)" color="g_c_main" :checked="item.checked" :value="item.checked"></checkbox>
+					<view class="g_border_e_t g_p_8 g_flex_row_start" v-if="userinfo.corpUserFlag" hover-class="none" hover-stop-propagation="false">
+						<view class="g_c_6 g_fs_12 g_pr_4 g_radius_4 g_flex_row_start flex_center" style="background: #f1faff;" hover-class="none" hover-stop-propagation="false">
+							<img class="g_w_33 g_h_22 g_mr_4" src="../../static/image/xmf.svg" alt="" />
+							{{ item.supplierName || "-" }}
+						</view>
 					</view>
 				</view>
-			</view>
+			</block>
 			<view class="g_mt_32 g_pb_32 g_c_9 g_pl_12" v-if="isShowLoginBtn" hover-class="none">
 				<view class="" hover-class="none" hover-stop-propagation="false"> 未登录时只能使用部分功能，申请加入稻田即可使用更多功能。</view>
 				<view class="g_text_c g_c_sub g_mt_24 g_fs_14" hover-class="none" hover-stop-propagation="false">
@@ -126,6 +140,7 @@ export default {
 	},
 	data() {
 		return {
+      userinfo: uni.getStorageSync("apply-userinfo"),
 			isUseNewJob: getApp().globalData.isUseNewJob,
 			localBaseImg: this.G.store().localBaseImg,
 			appid: getApp().globalData.appid,
@@ -215,6 +230,7 @@ export default {
 	},
 	created() {
 		let that = this;
+		console.log(getApp().globalData);
 		that.defaultLogo = uni.getStorageSync("miniApp-info").logo;
 		this.jobArray = this.list;
 		if (uni.getStorageSync("apply-token")) {
diff --git a/pages/home/child/filter.vue b/pages/home/child/filter.vue
index 48aa7e0..62dddbe 100644
--- a/pages/home/child/filter.vue
+++ b/pages/home/child/filter.vue
@@ -1,87 +1,83 @@
 <template>
-	<div>
-		<view class="gjFixed" @click.stop="doNothing" @touchmove.stop.prevent="doNothing">
-			<view class="filterContainer filterBox" style hover-class="none" hover-stop-propagation="false">
-				<scroll-view class style="padding: 0; background-color: #f5f5f5" scroll-y hover-class="none" hover-stop-propagation="false">
-					<template v-for="item in anchorList">
-						<view :class="item.id == filterTo ? 'filterActive' : ''" class="g_c_3 g_fw_600" style="width: 84px; padding: 12px 0" @click="goAnchor(item)" hover-class="none" hover-stop-propagation="false">{{ item.name }}</view>
-					</template>
-				</scroll-view>
-				<scroll-view class=" " :data-filter-to="filterTo" :scroll-into-view="filterTo" scroll-with-animation style="width: calc(100% - 100px); padding: 8px" scroll-y>
-					<view style="padding: 0 10px">
-						<view class="sub" id="age" hover-class="none" hover-stop-propagation="false">
-							<view class="title">年龄</view>
-							<view class="content">
-								<slider-range style="width: 100vw" :value="rangeValue" :min="rangeMin" :max="rangMax" :step="1" :bar-height="3" :height="30" :format="format" :block-size="26" background-color="#e9e9e9" :active-color="appid != 'wxb0c590fd696b79be' ? '#3578f6' : '#ff4400'" :decorationVisible="true" @change="handleRangeChange"></slider-range>
-							</view>
+	<view class="gjFixed" @click.stop @touchmove.stop.prevent>
+		<view class="filterContainer filterBox" style hover-class="none" hover-stop-propagation="false">
+			<scroll-view class style="padding: 0; background-color: #f5f5f5" scroll-y hover-class="none" hover-stop-propagation="false">
+				<template v-for="item in anchorList">
+					<view :class="item.id == filterTo ? 'filterActive' : ''" class="g_c_3 g_fw_600" style="width: 84px; padding: 12px 0" @click="goAnchor(item)" hover-class="none" hover-stop-propagation="false">{{ item.name }}</view>
+				</template>
+			</scroll-view>
+			<scroll-view class=" " :data-filter-to="filterTo" :scroll-into-view="filterTo" scroll-with-animation style="width: calc(100% - 100px); padding: 8px" scroll-y>
+				<view style="padding: 0 10px">
+					<view class="sub" id="age" hover-class="none" hover-stop-propagation="false">
+						<view class="title">年龄</view>
+						<view class="content">
+							<slider-range style="width: 100vw" :value="rangeValue" :min="rangeMin" :max="rangMax" :step="1" :bar-height="3" :height="30" :format="format" :block-size="26" background-color="#e9e9e9" :active-color="appid != 'wxb0c590fd696b79be' ? '#3578f6' : '#3578f6'" :decorationVisible="true" @change="handleRangeChange"></slider-range>
 						</view>
+					</view>
 
-						<view class="sub" id="gender" hover-class="none" hover-stop-propagation="false">
-							<view class="title">性别</view>
-							<view class="content">
-								<span @click.stop="setActive($event, item.id, index, 'sex')" :class="item.active == item.id ? 'active' : ''" hover-class="none" :hover-stop-propagation="false" v-for="(item, index) in filterData.sex" :key="index">
-									{{ item.name }}
-								</span>
-							</view>
+					<view class="sub" id="gender" hover-class="none" hover-stop-propagation="false">
+						<view class="title">性别</view>
+						<view class="content">
+							<span @click.stop="setActive($event, item.id, index, 'sex')" :class="item.active == item.id ? 'active' : ''" hover-class="none" :hover-stop-propagation="false" v-for="(item, index) in filterData.sex" :key="index">
+								{{ item.name }}
+							</span>
 						</view>
+					</view>
 
-						<!-- <view class="sub" id="class" hover-class="none" hover-stop-propagation="false">
+					<!-- <view class="sub" id="class" hover-class="none" hover-stop-propagation="false">
 							<view class="title">分类</view>
 							<view class="content">
 								<span @click.stop="setActive($event, item.id, index, 'classifyList')" :class="item.active != 0 ? 'active' : ''" hover-class="none" :hover-stop-propagation="false" v-for="(item, index) in filterData.classifyList" :key="index"> {{ item.name }}</span>
 							</view>
 						</view> -->
 
-						<view class="sub" id="xzfl" hover-class="none" hover-stop-propagation="false">
-							<view class="title">薪资待遇</view>
-							<view class="content">
-								<span @click="clearArray(1)" :class="filterData.jobFilter.tagArray1.some((item) => item.active != 0) ? '' : 'active'">不限</span>
-								<span @click.stop="setActive($event, item.id, index, 'tagArray1')" :class="item.active != 0 ? 'active' : ''" hover-class="none" :hover-stop-propagation="false" v-for="(item, index) in filterData.jobFilter.tagArray1" :key="index"> {{ item.name }}</span>
-							</view>
+					<view class="sub" id="xzfl" hover-class="none" hover-stop-propagation="false">
+						<view class="title">薪资待遇</view>
+						<view class="content">
+							<span @click="clearArray(1)" :class="filterData.jobFilter.tagArray1.some((item) => item.active != 0) ? '' : 'active'">不限</span>
+							<span @click.stop="setActive($event, item.id, index, 'tagArray1')" :class="item.active != 0 ? 'active' : ''" hover-class="none" :hover-stop-propagation="false" v-for="(item, index) in filterData.jobFilter.tagArray1" :key="index"> {{ item.name }}</span>
 						</view>
+					</view>
 
-						<view class="sub" id="ssbz" hover-class="none" hover-stop-propagation="false">
-							<view class="title">吃饭住宿</view>
-							<view class="content">
-								<span @click="clearArray(3)" :class="filterData.jobFilter.tagArray3.some((item) => item.active != 0) ? '' : 'active'">不限</span>
-								<span @click.stop="setActive($event, item.id, index, 'tagArray3')" :class="item.active != 0 ? 'active' : ''" hover-class="none" :hover-stop-propagation="false" v-for="(item, index) in filterData.jobFilter.tagArray3" :key="index"> {{ item.name }}</span>
-							</view>
+					<view class="sub" id="ssbz" hover-class="none" hover-stop-propagation="false">
+						<view class="title">吃饭住宿</view>
+						<view class="content">
+							<span @click="clearArray(3)" :class="filterData.jobFilter.tagArray3.some((item) => item.active != 0) ? '' : 'active'">不限</span>
+							<span @click.stop="setActive($event, item.id, index, 'tagArray3')" :class="item.active != 0 ? 'active' : ''" hover-class="none" :hover-stop-propagation="false" v-for="(item, index) in filterData.jobFilter.tagArray3" :key="index"> {{ item.name }}</span>
 						</view>
+					</view>
 
-						<view class="sub" id="bzxx" hover-class="none" hover-stop-propagation="false">
-							<view class="title">工作休息</view>
-							<view class="content">
-								<span @click="clearArray(0)" :class="filterData.jobFilter.tagArray0.some((item) => item.active != 0) ? '' : 'active'">不限</span>
-								<span @click.stop="setActive($event, item.id, index, 'tagArray0')" :class="item.active != 0 ? 'active' : ''" hover-class="none" :hover-stop-propagation="false" v-for="(item, index) in filterData.jobFilter.tagArray0" :key="index"> {{ item.name }}</span>
-							</view>
+					<view class="sub" id="bzxx" hover-class="none" hover-stop-propagation="false">
+						<view class="title">工作休息</view>
+						<view class="content">
+							<span @click="clearArray(0)" :class="filterData.jobFilter.tagArray0.some((item) => item.active != 0) ? '' : 'active'">不限</span>
+							<span @click.stop="setActive($event, item.id, index, 'tagArray0')" :class="item.active != 0 ? 'active' : ''" hover-class="none" :hover-stop-propagation="false" v-for="(item, index) in filterData.jobFilter.tagArray0" :key="index"> {{ item.name }}</span>
 						</view>
+					</view>
 
-						<view class="sub" id="msts" hover-class="none" hover-stop-propagation="false">
-							<view class="title">面试特色</view>
-							<view class="content">
-								<span @click="clearArray(4)" :class="filterData.jobFilter.tagArray4.some((item) => item.active != 0) ? '' : 'active'">不限</span>
-								<span @click.stop="setActive($event, item.id, index, 'tagArray4')" :class="item.active != 0 ? 'active' : ''" hover-class="none" :hover-stop-propagation="false" v-for="(item, index) in filterData.jobFilter.tagArray4" :key="index"> {{ item.name }}</span>
-							</view>
+					<view class="sub" id="msts" hover-class="none" hover-stop-propagation="false">
+						<view class="title">面试特色</view>
+						<view class="content">
+							<span @click="clearArray(4)" :class="filterData.jobFilter.tagArray4.some((item) => item.active != 0) ? '' : 'active'">不限</span>
+							<span @click.stop="setActive($event, item.id, index, 'tagArray4')" :class="item.active != 0 ? 'active' : ''" hover-class="none" :hover-stop-propagation="false" v-for="(item, index) in filterData.jobFilter.tagArray4" :key="index"> {{ item.name }}</span>
 						</view>
+					</view>
 
-						<view class="sub" id="qtts" hover-class="none" hover-stop-propagation="false">
-							<view class="title">其它特色</view>
-							<view class="content">
-								<span @click="clearArray(2)" :class="filterData.jobFilter.tagArray2.some((item) => item.active != 0) ? '' : 'active'">不限</span>
-								<span @click.stop="setActive($event, item.id, index, 'tagArray2')" :class="item.active == item.id ? 'active' : ''" hover-class="none" :hover-stop-propagation="false" v-for="(item, index) in filterData.jobFilter.tagArray2" :key="index"> {{ item.name }}</span>
-							</view>
+					<view class="sub" id="qtts" hover-class="none" hover-stop-propagation="false">
+						<view class="title">其它特色</view>
+						<view class="content">
+							<span @click="clearArray(2)" :class="filterData.jobFilter.tagArray2.some((item) => item.active != 0) ? '' : 'active'">不限</span>
+							<span @click.stop="setActive($event, item.id, index, 'tagArray2')" :class="item.active == item.id ? 'active' : ''" hover-class="none" :hover-stop-propagation="false" v-for="(item, index) in filterData.jobFilter.tagArray2" :key="index"> {{ item.name }}</span>
 						</view>
 					</view>
-				</scroll-view>
-			</view>
-			<view class="btnBox bt1" catchtap>
-				<button class="clearFilter" data-type="innerclear" @click="clearFilter">清除</button>
-				<button class="normalBtn loginOut" @click="toList">确定</button>
-			</view>
+				</view>
+			</scroll-view>
 		</view>
-
-		<!-- aaa -->
-	</div>
+		<view class="btnBox bt1" catchtap>
+			<button class="clearFilter" data-type="innerclear" @click="clearFilter">清除</button>
+			<button class="normalBtn loginOut" @click="toList">确定</button>
+		</view>
+	</view>
 </template>
 
 <script>
@@ -392,7 +388,7 @@ export default {
 		getType() {
 			var that = this;
 			that.G.Get(
-				 that.api.yi_job_type_new,
+				that.api.yi_job_type_new,
 				{},
 				(res) => {
 					that.filterData.classifyList = res.labels.map((label) => ({
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 022c163..a917f10 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -16,8 +16,7 @@
 
 			<!-- 列表区 -->
 			<!--  -->
-
-			<scroll-view class="m-list" id="listBox" :scroll-into-view="scrollTo" style="height: calc(100vh - 72px)" :scroll-y="true" @scrolltolower="reachBottom">
+			<scroll-view class="m-list" id="listBox" :refresher-enabled="true" :refresher-triggered="isTrigger" @refresherrefresh="refreshJobList" :scroll-into-view="scrollTo" style="height: calc(100vh - 48px)" :scroll-y="true" @scrolltolower="reachBottom">
 				<!-- #ifdef MP-WEIXIN -->
 				<view class="g_position_rela g_flex_row_center g_mt_10">
 					<view class="the_city g_flex_column_center" style hover-class="thover" @click="goCity">
@@ -31,8 +30,8 @@
 
 					<!-- 搜索区 -->
 					<view class="m-search g_p_10 g_pt_8 g_position_abso bg_shawdoc g_flex_1" style="top: 0" id="searchInputBox">
-						<u-search height="40" v-model="keyword" class="g_flex_1" placeholder="搜索职位名称" bg-color="#fff" :show-action="false" placeholder-class="g_c_c" search-icon-color="#999999" :maxlength="20"></u-search>
-						<view class="g_w_all g_h_40 g_position_abso" style="left: 0; z-index: 9999" @click.stop="goSearch"> </view>
+						<u-search height="40" v-model="keyword" class="g_flex_1" placeholder="搜索职位名称" bg-color="#fff" :show-action="false" placeholder-class="g_c_c" search-icon-color="#999999" :maxlength="20" @clear="searchJob" @btnSearch="searchJob"></u-search>
+						<!-- <view class="g_w_all g_h_40 g_position_abso" style="left: 0; z-index: 9999" @click.stop="goSearch"> </view> -->
 					</view>
 				</view>
 				<!-- #endif -->
@@ -55,14 +54,14 @@
 						</view>
 						<view class="g_flex_none g_flex_column_center g_fs_17 g_pr_26 g_pb_4" style="color: #576b95; text-decoration: underline" @click="openPop"> 筛选 </view>
 					</view>
-					<g-yi-list-job :pt="tabInfo.active == 0 ? 0 : 120" from="home" @uploadList="getList" class="g_h_all" :list="query.list" @shareJob="shareJob" :loading="loading" :speed="speed" :query="query" :isShowLoginBtn="isLogin ? false : true" :emptyText="isLogin ? (tabInfo.active == 0 ? '嘿，这里还没有数据呢' : '您还未收藏职位，快去试试收藏职位吧') : '您还有没有登录，请登录后查看职位'" />
+					<g-yi-list-job :pt="tabInfo.active == 0 ? 0 : 120" from="home" @uploadList="getList" class="" :list="query.list" @shareJob="shareJob" :loading="loading" :speed="speed" :query="query" :isShowLoginBtn="isLogin ? false : true" :emptyText="isLogin ? (tabInfo.active == 0 ? '嘿，这里还没有数据呢' : '您还未收藏职位，快去试试收藏职位吧') : '您还有没有登录，请登录后查看所有职位'" />
 				</view>
 				<!-- #endif -->
 				<!-- #ifdef MP-WEIXIN -->
 				<view>
 					<view class="g_mt_10">
 						<!-- 推广区 -->
-						<view class="g_ml_10 g_mr_10" hover-class="none" hover-stop-propagation="false">
+						<view class="g_ml_10 g_mr_10">
 							<image class="g_w_all g_h_70 g_radius_8" src="https://matripe-cms.oss-cn-beijing.aliyuncs.com/2023-11-17/1a1df19f-89f5-4a8d-8888-3b050badb6c1_banner-02.jpg" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""> </image>
 						</view>
 					</view>
@@ -70,9 +69,18 @@
 						<view class="g_flex_1">
 							<u-tabs bg-color="transparent" from="index" :list="tabInfo.list" :is-scroll="true" :current="tabInfo.active" :active-color="globalData.themeColor" bar-width="64" bar-height="6" @change="handleUpdateTab" font-size="34" duration="0.05" height="76"></u-tabs>
 						</view>
-						<view v-if="true || (isMember && hasPermission)" class="g_mr_8" @click="goShare" hover-class="none" hover-stop-propagation="false"> 批量分享 </view>
-
-						<!-- <view class="g_flex_none g_flex_column_center g_fs_17 g_pr_26 g_pb_4" style="color: #576b95; text-decoration: underline" @click="openPop"> 筛选 </view> -->
+						<!-- <view v-if="true || (isMember && hasPermission)" class="g_mr_8" @click="goShare" > 批量分享 </view> -->
+
+						<view class="csbf" @click="jobSort">
+							{{ sortList.list[sortList.active].showName }}
+							<span class="iconfont icon-shouqi g_fs_12 g_c_9 fst g_ml_4" v-if="jobSortShow == 'special'"></span>
+							<span class="iconfont icon-zhankai g_fs_12 g_c_9 fst g_ml_4" v-if="jobSortShow != 'special'"></span>
+							<view class="sortMask" v-if="jobSortShow">
+								<view class="sortContainer" style="overflow: hidden" @click.stop>
+									<view v-for="(item, index) in sortList.list" @click="sortJob(index)" :key="index" :class="sortList.active == index ? 'g_border_main g_c_main' : 'g_border_f'" class="g_fs_16 g_fw_600 g_mt_16 g_bg_f" style="border-radius: 30px; padding: 8px 16px">{{ item.name }}</view>
+								</view>
+							</view>
+						</view>
 						<view class="csbf" @click="chooseNl" data-type="special">
 							筛选
 							<span class="iconfont icon-shouqi g_fs_12 g_c_9 fst g_ml_4" v-if="whichOneShow == 'special'"></span>
@@ -80,22 +88,22 @@
 							<filter v-show="whichOneShow == 'special'" ref="filterChild" :getFilterDataNew="getFilterDataNew" @filterObj="receiveFromChild"></filter>
 						</view>
 						<scroll-view class="filterTag display-flex bt1" v-if="getFilterData.jobCategoryLabelIds != '' || getFilterData.jobRequestLabelIds != '' || getFilterData.sex != '-1' || (getFilterData.ageRangeStr && getFilterData.ageRangeStr != '16-60')" scroll-x="true" scroll-y="false" scroll-top="0" scroll-left="0" scroll-into-view scroll-with-animation="false" enable-flex enable-back-to-top="false">
-							<view class="display-flex" hover-class="none" hover-stop-propagation="false">
-								<view class="tc genderTag f14 por" style="min-width: 60px" v-if="getFilterData.ageRangeStr != '' && getFilterData.ageRangeStr != '16-60'" hover-class="none" hover-stop-propagation="false">
-									<view class="por" hover-class="none" hover-stop-propagation="false" @click.stop="deleteAge">
+							<view class="display-flex">
+								<view class="tc genderTag f14 por" style="min-width: 60px" v-if="getFilterData.ageRangeStr != '' && getFilterData.ageRangeStr != '16-60'">
+									<view class="por" @click.stop="deleteAge">
 										{{ getFilterData.ageRangeStr }}
 										<view class="clear_icon iconfont icon-dianji"></view>
 									</view>
 								</view>
 
-								<view class="tc genderTag f14 por" style="min-width: 60px" v-if="getFilterData.sex != '-1'" hover-class="none" hover-stop-propagation="false">
-									<view class="por" hover-class="none" hover-stop-propagation="false" @click.stop="deleteSex">
+								<view class="tc genderTag f14 por" style="min-width: 60px" v-if="getFilterData.sex != '-1'">
+									<view class="por" @click.stop="deleteSex">
 										{{ getFilterData.sex == 1 ? "收男工" : getFilterData.sex == 2 ? "收女工" : getFilterData.sex == 3 ? "男女都收" : "" }}
 										<!-- {{getFilterData.jobCategoryLabelObjects.length > 0}} {{getFilterData.jobSpecialLabelObjects.length > 0}} -->
 										<view class="clear_icon iconfont icon-dianji"></view>
 									</view>
 								</view>
-								<view class="brandTag ml8" v-if="getFilterData.jobCategoryLabelObjects">
+								<view class="brandTag ml8" v-if="getFilterData.jobCategoryLabelObjects.length > 0">
 									<block v-for="(item, index) in getFilterData.jobCategoryLabelObjects" :key="index">
 										<view class="por" @click.stop="deleteJobCategoryLabel(item.id)">
 											{{ item.name }}
@@ -121,14 +129,14 @@
                   </block>
                 </view> -->
 							</view>
-							<view class="clear" @click.stop="clearFilter1" data-type="outerClear" hover-class="none" hover-stop-propagation="false">
+							<view class="clear" @click.stop="clearFilter1" data-type="outerClear">
 								<span class="iconfont icon-shanchu f14"></span>
 								清除
 							</view>
 						</scroll-view>
 					</view>
 					<!-- :isuse="tabInfo.active == 1 ? 'fujin' : 'rijie'" -->
-					<g-yi-list-job :pt="tabInfo.active == 0 ? 0 : 120" from="home" class="g_h_all" :list="query.list" @clickCard="goDetail" @successLogin="successLogin" :loading="loading" :speed="speed" :query="query" :isShowLoginBtn="isLogin ? false : true" :emptyText="isLogin ? (tabInfo.active == 0 ? '嘿，这里还没有数据呢' : '您还未收藏职位，快去试试收藏职位吧') : '您还有没有登录，请登录后查看职位'" />
+					<g-yi-list-job :pt="tabInfo.active == 0 ? 0 : 120" from="home" class="g_h_all" :list="query.list" @clickCard="goDetail" @successLogin="successLogin" :loading="loading" :speed="speed" :query="query" :isShowLoginBtn="isLogin ? false : true" :emptyText="isLogin ? (tabInfo.active == 0 ? '嘿，这里还没有数据呢' : '您还未收藏职位，快去试试收藏职位吧') : '您还有没有登录，请登录后查看所有职位'" />
 				</view>
 				<!-- #endif -->
 			</scroll-view>
@@ -188,9 +196,11 @@ export default {
 	},
 	data() {
 		return {
-      globalData:getApp().globalData,
+			globalData: getApp().globalData,
 			isUseNewJob: getApp().globalData.isUseNewJob,
 			appid: getApp().globalData.appId,
+			isTrigger: false,
+			jobSortShow: false,
 			selectedCity: "全国",
 			envVersion: uni.getStorageSync("ENV_VERSION"), // 小程序环境判断
 			isMember: uni.getStorageSync("IS_MINIAPP_MEMBER"), // 登陆者是否当前小程序成员的判断
@@ -239,36 +249,48 @@ export default {
 				size: 50,
 				list: [],
 				isFinish: -1,
-				ujc: 0, // 0 全部 1收藏
-				sortTag: 0,
+				ucj: 0, // 0 全部 1收藏
+				sortTag: 1,
+				picked: "",
 			},
 			keyword: "",
 			tabInfo: {
 				list: [
 					{
 						name: "全部",
-						num: 0,
-						tip: 0,
-						classify: 2,
+						key: "0",
+						picked: "",
 					},
 					{
-						name: "工价",
-						num: 0,
-						tip: 0,
-						classify: 3,
+						name: "甄选",
+						key: "1",
+						picked: "1",
+					},
+					{
+						name: "三方",
+						key: "2",
+						picked: "0",
+					},
+				],
+				active: 0,
+			},
+			sortList: {
+				list: [
+					{
+						name: "按工价",
+						key: "1",
+						showName: "工价",
+					},
+					{
+						name: "按佣金",
+						key: "3",
+						showName: "佣金",
+					},
+					{
+						name: "按时间",
+						key: "2",
+						showName: "时间",
 					},
-					// {
-					// 	name: "收藏",
-					// 	num: 0,
-					// 	tip: 1,
-					// 	classify: 3,
-					// },
-					// {
-					// 	name: "附近",
-					// 	num: 0,
-					// 	tip: 2,
-					// 	classify: 2,
-					// },
 				],
 				active: 0,
 			},
@@ -296,7 +318,7 @@ export default {
 		that.query.page = 1;
 		this.isLogin = uni.getStorageSync("apply-userinfo") ? true : false;
 		this.query.size = this.isLogin ? 50 : 20;
-		that.getList()
+		that.getList();
 
 		that.isShowTab = true;
 	},
@@ -410,9 +432,18 @@ export default {
 			this.getList();
 			// this.messageFromChild = data.message;
 		},
+		/**
+		 * 职位排序
+		 */
+		jobSort() {
+			this.whichOneShow = "";
+			this.jobSortShow = !this.jobSortShow;
+			this.scrollTo = this.jobSortShow ? "tttop" : "";
+			this.$forceUpdate();
+		},
 		chooseNl() {
 			let that = this;
-
+			this.jobSortShow = false;
 			if (that.whichOneShow == "special") {
 				that.whichOneShow = "";
 			} else {
@@ -442,17 +473,33 @@ export default {
 			that.query.page++;
 			that.getList("concat");
 		},
+		searchJob() {
+			this.query.list = [];
+			this.getList();
+		},
+		refreshJobList() {
+			let that = this;
+			this.query.page = 1;
+      this.isTrigger = true
+			this.getList().then(() => {
+				console.log("that.isTrigger", that.isTrigger);
+				that.isTrigger = false;
+			});
+		},
 		getList($type = "init") {
 			let that = this,
 				params = {};
+			// uni.showLoading({
+			// 	title: "加载中...",
+			// });
 			params = {
 				...that.getFilterData,
 				pageNum: that.query.page,
 				pageSize: that.query.size,
 				keys: that.keyword,
-				ujc: that.query.ujc,
+				// ucj: that.query.ucj,
 				sortTag: that.query.sortTag,
-
+				picked: that.query.picked,
 				recruitment: 1,
 				classify: 1,
 				workTypeStr: "",
@@ -471,13 +518,13 @@ export default {
 			}
 			return new Promise((resolve, reject) => {
 				let _url = that.api.new_job_list;
-        console.log('_url',_url);
+				console.log("_url", _url);
 				that.G.Post(_url, params, (res) => {
 					console.log("一才职位列表：", res);
 					that.computeCode = 1;
 					let resData = {};
 					resData = res;
-
+					// uni.hideLoading();
 					if (resData.recordCount == 0) {
 						that.loading = false;
 					} else {
@@ -522,6 +569,7 @@ export default {
 									collected: item.collected ? true : false,
 									cus_price: item.salaryClassify != 7 ? that.G.getSalaryClassifyValueHtml(item.salaryClassify, item.salaryClassifyValue) : "月薪",
 									gender: that.G.getGenderByMinAge(item),
+									fuWuFei: that.G.setReturnFee(item.returnFee, item.returnFeeType),
 								};
 							});
 						} else {
@@ -692,26 +740,25 @@ export default {
 			that.loading = true;
 			that.speed = -1;
 			that.tabInfo.active = e;
-			// 之前的位置排序，现在不需要了
-			// if (that.tabInfo.active == 1) {
-			// 	that.getLocation().then((res) => {
-			// 		that.getList();
-			// 	});
-			// } else
-			if (that.tabInfo.active == 1) {
-				that.query.sortTag = 1;
-				that.query.page = 1;
-				that.getList();
-			} else {
-				that.query.sortTag = 0;
-				that.query.ujc = e;
-				that.speed = -1;
-				that.query.page = 1;
-				that.getList();
+			switch (that.tabInfo.active) {
+				case 0:
+					that.query.picked = "";
+					break;
+				case 1:
+					that.query.picked = 1;
+					break;
+				case 2:
+					that.query.picked = 0;
+					break;
+
+				default:
+					break;
 			}
+			this.query.page = 1;
+			that.getList();
 			/* 如需登录：
 				 this.tabInfo.active = e;
-				 this.query.ujc = e;
+				 this.query.ucj = e;
 				 this.speed = 0;
 				 this.query.page = 1;
 				 this.query.isFinish = 0;
@@ -752,6 +799,12 @@ export default {
 				url: "/pages/home/index",
 			});
 		},
+		sortJob(ind) {
+			this.sortList.active = ind;
+			this.query.sortTag = this.sortList.list[ind].key;
+			this.jobSortShow = false;
+			this.getList();
+		},
 	},
 };
 </script>
@@ -916,7 +969,7 @@ export default {
 }
 
 .genderTag {
-	width: 80px;
+	// width: 80px;
 	padding-left: 8px;
 	justify-content: center !important;
 }
@@ -1052,4 +1105,30 @@ export default {
 .u-notice-box {
 	margin-left: 0 !important;
 }
+.sortMask {
+	position: absolute;
+	top: 43px;
+	left: 0;
+	width: 100vw;
+	height: 100vh;
+	z-index: 999999;
+	background-color: rgba(0, 0, 0, 0.8);
+}
+.sortContainer {
+	padding: 0 24px;
+	animation: filterBox 0.35s;
+	animation-fill-mode: forwards;
+	animation-timing-function: ease-in;
+	box-sizing: border-box;
+	background-color: #f5f5f5;
+	padding-bottom: 4px;
+	border-radius: 0 0 8px 8px;
+	height: 33% !important;
+}
+@keyframes filterBox {
+	0% {
+		height: 0;
+		/* opacity: 0; */
+	}
+}
 </style>
diff --git a/root/detail/work.vue b/root/detail/work.vue
index 5d335da..e333b98 100644
--- a/root/detail/work.vue
+++ b/root/detail/work.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="p-root-detail-job g_pt_10 g_pl_16 g_pr_16 g_ml_16 g_mr_16 g_mt_10 g_kuaishou g_bg_f g_radius_8">
+	<view class="p-root-detail-job g_pl_16 g_pr_16 g_pt_10">
 		<!-- {{ from }} -->
 		<!-- {{ selfJob }} -->
 
@@ -7,106 +7,181 @@
 			<g-loading />
 		</view>
 		<view v-if="speed == 1">
-			<view class="m-info g_mb_12">
-				<view class="g_flex_1">
-					<view class="g_mb_10 g_flex_row_between flex_center">
-						<view class="g_flex_1 g_c_3 g_fs_20 g_fw_bold">{{ jobDetail.jobName }}</view>
-						<view class="g_fs_14 g_c_9" hover-class="none" hover-stop-propagation="false">
-							{{ jobDetail.updateTime }}
-						</view>
-						<!-- <view class="g_flex_none g_flex_column_center">
-							<g-panel-server :str="attention ? jobDetail.serverPrice : '关注查看'" verson="new" />
-						</view> -->
+			<view v-if="corpUserFlag" class="g_bg_f g_pl_16 g_pr_16 g_radius_8 g_mb_8">
+				<view v-if="jobDetail.record.askAgencyName" class="g_flex_row_between flex_center g_h_45 g_border_e_b">
+					<view class="g_flex_row_start" style="flex: none">
+						<view class="g_fs_16 g_fw_600 g_mr_4 g_flex_column_center">来源</view>
+					</view>
+					<view class="g_c_6 g_mt_4">{{ jobDetail.record.askAgencyName }}</view>
+				</view>
+				<view class="g_flex_row_between flex_center g_h_45 g_fs_16">
+					<view class="g_flex_row_start" style="flex: none">
+						<view class="g_fw_600 g_mr_4 g_flex_column_center">项目方</view>
+					</view>
+					<view class="g_flex_row_end" style="flex: 1">
+						<span class="g_c_6" selectable="false" space="false" decode="false">{{ jobDetail.supplier.supplierName }}</span>
 					</view>
-
-					<template v-if="jobDetail.classify == 1">
-						<view class="g_c_9">
-							<view class="g_flex_row_between flex_center g_mb_12" v-if="jobDetail.addss">
-								<!-- <view class="g_flex_column_center">
-									<i class="iconfont icon-dingwei2 g_c_6 g_fs_17 g_lh_1_2"></i>
-								</view> -->
-								<view class="g_fs_14 g_ml_4 g_lh_1_2 g_flex_column_center">{{ (jobDetail.addss ? jobDetail.addss + ' | ' : '') + jobDetail.genderAge }} </view>
-							</view>
-							<!-- <view class="g_flex_row_start">
-								<view class="g_fs_14 g_ml_4 g_lh_1_2 g_flex_column_center">{{ jobDetail.genderAge }} </view>
-							</view> -->
-						</view>
-					</template>
 				</view>
 			</view>
-			<view class="g_flex_row_start" v-if="jobDetail.jobSpecialLabelNames">
-				<!-- :style="{ color: labelColor[index % labelColor.length], 'background-color': bgColor[index % bgColor.length] }" -->
-				<view v-for="(item, index) in jobDetail.jobSpecialLabelNames" :style="{ color: `${labelColor[index % labelColor.length]}`, 'background-color': `${bgColor[index % bgColor.length]}` }" class="g_mr_8 g_mb_8 g_pl_4 g_pr_4"> {{ item }}</view>
-			</view>
-			<!-- <view class="g_flex_row_start" v-if="appid == 'wxb0c590fd696b79be' && isUseNewJob">
-				<view v-for="(item, index) in jobDetail.jobRequestLabelNames" :style="{ color: `${labelColor[index % labelColor.length]}`, 'background-color': `${bgColor[index % bgColor.length]}` }" class="g_mr_8 g_mb_4 g_pl_4 g_pr_4 g_c_6 g_bg_f_5"> {{ item }}</view>
-			</view> -->
-			<view class="g_flex_row_start flex_center g_mt_8" hover-class="none" hover-stop-propagation="false">
-				<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" hover-class="none" hover-stop-propagation="false" v-if="jobDetail.monthPay">
-					{{ jobDetail.monthPay ? "丨" + jobDetail.monthPay : "" }}
+			<view class="g_bg_f g_pl_16 g_pr_16 g_radius_8 g_mb_10" @click="showFee">
+				<view class="g_flex_row_between flex_center g_fs_16">
+					<view class="g_flex_row_start" style="flex: none">
+						<view class="g_fw_600 g_mr_4 g_h_67 g_flex_column_center">代理佣金</view>
+						<icon :class="isServicePriceShow ? 'icon-zhengyan1' : 'icon-biyan1'" class="iconfont g_c_f40 g_fs_22 g_h_67 g_flex_column_center" v-if="userInfo.agencyStatus == 1" @click.stop="toggleReturnFee" style="width: 67px"></icon>
+					</view>
+					<view class="g_flex_row_end flex_center g_h_67" style="flex: 1">
+						<span class v-if="isServicePriceShow && userInfo.agencyStatus == 1">{{ jobDetail.fuWuFei || "详询客服" }}</span>
+						<span class wx:else>***</span>
+						<view class="iconfont icon-gengduo11 g_fs_14 g_c_6 g_ml_4"></view>
+					</view>
 				</view>
 			</view>
+			<view class="g_bg_f g_pt_10 g_pl_16 g_pr_16 g_mt_10 g_kuaishou g_radius_8" hover-class="none" hover-stop-propagation="false">
+				<view class="m-info g_mb_12">
+					<view class="g_flex_1">
+						<view class="g_mb_10 g_flex_row_between flex_center">
+							<view class="g_flex_1 g_c_3 g_fs_20 g_fw_bold">{{ jobDetail.jobName }}</view>
+							<view class="g_fs_14 g_c_9" hover-class="none" hover-stop-propagation="false">
+								{{ jobDetail.updateTime }}
+							</view>
+						</view>
 
-			<!-- 地址 -->
-			<div>
-				<view class="m-address g_mt_16 g_mb_16 g_pt_10 g_pb_10 g_flex_row_start g_border_e_t g_border_e_b" hover-class="thover" @click="goAddress"
-						  v-if="jobDetail.storeLat && jobDetail.storeLng"
-				>
-					<view class="g_flex_none g_flex_column_center">
-						<i class="iconfont icon-dizhi1 g_c_main g_mr_10 g_w_14 g_h_14"></i>
+						<template>
+							<view class="g_c_9">
+								<view class="g_flex_row_between flex_center g_mb_12">
+									<view class="g_fs_14 g_ml_4 g_lh_1_2 g_flex_column_center">{{ (jobDetail.addss ? jobDetail.addss + "丨" : "") + jobDetail.genderRestrict + "丨" + jobDetail.age }} </view>
+								</view>
+							</view>
+						</template>
 					</view>
-					<view class="g_flex_1 g_ml_4 g_mr_4 g_flex_column_center">
-						<view class="g_fs_16 g_c_3 g_ell_1">
-							{{ jobDetail.storeAddr || "-" }}
+				</view>
+				<view class="g_flex_row_start" v-if="jobDetail.jobRequestLabelNames.length > 0">
+        <!-- :style="{ color: labelColor[index % labelColor.length], 'background-color': bgColor[index % bgColor.length] }" -->
+					<view v-for="(item, index) in jobDetail.jobRequestLabelNames" :style="{ color: `${labelColor[index % labelColor.length]}`, 'background-color': `${bgColor[index % bgColor.length]}` }" class="g_mr_8 g_mb_8 g_pl_4 g_pr_4"> {{ item }}</view>
+				</view>
+				<view class="g_flex_row_between flex_center g_mt_8" hover-class="none" hover-stop-propagation="false">
+					<view class="g_flex_row_start flex_center" hover-class="none" hover-stop-propagation="false">
+						<view class="g_fs_16 g_fw_600 g_c_f40 g_lh_1_2 g_flex_column_center" v-if="jobDetail.priceStr" v-html="jobDetail.priceStr"> </view>
+						<view class="g_fs_14 g_c_9" hover-class="none" hover-stop-propagation="false" v-if="jobDetail.monthPay">
+							{{ jobDetail.monthPay ? "丨" + jobDetail.monthPay : "" }}
 						</view>
 					</view>
-					<view class="g_flex_none g_flex_column_center">
-						<i class="iconfont icon-gengduo11 g_c_9 g_w_14 g_h_14"></i>
+					<view v-if="corpUserFlag" class="g_flex_row_start g_c_main" @click.stop="setCopy('jobName')">
+						<view class="iconfont icon-fuzhi mr4" style></view>
+						<span class="f14 biggerSize">复制</span>
 					</view>
 				</view>
-				<view v-else class="g_border_e_t g_mt_16"></view>
-			</div>
 
-			<!-- <view class="m-address g_mt_16 g_mb_16 g_pt_10 g_pb_10 g_flex_row_start" v-else style="border-top: 1rpx solid #f5f5f5; border-bottom: 1rpx solid #f5f5f5" hover-class="thover">
-				<view class="g_flex_none g_flex_column_center">
-					<i class="iconfont icon-dizhi1 g_c_main g_mr_10 g_w_14 g_h_14"></i>
-				</view>
-				<view class="g_flex_1 g_ml_4 g_mr_4 g_flex_column_center">
-					<view class="g_fs_16 g_c_3 g_ell_1">
-						{{ "登录后查看" }}
+				<!-- 地址 -->
+				<div>
+					<view class="m-address g_mt_16 g_mb_16 g_pt_10 g_pb_10 g_flex_row_start g_border_e_t g_border_e_b" hover-class="thover" @click="goAddress" v-if="jobDetail.storeLat && jobDetail.storeLng">
+						<view class="g_flex_none g_flex_column_center">
+							<i class="iconfont icon-dizhi1 g_c_main g_mr_10 g_w_14 g_h_14"></i>
+						</view>
+						<view class="g_flex_1 g_ml_4 g_mr_4 g_flex_column_center">
+							<view class="g_fs_16 g_c_3 g_ell_1">
+								{{ jobDetail.storeAddr || "-" }}
+							</view>
+						</view>
+						<view class="g_flex_none g_flex_column_center">
+							<i class="iconfont icon-gengduo11 g_c_9 g_w_14 g_h_14"></i>
+						</view>
 					</view>
+					<view v-else class="g_border_e_t g_mt_16"></view>
+				</div>
+				<view class="g_flex_row_center g_border_e_b" hover-class="none" hover-stop-propagation="false">
+					<u-tabs bg-color="transparent" :list="tabInfo.list" :current="tabInfo.active" :active-color="globalData.themeColor" bar-width="32" bar-height="6" @change="setType" :gutter="50" font-size="32" duration="0.05" height="76"></u-tabs>
 				</view>
-				<view class="g_flex_none g_flex_column_center">
-					<i class="iconfont icon-gengduo11 g_c_9 g_w_14 g_h_14"></i>
+				<!-- <view class="m-address g_mt_16 g_mb_16 g_pt_10 g_pb_10 g_flex_row_start" v-else style="border-top: 1rpx solid #f5f5f5; border-bottom: 1rpx solid #f5f5f5" hover-class="thover">
+          <view class="g_flex_none g_flex_column_center">
+            <i class="iconfont icon-dizhi1 g_c_main g_mr_10 g_w_14 g_h_14"></i>
+          </view>
+          <view class="g_flex_1 g_ml_4 g_mr_4 g_flex_column_center">
+            <view class="g_fs_16 g_c_3 g_ell_1">
+              {{ "登录后查看" }}
+            </view>
+          </view>
+          <view class="g_flex_none g_flex_column_center">
+            <i class="iconfont icon-gengduo11 g_c_9 g_w_14 g_h_14"></i>
+          </view>
+			  </view> -->
+				<!-- 轮播banner -->
+				<view class="m-banner g_pb_16 g_border_f5_b" v-if="swiperArray.length > 0">
+					<swiper class="swiper" :circular="false" :autoplay="false" :display-multiple-items="swiperArray.length < 5 ? swiperArray.length : 5" style="height: 58px">
+						<swiper-item v-for="(item, index) in swiperArray" style="max-width: 58px; padding-right: 12px" :key="index" :class="index == 0 ? 'g_ml_0 g_mr_0' : ''">
+							<u-image :radius="4" v-if="item.type == 'image'" :showLoading="true" :src="item.image" width="58px" height="58px" style="border-radius: 4px" @click="handleViewBig(item, index)"></u-image>
+							<view class="g_w_58 g_h_58 g_radius_4 videoContainer" style="overflow: hidden" @click="showVideo(item)" v-else>
+								<video class="theVideo" :show-fullscreen-btn="false" :show-play-btn="false" :show-center-play-btn="true" :enable-play-gesture="true" :id="item.id" :src="item.image" @fullscreenchange="fullScreen" :muted="muted" :show-mute-btn="true">
+									<view class="shareVideo">
+										<icon @click="shareVideo(item)" class="iconfont" :class="wxPlat == 'wxwork' ? 'icon-huidaodingbu' : 'icon-zhuanfa1'" hover-class="none" hover-stop-propagation="false"></icon>
+									</view>
+								</video>
+							</view>
+						</swiper-item>
+					</swiper>
 				</view>
-			</view> -->
-			<!-- 轮播banner -->
-			<view class="m-banner g_pb_16 g_border_f5_b" v-if="swiperArray.length > 0">
-				<swiper class="swiper" :circular="false" :autoplay="false" :display-multiple-items="swiperArray.length < 5 ? swiperArray.length : 5" style="height: 58px">
-					<swiper-item v-for="(item, index) in swiperArray" style="max-width: 58px; padding-right: 12px" :key="index" :class="index == 0 ? 'g_ml_0 g_mr_0' : ''">
-						<u-image :radius="4" v-if="item.type == 'image'" :showLoading="true" :src="item.image" width="58px" height="58px" style="border-radius: 4px" @click="handleViewBig(item, index)"></u-image>
-						<view class="g_w_58 g_h_58 g_radius_4 videoContainer" style="overflow: hidden" @click="showVideo(item)" v-else>
-							<video class="theVideo" :show-fullscreen-btn="false" :show-play-btn="false" :show-center-play-btn="true" :enable-play-gesture="true" :id="item.id" :src="item.image" @fullscreenchange="fullScreen" :muted="muted" :show-mute-btn="true">
-								<view class="shareVideo">
-									<icon @click="shareVideo(item)" class="iconfont" :class="wxPlat == 'wxwork' ? 'icon-huidaodingbu' : 'icon-zhuanfa1'" hover-class="none" hover-stop-propagation="false"></icon>
+				<view class="content_card" hover-class="none" hover-stop-propagation="false">
+					<view v-if="tabInfo.active == 0" style="line-height: 24px" class="" hover-class="none" hover-stop-propagation="false">
+						<view v-if="jobDetail.notes">
+							<view class="detailH3">注意事项</view>
+							<view class="pri g_c_f40" style="line-height: 24px; padding: 3px 8px; border-radius: 4px; text-align: justify">{{ jobDetail.notes }}</view>
+						</view>
+						<view class="detailH3">一、薪资待遇</view>
+						<view class="g_radius_4">
+							<view class="g_flex_row_between">
+								<view class="rb1">1. 薪资明细：</view>
+								<view class="textb1">{{ jobDetail.salaryDetail }}</view>
+							</view>
+						</view>
+						<view class="detailH3">二、职位要求</view>
+						<view class="g_radius_4">
+							<view class="g_flex_row_between">
+								<view class="rb1">1. 性别年龄：</view>
+								<view class="textb1">{{ jobDetail.genderRestrict + " " + jobDetail.age }}</view>
+							</view>
+						</view>
+						<view class="detailH3">三、岗位说明</view>
+						<view class="g_radius_4">
+							<view class="g_flex_row_between">
+								<view class="rb1">1. 班次工时：</view>
+								<view class="textb1">{{ jobDetail.workClasses }}</view>
+							</view>
+							<view class="g_flex_row_between">
+								<view class="rb1">2. 其他说明：</view>
+								<view class="textb1">{{ jobDetail.otherDesp }}</view>
+							</view>
+						</view>
+						<view class="detailH3">四、面试对接</view>
+						<view class="g_radius_4">
+							<view class="g_flex_row_between">
+								<view class="rb1">1. 面试地点：</view>
+								<view class="textb1 g_flex_row_between g_flex_1">
+									<view class>{{ jobDetail.interviewAddr || "-" }}</view>
+									<i v-if="jobDetail.interviewLat" class="iconfont icon-dizhi11 f16 mr4 biggerSize" style="color: #027aff"  data-type="interview"></i>
 								</view>
-							</video>
+							</view>
 						</view>
-					</swiper-item>
-				</swiper>
-			</view>
-
-			<!-- 职位描述富文本 -->
-			<view class="g_flex_column_center">
-				<view class="g_fs_16">
-					<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_7" style="white-space: pre-line">
-						<view @click="setCopy" v-if="jobDetail.jobInfoWithoutReturnFee || jobDetail.jobInfo">
-							<span class="desp-copy g_c_main g_border_main">复制</span>
+						<view v-if="jobDetail.OtherInfo">
+							<view class="detailH3">其它信息</view>
+							<view class="pri" style="line-height: 24px; padding: 3px 8px; border-radius: 4px; color: #333">{{ jobDetail.OtherInfo }}</view>
+						</view>
+					</view>
+					<!-- 职位描述富文本 -->
+					<view class="g_flex_column_center" v-if="tabInfo.active == 1">
+						<view class="g_fs_16">
+							<view class="g_c_3 g_pt_16 pri">
+								<view @click="setCopy('new')" v-if="jobDetail.jobInfoWithoutReturnFee || jobDetail.jobInfo"> <span class="desp-copy g_c_main g_border_main">复制</span> </view>{{ jobDetail.jobInfoWithoutReturnFee || jobDetail.jobInfo || "-" }}</view
+							>
 						</view>
-						{{ jobDetail.jobInfoWithoutReturnFee || jobDetail.jobInfo || "-" }}</view
-					>
+					</view>
+					<view class="" v-if="tabInfo.active == 2" hover-class="none" hover-stop-propagation="false">
+						<view class="g_pt_16 g_fs_16 pri" style="">
+							<view @click.stop="setCopy('old')">
+								<span class="desp-copy g_c_main g_border_main">复制</span>
+							</view>
+							<rich-text class style="text-align: justify" :nodes="jobDetail.lastNotice"></rich-text>
+						</view>
+					</view>
 				</view>
 			</view>
 
@@ -117,21 +192,8 @@
 					<view class="g_pl_20 g_pr_20 g_flex_row_center flex_center flex_nw" style="width: 100%">
 						<!-- #ifdef MP-WEIXIN -->
 						<!-- #endif -->
-						<view class="g_flex_none g_flex_column_center" v-if="from != 'bill'">
-							<button class="g_pl_0 g_pr_0 g_bg_f g_mr_16" hover-class="thover" v-if="envVersion != 'trial'" @click="showShareImg" style="line-height: 1">
-								<icon class="iconfont icon-zhuanfa1 g_fsi_16" style="color: #787878; line-height: 1; margin-top: -5px"> </icon>
-								<view class="g_fs_12 g_c_6 g_w_28" style="margin-top: 8px">分享</view>
-							</button>
-						</view>
-
-						<view class="g_flex_none g_flex_column_center" v-if="attention && from != 'bill'">
-							<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="showService">
-								<icon class="iconfont icon-qiwei g_fsi_18" style="color: #787878; line-height: 1; margin-top: -5px"> </icon>
-								<view class="g_fs_12 g_c_6" style="margin-top: 8px">客服</view>
-							</button>
-						</view>
 						<view class="g_flex_none g_flex_column_center" v-if="attention && from != 'bill'">
-							<g-button :btnText="isSc ? '已想去' : '想去'" :icon="isSc ? 'icon-heart-fill g_mr_2' : 'icon-heart g_mr_2'" class="g_fw_600 g_mr_12 g_w_100" size="small_auto" @clickBtn="handleCollection"> </g-button>
+							<g-button btnText="客服" icon="icon-qiwei g_mr_4" class="g_fw_600 g_mr_12 g_w_100" size="small_auto" @clickBtn="kefu"> </g-button>
 							<!-- <button class="g_pl_0 g_pr_0 g_bg_f g_mr_12 g_w_36 g_border_main" hover-class="thover" style="line-height: 1; border-radius: 0" @click="handleCollection">
 								<icon v-if="isSc" class="iconfont icon-yishoucang g_fsi_16" style="color: #ff4400; line-height: 1; margin-top: -5px"></icon>
 								<icon v-else class="iconfont icon-shoucang g_fsi_16" style="color: #787878; line-height: 1; margin-top: -5px"> </icon>
@@ -170,8 +232,7 @@
 								<image class="g_w_40 g_h_40" :src="jobDetail.logo" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""> </image>
 								<view class="g_ml_8" hover-class="none" hover-stop-propagation="false">
 									<view class="g_c_f40 g_fs_16 g_mb_4" hover-class="none" hover-stop-propagation="false">
-										<span class="g_fw_600 g_mr_4" hover-class="none" hover-stop-propagation="false">
-											{{ jobDetail.priceStr }}
+										<span class="g_fw_600 g_mr_4" hover-class="none" hover-stop-propagation="false" v-html="jobDetail.priceStr">
 										</span>
 										<span class="g_fs_14" hover-class="none" hover-stop-propagation="false">
 											{{ jobDetail.monthPay }}
@@ -289,6 +350,7 @@ export default {
 	},
 	data() {
 		return {
+			globalData: getApp().globalData,
 			isUseNewJob: getApp().globalData.isUseNewJob,
 			appid: getApp().globalData.appId,
 			isLogin: false,
@@ -322,7 +384,6 @@ export default {
 			dateTimeArray: null,
 			dateTime: [],
 			from: "", // 来源页面
-			isSc: false, // 收藏判断
 			attention: true, // 分享时隐藏信息
 			selfJob: false, // 是否是自己团队职位的判断
 			showPrice: true, // 隐藏服务费
@@ -344,6 +405,24 @@ export default {
 			miniAppInfo: uni.getStorageSync("miniApp-info"), // 小程序的信息
 			serviceShow: false, // 客服弹窗
 			currentStore: {},
+			isServicePriceShow: false, // 服务费显示隐藏
+			tabInfo: {
+				list: [
+					{
+						name: "职位详情",
+						key: "0",
+					},
+					{
+						name: "通告分享",
+						key: "1",
+					},
+					{
+						name: "原始通告",
+						key: "2",
+					},
+				],
+				active: 0,
+			},
 		};
 	},
 	onLoad(options) {
@@ -472,40 +551,6 @@ export default {
 		// 		that.speed = 1;
 		// 	});
 		// },
-		handleCollection() {
-			let that = this;
-
-			if (this.isLogin) {
-				that.G.Get(that.api.yi_job_collect + "/" + that.uid, {}, (res) => {
-					that.isSc = !that.isSc;
-					uni.showToast({
-						title: that.isSc ? "想去成功" : "取消想去",
-						icon: "success",
-					});
-				});
-			} else {
-				uni.showModal({
-					title: "登录提示",
-					content: "想去功能需要登录才能使用,是否登录",
-					success(res) {
-						if (res.confirm) {
-							uni.navigateTo({
-								url: "/pages/login/index?path=detail",
-							});
-						} else {
-						}
-					},
-				});
-			}
-		},
-		showService() {
-			if (this.appid == "wxb0c590fd696b79be") {
-				this.getKefu();
-			} else {
-				this.getKefu();
-			}
-			// this.serviceShow = true;
-		},
 		hideService() {
 			this.serviceShow = false;
 		},
@@ -518,14 +563,12 @@ export default {
 					that.isSc = res.record.collected == 1 ? true : false;
 					console.log("职位详情：", res);
 					res = {
-						...res,
 						...res.record,
 					};
 					if (!res.hasOwnProperty("storeJobDetail")) {
 						res.storeJobDetail = {};
 					}
 
-					
 					res.addss = that.G.setJobInfoPositionv3(res.storeAddr);
 					console.log("职位详情1------：", res);
 					that.isPerson = res.agencyId == uni.getStorageSync("apply-agencyId") ? true : false;
@@ -533,35 +576,32 @@ export default {
 					res.agencyServerPrice = that.G.setReturnFee(res.agencyReturnFee, res.agencyReturnFeeType);
 					res.serverPrice = that.G.setReturnFee(res.returnFee, res.returnFeeType);
 
-					let setData = that.G.disposeJobListData(res);
-					console.log("setData.district", setData.district);
-					res.addressStr = setData.district.slice(0, -1);
-					res.sexStr = setData.genderAge;
+					that.G.disposeJobListData(res);
 
 					// res.ageStr = setData.age;
 					// res.priceStr = that.G.getSalaryClassifyValue(res.salaryClassify, res.salaryClassifyValue);
-					res.priceStr = res.salaryClassify != 7 ? that.G.getSalaryClassifyValue(res.salaryClassify, res.salaryClassifyValue) : that.G.getSalaryClassifyValue(res.salaryClassify, res.minMonthlyPay, res.maxMonthlyPay);
-
+					res.priceStr = that.G.getSalaryClassifyValueHtml(res.salaryClassify, res.salaryClassifyValue)
+					res.fuWuFei = that.G.setReturnFee(res.returnFee, res.returnFeeType);
 					res.monthPay = res.minMonthlyPay / 100 + "-" + res.maxMonthlyPay / 100;
 					res.updateTime = that.G.setDeadLine(res.updateTime, "jiaofu");
-					console.log("res.images", res.images);
-					that.swiperArray =
-						res.images.length == 0
-							? []
-							: res.images.map((item, index) => {
-									return {
-										id: index + 1,
-										image: item.url,
-										type: item.url.indexOf(".mp4") > -1 ? "video" : "image",
-									};
-							  });
-					if (res.logo) {
-						that.swiperArray.unshift({
-							id: 0,
-							image: res.logo,
-							type: "image",
-						});
-					}
+					res.genderRestrict = that.G.getGenderByMinAge(res);
+					// that.swiperArray =
+					// 	res.images.length == 0
+					// 		? []
+					// 		: res.images.map((item, index) => {
+					// 				return {
+					// 					id: index + 1,
+					// 					image: item.url,
+					// 					type: item.url.indexOf(".mp4") > -1 ? "video" : "image",
+					// 				};
+					// 		  });
+					// if (res.logo) {
+					// 	that.swiperArray.unshift({
+					// 		id: 0,
+					// 		image: res.logo,
+					// 		type: "image",
+					// 	});
+					// }
 					that.jobDetail = res;
 					that.selfJob = that.jobDetail.agencyId == that.loginInfo.agencyId;
 					if (that.jobDetail.jobInfo.indexOf("————————" > -1)) {
@@ -570,20 +610,13 @@ export default {
 						that.jobDetail.jobInfo = that.jobDetail.jobInfo.replace(/\*\*\*\*\*/g, "");
 					}
 					// that.jobDetail.jobRequestLabelNamesList = that.jobDetail.jobRequestLabelNames.split(",");
-					// that.jobDetail.jobSpecialLabelNamesList = that.jobDetail.jobSpecialLabelNames.split(",");
-					var str = that.jobDetail.supplier;
-					var reg = /1[3456789]\d{9}/g;
-					var phone = str.match(reg);
-					if (phone != null) {
-						that.jobDetail["phone"] = phone.toString();
-					}
-					// console.log(phone.length);
-
+					// that.jobDetail.jobSpecialLabelNames = that.jobDetail.jobSpecialLabelNames.split(",");
+          console.log('that.jobDetail',that.jobDetail);
 					// that.jobDetail.jobName = '三顿饭卡加斯冯老师独立开发技术的返利看打两发慷慨激昂收代理费'
 					that.jobDetail.logo = that.jobDetail.logo.indexOf("http:") > -1 ? that.jobDetail.logo.replace("http:", "https:") : that.jobDetail.logo;
-					setTimeout(()=>{
+					setTimeout(() => {
 						that.speed = 1;
-					},100)
+					}, 100);
 					resolve(that.jobDetail);
 				});
 			});
@@ -725,7 +758,7 @@ export default {
 				console.log("innerLogin", that.isLogin);
 				that.G.fillTextLineBreak(ctx, that.jobDetail.monthPay, 750 - ctx.measureText(that.jobDetail.monthPay).width, line3, 400, 20, "#ff4400", titleFontSize, "400"); // 月工资
 				// that.G.fillTextLineBreak(ctx, "工价", baseLeft + logoSize + 10, line2 + 50, 100, 30, "#ff4400", titleFontSize - 8, "500", "left"); // 工价
-				that.G.fillTextLineBreak(ctx, that.jobDetail.priceStr, baseLeft + 10, line3, 400, 40, "#ff4400", titleFontSize + 6, "600", "left"); // 时薪
+				that.G.fillTextLineBreak(ctx, that.G.getSalaryClassifyValue(that.jobDetail.salaryClassify, that.jobDetail.salaryClassifyValue), baseLeft + 10, line3, 400, 40, "#ff4400", titleFontSize + 6, "600", "left"); // 时薪
 				// } else {
 				// 	console.log("notLogin", that.isLogin);
 				// 	that.G.fillTextLineBreak(ctx, "工价登录后查看", baseLeft + logoSize + 10, line3 - 40, 400, 20, "#ff4400", titleFontSize - 6, "400"); // 时薪
@@ -860,9 +893,9 @@ export default {
 					}
 				});
 				that.G.fillTextLineBreak(ctx, that.jobDetail.jobName, logoLeft, baseTop, 500 * 2, 20, "#333", titleSize, "600", "left"); // 岗位标题
-				that.G.fillTextLineBreak(ctx, that.jobDetail.priceStr, salaryClassifyValueLeft, baseTop + salaryClassifyValueTop, 400 * 2, 20, "#ff4400", titleSize, "600"); // 时薪
+				that.G.fillTextLineBreak(ctx, that.G.getSalaryClassifyValue(that.jobDetail.salaryClassify, that.jobDetail.salaryClassifyValue), salaryClassifyValueLeft, baseTop + salaryClassifyValueTop, 400 * 2, 20, "#ff4400", titleSize, "600"); // 时薪
 
-				that.G.fillTextLineBreak(ctx, that.jobDetail.monthPay, salaryClassifyValueLeft + ctx.measureText(that.jobDetail.priceStr + " ").width, baseTop + salaryClassifyValueTop, 400 * 2, 20, "#ff4400", monthlyPaySize, "400"); // 月工资
+				that.G.fillTextLineBreak(ctx, that.jobDetail.monthPay, salaryClassifyValueLeft + ctx.measureText(that.G.getSalaryClassifyValue(that.jobDetail.salaryClassify, that.jobDetail.salaryClassifyValue) + " ").width, baseTop + salaryClassifyValueTop, 400 * 2, 20, "#ff4400", monthlyPaySize, "400"); // 月工资
 
 				that.G.fillTextLineBreak(ctx, that.jobDetail.shortDistrict, salaryClassifyValueLeft, baseTop + ageTop, 300 * 2, 20, "#333", monthlyPaySize); // 省市年龄
 
@@ -1081,7 +1114,14 @@ export default {
 		// 复制通告
 		setCopy(e) {
 			var that = this;
-			let text = that.jobDetail.jobInfoWithoutReturnFee || that.jobDetail.jobInfo;
+			let text;
+			if (e == "new") {
+				text = that.jobDetail.jobInfoWithoutReturnFee || that.jobDetail.jobInfo;
+			} else if (e == "old") {
+				text = that.jobDetail.lastNotice;
+			} else if (e == "jobName") {
+				text = that.jobDetail.jobName + "@" + that.jobDetail.supplier.supplierName;
+			}
 			uni.setClipboardData({
 				data: text,
 				success(res) {
@@ -1351,17 +1391,57 @@ export default {
 				phoneNumber: e.mark.tel,
 			});
 		},
-		getKefu() {
-			let that = this;
-			that.currentStore = uni.getStorageSync("CUSTOMSERVICE_INFO");
-			that.currentStore.splitPhone = this.G.splitPhone(that.currentStore.tel);
-			that.serviceShow = true;
-		},
 		successLogin(e) {
 			console.log("e", e);
 			this.isLogin = true;
 			this.handleOpenApplyPopup();
 		},
+		tobeAgencyToast() {
+			uni.showModal({
+				title: "",
+				content: "抱歉，您需先成为伯才代理以获得使用权限。",
+				confirmColor: "#1890ff",
+				confirmText: "成为代理",
+				cancelText: "知道了",
+				success(res) {
+					if (res.confirm) {
+						wx.navigateTo({
+							url: "/pages/tobeAgency/index",
+						});
+					}
+				},
+			});
+		},
+		showFee() {
+			let that = this;
+			if (!that.userInfo.agencyStatus == 1) {
+				this.tobeAgencyToast();
+				return;
+			}
+			let content, title;
+			if (that.jobDetail.returnFeeDesp) {
+				title = that.userInfo.agencyStatus == 1 ? "佣金: " + that.jobDetail.fuWuFei : "";
+				content = that.userInfo.agencyStatus == 1 ? that.jobDetail.returnFeeDesp : "抱歉，您需先成为伯才代理以获得使用权限。";
+			} else {
+				title = "详询客服";
+				content = "因三方项目政策变动太快，详情请咨询客服。页面左下角点击“联系客服”直接联系我哟~";
+			}
+			uni.showModal({
+				title,
+				content,
+				contentColor: "#ccc",
+				confirmColor: "#1890ff",
+				confirmText: "确定",
+				showCancel: false,
+				success(res) {},
+			});
+		},
+		setType(e) {
+			this.tabInfo.active = e;
+		},
+		toggleReturnFee() {
+			this.isServicePriceShow = !this.isServicePriceShow;
+		},
 	},
 };
 </script>
@@ -1501,4 +1581,32 @@ page {
 
 	margin-right: 16px;
 }
+.detailH3 {
+	font-size: 16px;
+	font-weight: 400;
+	color: #000;
+	line-height: 22px;
+	margin-top: 16px;
+	margin-bottom: 8px;
+}
+.pri {
+	white-space: pre-line;
+}
+.pri:empty:before,
+.textb1:empty:before {
+	content: "-" !important;
+	color: #333;
+}
+.rb1 {
+	font-size: 14px;
+	color: #666;
+	text-align: center;
+	width: 95px;
+}
+.textb1 {
+	white-space: pre-line;
+	color: #333;
+	flex: 1;
+	line-height: 1.8;
+}
 </style>
diff --git a/root/merchantManagement/jobForm.vue b/root/merchantManagement/jobForm.vue
index 98f3cff..4f3ff79 100644
--- a/root/merchantManagement/jobForm.vue
+++ b/root/merchantManagement/jobForm.vue
@@ -856,7 +856,7 @@ export default {
 		// 编辑职位获取信息
 		getJobDetail() {
 			let that = this;
-			that.G.Get(that.api.job_detail + "/" + this.jobId, "", (res) => {
+			that.G.Get(that.api.job_personDetail + "/" + this.jobId, "", (res) => {
 				console.log(res);
 				if (res.salaryClassify == 7 && res.minMonthlyPay != "") {
 					that.monthValue = res.minMonthlyPay / 100 + "-" + res.maxMonthlyPay / 100;
diff --git a/static/css/base.scss b/static/css/base.scss
index 7c4c77f..a3f6ed5 100644
--- a/static/css/base.scss
+++ b/static/css/base.scss
@@ -88,7 +88,9 @@ scroll-view::-webkit-scrollbar {
 		&_main {
 			border: 1px solid $main_color;
 		}
-
+		&_f {
+			border: 1px solid #fff;
+    }
 		&_f5 {
 			border: 1px solid #f5f5f5;
 			&_t {
@@ -610,7 +612,9 @@ $max-radius: 50;
 		border-radius: 50%;
 	}
 }
-
+.pri {
+  white-space: pre-line;
+}
 .flex_center {
 	align-items: center;
 }
diff --git a/static/css/filtercss.css b/static/css/filtercss.css
index 9522b63..444ea59 100644
--- a/static/css/filtercss.css
+++ b/static/css/filtercss.css
@@ -47,9 +47,9 @@
 	border: 1px solid transparent;
 }
 .sub .content > span.active {
-	background-color: #ff440011;
-	color: #ff4400;
-	border-color: #ff4400;
+	background-color: #e3ecfd;
+	color: #3578f6;
+	border-color: #3578f6;
 }
 .sub .content > span:not(:nth-child(3n)) {
 	margin-right: 2%;
@@ -79,9 +79,9 @@
 .btnBox .clearFilter {
 	margin-right: 20px;
 	line-height: 30px;
-	border: 1px solid #ff4400;
+	border: 1px solid #3578f6;
 	background-color: #fff;
-	color: #ff4400;
+	color: #3578f6;
 }
 .loginOut {
 	width: 100% !important;
@@ -90,7 +90,7 @@
 	display: flex;
 	align-items: center;
 	justify-content: center;
-	background: #ff4400;
+	background: #3578f6;
 	border-radius: 25px;
 	font-size: 18px;
 	font-weight: 601;
diff --git a/static/image/xmf.svg b/static/image/xmf.svg
new file mode 100644
index 0000000..88c4022
--- /dev/null
+++ b/static/image/xmf.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="33px" height="20px" viewBox="0 0 33 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 37</title>
+    <g id="控件" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="编组-37">
+            <path d="M2,0 L33,0 L33,0 L33,20 L2,20 C0.8954305,20 1.3527075e-16,19.1045695 0,18 L0,2 C-1.3527075e-16,0.8954305 0.8954305,2.02906125e-16 2,0 Z" id="矩形" fill="#E3F5FF"></path>
+            <path d="M6.91075269,13.8 C7.50143369,13.6910394 8.01469534,13.4860215 8.45053763,13.1849462 C8.88637993,12.883871 9.21899642,12.5010753 9.4483871,12.0365591 C10.1021505,12.4322581 10.5035842,12.9942652 10.6526882,13.7225806 L10.6526882,13.7225806 L11.6935484,13.7225806 C11.4870968,12.8681004 11.1057348,12.1913978 10.5494624,11.6924731 L10.5494624,11.6924731 L11.444086,11.6924731 L11.444086,7.64946237 L9.72365591,7.64946237 L9.83548387,7.09892473 L11.788172,7.09892473 L11.788172,6.05806452 L6.84193548,6.05806452 L6.84193548,7.09892473 L8.80322581,7.09892473 L8.69139785,7.64946237 L7.18602151,7.64946237 L7.18602151,11.6924731 L8.25268817,11.6924731 L8.25268817,8.65591398 L10.3774194,8.65591398 L10.3774194,11.5462366 C10.1939068,11.3971326 9.98172043,11.2594982 9.74086022,11.1333333 C9.78100358,10.9326165 9.80107527,10.7032258 9.80107527,10.4451613 L9.80107527,10.4451613 L9.80107527,9.09462366 L8.76021505,9.09462366 L8.76021505,10.4021505 C8.76021505,11.0501792 8.60107527,11.5548387 8.2827957,11.916129 C7.96451613,12.2774194 7.50716846,12.5182796 6.91075269,12.6387097 L6.91075269,12.6387097 L6.91075269,13.8 Z M3.9,12.7763441 L6.99677419,12.2516129 L6.99677419,11.055914 L5.95591398,11.2365591 L5.95591398,7.49462366 L6.70430108,7.49462366 L6.70430108,6.37634409 L4.01182796,6.37634409 L4.01182796,7.49462366 L4.85483871,7.49462366 L4.85483871,11.4172043 L3.9,11.5806452 L3.9,12.7763441 Z M19.6419355,13.5763441 L19.6419355,6.10967742 L13.2763441,6.10967742 L13.2763441,13.5763441 L19.6419355,13.5763441 Z M18.4978495,8.22580645 L14.4204301,8.22580645 L14.4204301,7.21075269 L18.4978495,7.21075269 L18.4978495,8.22580645 Z M18.4978495,10.3247312 L14.4204301,10.3247312 L14.4204301,9.31827957 L18.4978495,9.31827957 L18.4978495,10.3247312 Z M18.4978495,12.4752688 L14.4204301,12.4752688 L14.4204301,11.4172043 L18.4978495,11.4172043 L18.4978495,12.4752688 Z M21.0870968,13.7569892 C21.9989247,13.4702509 22.6827957,13.0043011 23.1387097,12.3591398 C23.5946237,11.7139785 23.8512545,10.9383513 23.9086022,10.0322581 L23.9086022,10.0322581 L27.2290323,10.0322581 L27.2290323,12.5956989 L25.9989247,12.5956989 L25.9989247,13.7139785 L28.3387097,13.7139785 L28.3387097,8.9311828 L23.9258065,8.9311828 L23.9258065,7.72688172 L28.9322581,7.72688172 L28.9322581,6.62580645 L25.6290323,6.62580645 L25.6290323,5.8 L24.4935484,5.8 L24.4935484,6.62580645 L21.1903226,6.62580645 L21.1903226,7.72688172 L22.8075269,7.72688172 L22.8075269,9.53333333 C22.8075269,10.2329749 22.6684588,10.8394265 22.3903226,11.3526882 C22.1121864,11.8659498 21.6777778,12.2401434 21.0870968,12.4752688 L21.0870968,12.4752688 L21.0870968,13.7569892 Z" id="项目方" fill="#555666" fill-rule="nonzero"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/static/image/zhen.svg b/static/image/zhen.svg
new file mode 100644
index 0000000..2067956
--- /dev/null
+++ b/static/image/zhen.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1741599346258" class="icon" viewBox="0 0 2184 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="15491" xmlns:xlink="http://www.w3.org/1999/xlink" width="136.5" height="64"><path d="M341.333333 0h1843.2v682.666667c0 188.5184-152.814933 341.333333-341.333333 341.333333H0V341.333333C0 152.814933 152.814933 0 341.333333 0z" fill="#FF000D" p-id="15492"></path><path d="M342.698667 281.941333l4.096-34.816h-90.112l12.288-91.136h425.984L682.666667 247.125333h-107.52l-4.096 34.816h90.112l-36.864 262.144H493.226667l-7.168 50.176h129.024l-13.312 97.28H472.746667l-8.192 62.464h147.456l-13.312 98.304H170.666667l13.312-98.304h126.976l8.192-62.464h-104.448l13.312-97.28h104.448l7.168-50.176h-109.568l36.864-262.144h75.776z m523.264 589.824l65.536-464.896H826.026667l-17.408 87.04h95.232l-11.264 155.648h-99.328l7.168-113.664-45.056 226.304 108.544-9.216-14.336 100.352-245.76 17.408 114.688-614.4h-20.48l14.336-98.304h391.168l-14.336 98.304H855.722667l-11.264 60.416h228.352l-63.488 455.68h14.336L1042.090667 750.933333l-17.408 120.832h-158.72zM541.354667 378.197333l-10.24 70.656h35.84l10.24-70.656h-35.84z m-125.952 70.656h30.72l10.24-70.656h-30.72l-10.24 70.656z m-80.896 0l10.24-70.656h-29.696l-10.24 70.656h29.696z m105.472-166.912h30.72l4.096-34.816h-30.72l-4.096 34.816zM1674.922667 155.989333l-30.72 97.28h74.752l11.264-77.824L1696.426667 136.533333h194.56l-16.384 116.736h136.192l-12.288 87.04h-136.192l-13.312 98.304h155.648l-12.288 87.04h-97.28l-11.264 77.824h77.824l45.056-38.912-22.528 155.648H1711.786667l27.648-194.56h-59.392l-84.992 194.56h-155.648l84.992-194.56h-76.8l12.288-87.04h233.472l13.312-98.304h-89.088l-14.336 49.152h-136.192l61.44-199.68-28.672-33.792h175.104zM1148.586667 856.405333l52.224-97.28 49.152-350.208h-38.912l13.312-97.28h214.016l-56.32 405.504 140.288 41.984h476.16l-13.312 97.28H1440.426667l-100.352-29.696-16.384 29.696H1148.586667zM1402.538667 155.989333l41.984 116.736h-155.648l-41.984-116.736h155.648z" fill="#FFFFFF" p-id="15493"></path></svg>
\ No newline at end of file
diff --git a/utils/common.js b/utils/common.js
index f763174..6f90b63 100644
--- a/utils/common.js
+++ b/utils/common.js
@@ -475,6 +475,7 @@ let data = {
     }
   },
   setJobInfoPositionv3 (str) {
+    str = str.replace(/；/g, '');
     var reg = /.+?(省|市|自治区|自治州|县|区)/g; // 省市区的正则
     let matches = str.match(reg);
     let result = '';
@@ -567,7 +568,7 @@ let data = {
     } else if (salaryClassify == 6) {
       return `面议`;
     } else if (salaryClassify == 7) {
-      return salary + '-' + salary1 + `元/月`;
+      return `月薪`;
     } else {
       return "-";
     }
@@ -581,13 +582,13 @@ let data = {
     var salary1 = this.moneyToFixed(salaryClassifyValue1);
 
     if (salaryClassify == 0) {
-      return `${salary}<span style='font-size:14px'>元/小时</span>`;
+      return `<span style='font-size:18px'>${salary}<span style='font-size:14px'>元/小时</span></span>`;
     } else if (salaryClassify == 1) {
-      return `${salary}<span style='font-size:14px'>元/天</span>`;
+      return `<span style='font-size:18px'>${salary}<span style='font-size:14px'>元/天</span></span>`;
     } else if (salaryClassify == 2) {
-      return `<span style='font-size:14px'>补</span>${salary}<span style='font-size:14px'>元</span>`;
+      return `<span style='font-size:18px'><span style='font-size:14px'>补</span>${salary}<span style='font-size:14px'>元</span></span>`;
     } else if (salaryClassify == 3) {
-      return `<span style='font-size:14px'>返</span>${salary}<span style='font-size:14px'>元</span>`;
+      return `<span style='font-size:18px'><span style='font-size:14px'>返</span>${salary}<span style='font-size:14px'>元</span></span>`;
     } else if (salaryClassify == 4) {
       return `<span style='font-size:18px'>计件</span>`;
     } else if (salaryClassify == 5) {
@@ -595,7 +596,8 @@ let data = {
     } else if (salaryClassify == 6) {
       return `<span style='font-size:18px'>面议</span>`;
     } else if (salaryClassify == 7) {
-      return salary + '-' + salary1 + `<span style='font-size:14px'>元/月</span>`;
+      // return salary + '-' + salary1 + `<span style='font-size:14px'>元/月</span>`;
+      return `<span style='font-size:18px'>月薪</span>`; 
     } else {
       return "-";
     }
@@ -839,6 +841,7 @@ let data = {
         //职位特色
         jobList["jobSpecialLabelNames"] = that.getJobSpecialLabelNamesArray(jobList.jobSpecialLabelNames);
         jobList["jobRequestLabelNames"] = that.getJobSpecialLabelNamesArray(jobList.jobRequestLabelNames);
+        console.log('jobList', JSON.parse(JSON.stringify(jobList)));
         // 特色标签
         const jobSpecialLabelNames = [];
         if (that.isNotEmptyCheck(jobList.jobSpecialLabelNames) && Array.isArray(jobList.jobSpecialLabelNames)) {
@@ -862,6 +865,8 @@ let data = {
           });
           jobList.jobRequestLabelNames = jobSpecialLabelNames1;
         }
+        console.log('jobList11', JSON.parse(JSON.stringify(jobList)));
+        console.log('jobList1111', Array.isArray(jobList.jobRequestLabelNames));
       }
     }
     return jobList;
@@ -1492,7 +1497,7 @@ let data = {
 * @params $type 1：共享 0 普通
 */
   setReturnFee (returnFee, returnFeeType, $type) {
-    let servetype = '-', $num = 1;
+    let servetype = '', $num = 1;
     if ($type == 1) {
       $num = 1;
     } else {
diff --git a/uview-ui/components/u-tabs/u-tabs.vue b/uview-ui/components/u-tabs/u-tabs.vue
index 57ed3fc..499153a 100644
--- a/uview-ui/components/u-tabs/u-tabs.vue
+++ b/uview-ui/components/u-tabs/u-tabs.vue
@@ -263,6 +263,7 @@ export default {
 		},
 		// 点击某一个tab菜单
 		clickTab(index) {
+      console.log(index);
 			// 点击当前活动tab，不触发事件
 			if (index == this.currentIndex) return;
 			// 发送事件给父组件