From ad791024ec1151619ace908416e9ef6083e3ef05 Mon Sep 17 00:00:00 2001
From: jscyl13849007907 <13849007907@163.com>
Date: Mon, 20 Jan 2025 16:17:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FirstJob/detail.vue  | 15 ++++--
 src/components/FirstJob/joblist.vue | 99 ++++++++++++++++++++-----------------
 2 files changed, 66 insertions(+), 48 deletions(-)

diff --git a/src/components/FirstJob/detail.vue b/src/components/FirstJob/detail.vue
index 21aa4b4..c7b70a4 100644
--- a/src/components/FirstJob/detail.vue
+++ b/src/components/FirstJob/detail.vue
@@ -141,9 +141,9 @@
 										</span>
                 </div>
 								<div class="jobinfo">
-									<span>{{ jobDetail.district }} |</span>
+									<span>{{ jobDetail.district ? jobDetail.district + ' | ' : '' }} </span>
 
-									<span>&nbsp;{{ jobDetail.gender }}</span>
+									<span>{{ jobDetail.gender }}</span>
 									<span>{{ jobDetail.age }}</span>
 								</div>
 								<div class="jobtag" >
@@ -217,8 +217,15 @@
 							</button>
 
 							<a-dropdown :trigger="['click']" overlayClassName="special-dropdown" v-else>
-								<button type="primary" class="jobDespBtn" style="background-color: #1890ff;border-color: #1890ff;padding: 0 15px;">
-									<a href="javascript:;" target="_blank" style="font-size: 14px;color: #fff;"> <i class="iconfont icon-kefu_lan mr6" style="color: #fff;"></i>联系客服</a>
+								<button type="primary" class="jobDespBtn" 
+										    style="padding: 0 15px;width: 116px;"
+								>
+									<a href="javascript:;" target="_blank" 
+										 style="font-size: 14px;"
+									> 
+										<i class="iconfont icon-kefu_lan mr6"></i>
+										联系客服
+									</a>
 								</button>
 								<a-menu slot="overlay" style="padding: 0 10px">
 									<a-menu-item v-for="(item, index) in customServiceUsers" :key="index"> <i class="iconfont icon-dianhua1 mr4 f14" style="color: #1890ff"></i>{{ item.aliasName }} {{ item.tel }} </a-menu-item>
diff --git a/src/components/FirstJob/joblist.vue b/src/components/FirstJob/joblist.vue
index 2ecb404..8655352 100644
--- a/src/components/FirstJob/joblist.vue
+++ b/src/components/FirstJob/joblist.vue
@@ -353,35 +353,41 @@
 						<!-- v-if="loginValue.agencyName == '郑州一才工作' || loginValue.agencyName == '一才工作'" -->
 						<!-- <div class="tabSubset" :class="{ active: signType == 2 }" data-type="2">三方</div> -->
 					</div>
-					<div class="filter" v-if="false" :class="[filterStatus == 0 ? '' : 'nobd']" style>
-						<div class="filter-title" :style="{ top: filterStatus == 0 ? '-32px' : '-21px' }" v-if="false">
-							<span>
-								<span>
-									所有筛选
-									<i class="iconfont icon-youjiantou"></i>
-								</span>
-								<span class="filter-show">
-									<span @click="delFilter($event, 'price')" v-show="filterObj.price">
-										{{ filterObj.price }}
-										<i class="iconfont icon-guanbi2" v-show="filterObj.price"></i>
-									</span>
-									<span @click="delFilter($event, 'gender')" v-show="filterObj.gender">
-										{{ filterObj.gender }}
-										<i class="iconfont icon-guanbi2" v-show="filterObj.gender"></i>
-									</span>
-									<span @click="delFilter($event, 'age')" v-show="filterObj.age">
-										{{ filterObj.age }}
-										<i class="iconfont icon-guanbi2" v-show="filterObj.age"></i>
+					<div class="filter"  :class="[filterStatus == 0 ? '' : 'nobd']" style>
+						<div class="filter-title g_flex_row_between" style="margin-bottom: 12px;" :style="{ top: filterStatus == 0 ? '-32px' : '-21px' }">
+							<span class="g_flex_column_center">
+								<div class="g_flex_row_start">
+									<span style="color: #999;" class="g_flex_row_start">
+										<div class="g_flex_column_center" style="font-size: 14px;">
+											所有筛选
+										</div>
+										<div class="g_flex_column_center">
+											<i class="iconfont icon-youjiantou" style="font-size: 20px;margin-top: -14px;height: 14px;"></i>
+										</div>
 									</span>
-									<span @click="delFilter($event, 'special', item)" v-for="(item, index) in filterObj.specialactive" :key="index">
-										{{ item.name }}
-										<i class="iconfont icon-guanbi2"></i>
+									<span class="filter-show">
+										<span @click="delFilter($event, 'price')" v-show="filterObj.price" style="font-size: 14px;cursor: pointer;">
+											{{ filterObj.price }}
+											<i class="iconfont icon-guanbi2" v-show="filterObj.price" style="font-size: 14px;"></i>
+										</span>
+										<span @click="delFilter($event, 'gender')" v-show="filterObj.gender" style="font-size: 14px;cursor: pointer;">
+											{{ filterObj.gender }}
+											<i class="iconfont icon-guanbi2" v-show="filterObj.gender" style="font-size: 14px;cursor: pointer;"></i>
+										</span>
+										<span @click="delFilter($event, 'age')" v-show="filterObj.age" style="font-size: 14px;cursor: pointer;">
+											{{ filterObj.age }}
+											<i class="iconfont icon-guanbi2" v-show="filterObj.age" style="font-size: 14px;"></i>
+										</span>
+										<span @click="delFilter($event, 'special', item)" v-for="(item, index) in filterObj.specialactive" :key="index" style="font-size: 14px;cursor: pointer;">
+											{{ item.name }}
+											<i class="iconfont icon-guanbi2" style="font-size: 14px;"></i>
+										</span>
+										<i v-show="showDotted" style="line-height: 24px;font-size: 14px;">...</i>
 									</span>
