From 8f4d5a98390ee48e5c13d128cc1413dda227973d Mon Sep 17 00:00:00 2001
From: zsk <710162063@qq.com>
Date: Wed, 17 Jan 2024 15:46:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E6=89=8D=E8=81=8C?=
 =?UTF-8?q?=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FirstJob/components/recordSuccess.vue | 2 +-
 src/components/FirstJob/detailYicai.vue              | 6 ++++--
 src/components/FirstJob/joblist.vue                  | 4 +++-
 src/views/main.vue                                   | 5 ++++-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/components/FirstJob/components/recordSuccess.vue b/src/components/FirstJob/components/recordSuccess.vue
index e968474..1ee49ce 100644
--- a/src/components/FirstJob/components/recordSuccess.vue
+++ b/src/components/FirstJob/components/recordSuccess.vue
@@ -91,7 +91,7 @@ export default {
   // 组件方法
   methods: {
     onClose() {
-      this.$router.push("/detail?id=" + this.firminfo.id);
+      this.$router.go(-1);
     },
     handleOk() {
       this.$router.push("/mybill");
diff --git a/src/components/FirstJob/detailYicai.vue b/src/components/FirstJob/detailYicai.vue
index 4bc9d55..68866bf 100644
--- a/src/components/FirstJob/detailYicai.vue
+++ b/src/components/FirstJob/detailYicai.vue
@@ -98,7 +98,7 @@
 						<div class="topbox">
 							<div>服务费</div>
 							<div>
-								<span>{{ jobDetail.servetype }}</span>
+								<span>{{ retrunFee }}</span>
 							</div>
 						</div>
 						<div class="sub-bottombox">
@@ -131,7 +131,7 @@
 </template>
 <script>
 import { getJobDetailYicaiApi } from "../../api/job";
-import { disposeJobListData, getSalaryClassifyValue, isNotEmptyCheck } from "../../utils/commonUtil";
+import { disposeJobListData, getSalaryClassifyValue, isNotEmptyCheck,setReturnFee } from "../../utils/commonUtil";
 import recommend from "../../components/FirstJob/components/recommend.vue";
 import { nationlist } from "../../utils/datalist";
 import { getUserManagerApi } from "../../api/userinfo";
@@ -184,6 +184,7 @@ export default {
 	// 组件状态值
 	data() {
 		return {
+      retrunFee:"",
 			previewVisible: false,
 			previewImage: "",
 			relationList: [],
@@ -307,6 +308,7 @@ export default {
 					this.jobDetail = disposeJobListData(data.data);
 					this.store = data.data;
 					this.jobDetail.district = disposeJobListData(data.data).district;
+          this.retrunFee = setReturnFee(data.data.returnFee, data.data.returnFeeType);
 
 					var districtStr = "";
 					if (isNotEmptyCheck(this.store.storeDistrict)) {
diff --git a/src/components/FirstJob/joblist.vue b/src/components/FirstJob/joblist.vue
index 61502be..6b64d08 100644
--- a/src/components/FirstJob/joblist.vue
+++ b/src/components/FirstJob/joblist.vue
@@ -1441,7 +1441,9 @@ export default {
           this.classifyList = data.data.labels
           this.$nextTick(() => {
             let fileterContent = document.querySelector('.filter-content')
-            this.filterHeight = fileterContent.scrollHeight
+            if(isNotEmptyCheck(fileterContent.scrollHeight)){
+              this.filterHeight = fileterContent.scrollHeight
+            }
             // fileterContent.style.height = this.filterHeight + "px";
           })
         }
diff --git a/src/views/main.vue b/src/views/main.vue
index a55316c..52d28c7 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -245,7 +245,7 @@ import {
 } from '../api/job'
 
 import { logoutApi } from '../api/login'
-import { disposeJobListData } from '../utils/commonUtil'
+import { disposeJobListData,setReturnFee } from '../utils/commonUtil'
 
 export default {
   inject: ['reload'],
@@ -549,6 +549,9 @@ export default {
           // console.log(data);
           if (data.status === 200) {
             this.jobMainList = disposeJobListData(data.data.recordList)
+            this.jobMainList.forEach((item,index) => {
+              item['servetype'] = setReturnFee(item.returnFee,item.returnFeeType);
+            })
             this.formvalue.total = data.data.recordCount
             console.log(this.jobMainList)
           } else {