From 5f4eec81a96da95e111303761c5b1cdd3055348e Mon Sep 17 00:00:00 2001
From: jscyl13849007907 <13849007907@163.com>
Date: Mon, 20 Jan 2025 15:10:27 +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  | 42 ++++++++++++++++++++-----------------
 src/components/FirstJob/joblist.vue |  7 ++++---
 src/utils/commonUtil.js             | 17 +++++++++++++++
 src/views/main.vue                  |  4 ++++
 4 files changed, 48 insertions(+), 22 deletions(-)

diff --git a/src/components/FirstJob/detail.vue b/src/components/FirstJob/detail.vue
index 505288e..3b97fa5 100644
--- a/src/components/FirstJob/detail.vue
+++ b/src/components/FirstJob/detail.vue
@@ -10,7 +10,7 @@
 			</a-breadcrumb-item>
 			<a-breadcrumb-item href>
 				<a @click="toList">
-					<span>{{  "伯才职位" }}</span>
+					<span>{{  "职位列表" }}</span>
 				</a>
 			</a-breadcrumb-item>
 			<a-breadcrumb-item href>
@@ -141,9 +141,9 @@
 										</span>
                 </div>
 								<div class="jobinfo">
-									<span>{{ jobDetail.storeAddr }} </span>
+									<span>{{ jobDetail.district }} |</span>
 
-									<span>{{ jobDetail.gender }}</span>
+									<span>&nbsp;{{ jobDetail.gender }}</span>
 									<span>{{ jobDetail.age }}</span>
 								</div>
 								<div class="jobtag">
@@ -203,16 +203,17 @@
 						<div style="color: #a1a1a1;font-size: 14px;margin-left: 15px;">{{ jobDetail.up_time }}</div>
 						<div class="sub-bottombox fss">
 							<button type="primary" class="jobDespBtn" v-if="jobClassify == 1">
-
-								<a :href="jobDetail.customServiceUrl || 'javascript:;'" target="_blank" v-if="jobDetail.customServiceUrl"> <i class="iconfont icon-kefu_lan mr6"></i>联系客服</a>
-								<a href="javascript:;" v-else @click="noCustom"> <i class="iconfont icon-kefu_lan mr6"></i>联系客服</a>
-
-                
+								<a :href="jobDetail.customServiceUrl || 'javascript:;'" target="_blank" v-if="jobDetail.customServiceUrl"> 
+									<i class="iconfont icon-kefu_lan mr6"></i>联系客服1
+							  </a>
+								<a href="javascript:;" v-else @click="noCustom"> 
+									<i class="iconfont icon-kefu_lan mr6"></i>联系客服2
+								</a>
 							</button>
 
 							<a-dropdown :trigger="['click']" overlayClassName="special-dropdown" v-else>
-								<button type="primary" class="jobDespBtn">
-									<a href="javascript:;" target="_blank"> <i class="iconfont icon-kefu_lan mr6"></i>联系客服</a>
+								<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>
 								<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>
@@ -232,7 +233,7 @@
 						</div>
 					</h1>
 					<div class="pay" id="tip" v-show="tabchange === 1">
-						<div class="mb12 mt20 titlestyle">温馨提示</div>
+						<div class="mb12 mt20 titlestyle" style="color: #ff4400;">温馨提示</div>
 						<div class="showInfo" style="width: unset">{{ jobDetail.notes || "-" }}</div>
 					</div>
 					<div v-if="tabchange === 1" style="display: flex">
@@ -462,11 +463,11 @@
 						 style="padding-left: 16px;padding-right: 16px;font-size: 16px;background-color: #1890ff;height: 40px;border-top-left-radius: 6px;border-top-right-radius: 6px;"
 				>
 					<div class="g_flex_column_center">
-						<i style="color: #fff;">代理佣金</i>
+						<i style="color: #fff;font-weight: 600;">代理佣金</i>
 					</div>
 					<div class="g_flex_column_center" @click="isSee = !isSee" style="cursor: pointer;">
-						<i class="iconfont icon-zhengyan11" style="font-size: 22px;color: #ff4400;line-height: 0.1;" v-if="isSee"></i>
-						<i class="iconfont icon-biyan11" style="font-size: 22px;color: #ff4400;line-height: 0.1;margin-top: -4px;" v-if="!isSee"></i>
+						<i class="iconfont icon-zhengyan11" style="font-size: 22px;color: #fff;line-height: 0.1;" v-if="isSee"></i>
+						<i class="iconfont icon-biyan11" style="font-size: 22px;color: #fff;line-height: 0.1;margin-top: -4px;" v-if="!isSee"></i>
 					</div>
 				</div>
 				<div class="card-bottom" style="background-color: #fff;border-bottom-right-radius: 6px;border-bottom-left-radius: 6px;padding: 16px;">
@@ -507,7 +508,7 @@
 </template>
 <script>
 import { getJobDetailApi } from "../../api/job";
-import { disposeJobListData, getSalaryClassifyValue } from "../../utils/commonUtil";
+import { disposeJobListData, getSalaryClassifyValue,setJobInfoPosition } from "../../utils/commonUtil";
 import mserve from "../../components/FirstJob/components/servre.vue";
 import { nationlist } from "../../utils/datalist";
 import { getUserManagerApi } from "../../api/userinfo";