-									<i v-show="showDotted" style="line-height: 24px">...</i>
-								</span>
+								</div>
 							</span>
 							<span>
-								<span class="toggleFilter" @click="hideFilterContent">
+								<!-- <span class="toggleFilter" @click="hideFilterContent">
 									{{ filterStatus == 0 ? "收起筛选" : "展开筛选" }}
 									<i
 										class="iconfont icon-sousuoxiala"
@@ -389,9 +395,9 @@
 											transform: filterStatus == 0 ? 'rotate(180deg) scale(.6)' : '',
 										}"
 									></i>
-								</span>
+								</span> -->
 								<a-dropdown :trigger="['click']" overlayClassName="sortClass" placement="bottomRight">
-									<span class="sort">{{ sortStr }}</span>
+									<span class="sort" style="color: #999;font-size: 14px;">{{ sortStr }}</span>
 									<a-menu slot="overlay">
 										<a-menu-item>
 											<div class="sortMenu" :class="sortNum == 1 ? 'active' : ''" @click="sortList('price')">工价优先</div>
@@ -406,7 +412,7 @@
 								</a-dropdown>
 							</span>
 						</div>
-						<div class="filter-content" style="transition: height 0.2s">
+						<div class="filter-content" style="transition: height 0.2s" v-if="false">
 							<dl class="price">
 								<dt>工价：</dt>
 								<dd>
@@ -630,7 +636,7 @@
 							>
 								<!-- v-if="signType == ''" -->
 
-								<span @click="toDetail(item)" style="cursor: pointer">
+								<span @click="toDetail(item)" style="cursor: pointer;width: 70%;">
 									<div class="subsetleft" @click="totop">
 										<!-- <div class="imgbox">
 											<img v-if="item.logo.length !== 0" :src="item.logo" style="object-fit: cover; width: 156px; height: 156px" />
@@ -658,8 +664,8 @@
 
 											<!-- </router-link> -->
 											<div class="jobinfo">
-												<span>{{ item.storeDistrict }} |</span>
-												<span>&nbsp;{{ item.gender }}</span>
+												<span>{{ item.storeDistrict ? item.storeDistrict + ' | ' : ''}}</span>
+												<span>{{ item.gender }}</span>
 												<span v-if="item.distance != null && item.distance != '' && formvalue.sortTag == 2">{{ item.distanceKm }}</span>
 												<span v-else>{{ item.age }}</span>
 											</div>
@@ -673,18 +679,23 @@
 												<span v-for="(item1, index) in item.jobSpecialLabelNames" :key="index">{{ item1 }}</span>
 												<span v-if="item.jobSpecialLabelNames.length == 0">暂无特色</span>
 											</div>
-											<div class="jobpricehour" v-html="getSalaryClassifyValue(item.salaryClassify, item.salaryClassifyValue)"></div>
-											<div class="jobpricemonth" v-if="item.minMonthlyPay">
-												<template v-if="signType != 1">
-													<span>{{ item.minMonthlyPay ? item.minMonthlyPay / 100 : "" }}</span
-													>-<span>{{ item.maxMonthlyPay ? item.maxMonthlyPay / 100 : "" }}</span
-													>元/月
-												</template>
-												<template v-else>
-													<span>{{ item.minMonthlyPay ? item.minMonthlyPay / 100 : "" }}</span
-													>-<span>{{ item.maxMonthlyPay ? item.maxMonthlyPay / 100 : "" }}</span
-													>元/月
-												</template>
+											<div class="g_flex_row_start">
+												<div class="jobpricehour" v-html="getSalaryClassifyValue(item.salaryClassify, item.salaryClassifyValue)"></div>
+												<div class="g_flex_column_end" style="font-size: 16px">&nbsp;|&nbsp;</div>
+												<div class="g_flex_column_end">
+													<div class="jobpricemonth g_flex_column_end" v-if="item.minMonthlyPay" style="margin-left: 0;">
+														<template v-if="signType != 1">
+															<span>{{ item.minMonthlyPay ? item.minMonthlyPay / 100 : "" }}</span
+															>-<span>{{ item.maxMonthlyPay ? item.maxMonthlyPay / 100 : "" }}</span
+															>元/月
+														</template>
+														<template v-else>
+															<span>{{ item.minMonthlyPay ? item.minMonthlyPay / 100 : "" }}</span
+															>-<span>{{ item.maxMonthlyPay ? item.maxMonthlyPay / 100 : "" }}</span
+															>元/月
+														</template>
+													</div>
+												</div>
 											</div>
 										</div>
 									</div>
@@ -699,7 +710,7 @@
 											<div>{{ item.servetype }}</div>
 										</div>
 
-										<div class="fsa f12 pr4" style="background: linear-gradient(138deg,#fde0ad 22%, #fac474); border-radius:2px;color:#754300;line-height:24px;height: 24px;">
+										<div class="fsa f12 pr4" style="background: linear-gradient(138deg,#fde0ad 22%, #fac474); border-radius:2px;color:#754300;line-height:24px;height: 24px;margin-top: 2px;">
 											<div class>
 												<img class="mr4" style="width:24px;height:24px;display:block" 
 												src="https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/fee.svg"  lazy-load="false"></img>