From c44c0649a69ee8e1dc92532c9c253bc6d7dc1f05 Mon Sep 17 00:00:00 2001
From: zsk <710162063@qq.com>
Date: Fri, 14 Jun 2024 17:00:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E6=89=8D=E6=9C=8D=E5=8A=A1=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FirstJob/detailYicai.vue | 18 ++++++++++++------
 src/components/FirstJob/joblist.vue     |  6 +++++-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/components/FirstJob/detailYicai.vue b/src/components/FirstJob/detailYicai.vue
index 43d5b28..b827b16 100644
--- a/src/components/FirstJob/detailYicai.vue
+++ b/src/components/FirstJob/detailYicai.vue
@@ -44,13 +44,14 @@
 									<span>{{ jobDetail.gender }}</span>
 									<span>{{ jobDetail.age }}</span>
 								</div>
-								<div class="jobtag">
-									<!-- <span>返费</span> -->
-									<a-tag :color="labelColor[index % labelColor.length]" v-for="(item, index) in jobDetail.jobRequestLabelNames" :key="index">{{ item }}</a-tag>
-								</div>
-								<div style="height: 27px" v-if="!jobDetail.jobRequestLabelNames" class="jobtag">
+								<div style="height: 27px" v-if="jobDetail.jobRequestLabelNames == ''" class="jobtag">
+                  
 									<a-tag :color="labelColor[1]">暂无要求</a-tag>
 								</div>
+                <div class="jobtag" v-else>
+                  
+									<a-tag :color="labelColor[index % labelColor.length]" v-for="(item, index) in jobDetail.jobRequestLabelNames" :key="index">{{ item }}</a-tag>
+								</div>
 								<div class="jobtag1" v-if="jobDetail.jobSpecialLabelNames != ''">
 									<!-- <span>返费</span> -->
 									<a-tag v-for="(item, index) in jobDetail.jobSpecialLabelNames" :key="index">{{ item }}</a-tag>
@@ -318,7 +319,12 @@ export default {
 					this.jobDetail.minMonthlyPayStr = this.jobDetail.minMonthlyPay / 100;
 					this.store = data.data;
 					this.jobDetail.district = disposeJobListData(data.data).district;
-					this.retrunFee = setReturnFee(data.data.returnFee, data.data.returnFeeType);
+          if (this.jobDetail.jobType == 2) {
+            this.retrunFee =setReturnFee(data.data.agencyReturnFee, data.data.agencyReturnFeeType);
+          }else{
+					  this.retrunFee = setReturnFee(data.data.returnFee, data.data.returnFeeType);
+
+          }
 
           if(isNotEmptyCheck(this.jobDetail.jobSpecialLabelNames)){
             this.jobDetail.jobSpecialLabelNames = new String(this.jobDetail.jobSpecialLabelNames).split(',')
diff --git a/src/components/FirstJob/joblist.vue b/src/components/FirstJob/joblist.vue
index 934e35e..b94f237 100644
--- a/src/components/FirstJob/joblist.vue
+++ b/src/components/FirstJob/joblist.vue
@@ -1376,7 +1376,11 @@ export default {
 					if (data.status === 200) {
 						this.jobMainList = disposeJobListData(data.data.recordList);
 						this.jobMainList.forEach((item, index) => {
-							item["servetype"] = setReturnFee(item.returnFee, item.returnFeeType);
+              if (item.jobType == 2) {
+                item["servetype"] = setReturnFee(item.agencyReturnFee, item.agencyReturnFeeType);
+              }else{
+							  item["servetype"] = setReturnFee(item.returnFee, item.returnFeeType);
+              }
 						});
 						this.formvalue.total = data.data.recordCount;
 						console.log(this.jobMainList);