@@ -898,7 +899,7 @@ export default {
 						this.positionInfo.desc = this.positionInfo.detailPosition;
 						this.positionInfo.containerName = "mapContainer";
 						this.positionInfo.name = this.positionInfo.aliasName;
-						this.jobDetail.district = disposeJobListData(data.data.store).district;
+						this.jobDetail.district = setJobInfoPosition(disposeJobListData(data.data.store).district);
 					} else {
 						this.positionInfo = data.data.record;
 						this.store = data.data.record;
@@ -907,7 +908,8 @@ export default {
 						this.positionInfo.name = this.positionInfo.storeName;
 						this.positionInfo.lat = this.positionInfo.storeLat;
 						this.positionInfo.lng = this.positionInfo.storeLng;
-						this.jobDetail.district = this.positionInfo.storeDistrict;
+						this.jobDetail.district = setJobInfoPosition(this.positionInfo.storeDistrict);
+						console.log("this.jobDetail", this.jobDetail);
 					}
 					if (data.data.onSiteUsers) {
 						this.onSiteUsersInfo = data.data.onSiteUsers.map((item) => `${item.aliasName} ${item.tel}`).join(", ");
@@ -1576,7 +1578,7 @@ export default {
 						}
 					}
 					.jobDespBtn {
-						width: 116px;
+						// width: 116px;
 						height: 32px;
 						line-height: 30px;
 						font-size: 16px;
@@ -1653,10 +1655,12 @@ export default {
 						border-bottom: none;
 						cursor: pointer;
 						border-radius: 4px 4px 0 0;
+						font-size: 16px;
+						color: #333;
 					}
 					.active {
 						background-color: #fafafa;
-						// font-weight: bold;0
+						font-weight: bold;
 						color: #1890ff;
 					}
 				}
diff --git a/src/components/FirstJob/joblist.vue b/src/components/FirstJob/joblist.vue
index aca5550..2ecb404 100644
--- a/src/components/FirstJob/joblist.vue
+++ b/src/components/FirstJob/joblist.vue
@@ -658,8 +658,8 @@
 
 											<!-- </router-link> -->
 											<div class="jobinfo">
-												<span>{{ item.district }}</span>
-												<span>{{ item.gender }}</span>
+												<span>{{ item.storeDistrict }} |</span>
+												<span>&nbsp;{{ item.gender }}</span>
 												<span v-if="item.distance != null && item.distance != '' && formvalue.sortTag == 2">{{ item.distanceKm }}</span>
 												<span v-else>{{ item.age }}</span>
 											</div>
@@ -852,7 +852,7 @@ import {
 import { getUserManagerApi } from "../../api/userinfo";
 import $ from "jquery";
 
-import { moneyToFixed, getSalaryClassifyValue, isNotEmptyCheck, disposeJobListData, setReturnFee } from "../../utils/commonUtil";
+import { moneyToFixed, getSalaryClassifyValue, isNotEmptyCheck, disposeJobListData, setReturnFee,setJobInfoPosition } from "../../utils/commonUtil";
 import recommend from "@/components/FirstJob/components/recommend.vue";
 import { nationlist } from "../../utils/datalist";
 import Clipboard from "clipboard";
@@ -1302,6 +1302,7 @@ export default {
 						}
 						data.data.recordList.forEach(item => { 
 							item.up_time = this.timeShowXXX2(item.updateTime)
+							item.storeDistrict = setJobInfoPosition(item.storeDistrict)
 						})
 						if(newdata.isScroll == 1){
 							this.jobMainList = this.jobMainList.concat(disposeJobListData(data.data.recordList)); // 追加数据
diff --git a/src/utils/commonUtil.js b/src/utils/commonUtil.js
index 16c4e90..205ddfe 100644
--- a/src/utils/commonUtil.js
+++ b/src/utils/commonUtil.js
@@ -1779,4 +1779,21 @@ export function getDateYMD () {
   let prevMonth = date.getMonth() + 1;
   let prevDay = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
   return prevYear + "-" + (prevMonth >= 10 ? prevMonth : "0" + prevMonth) + "-" + prevDay;
+}
+/* 
+  处理详情地址
+*/
+export function setJobInfoPosition (pos) {
+  let city = [];
+  let citys = [];
+  if (isNotEmptyCheck(pos)) {
+    city = pos.split(",");
+  }
+  city.forEach((i) => {
+    if (isNotEmptyCheck(i)) {
+      citys.push(i);
+    }
+  });
+  citys = citys.join(",").replace(/,/g, " | ");
+  return citys ;
 }
\ No newline at end of file
diff --git a/src/views/main.vue b/src/views/main.vue
index e0a6001..f434da5 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -454,6 +454,7 @@ export default {
 		$route: {
 			handler(to) {
 				this.init()
+				this.showfooter();
 				console.log();
 				// console.log("ischange");
 				// console.log(to);
@@ -729,6 +730,9 @@ export default {
 
 				this.isfootershow = true;
 			}
+			if (this.pagrTitle == 'list') {
+				this.isfootershow = false;
+			}
 			if (path.indexOf("login") > -1 && path.indexOf("loginpsw") == -1) {
 				this.isbannershow = false;
 			}