From 98cf9e16360523afd089e7b932ce88fef84a70e0 Mon Sep 17 00:00:00 2001
From: zsk <710162063@qq.com>
Date: Fri, 14 Jun 2024 14:55:10 +0800
Subject: [PATCH] 1

---
 src/components/FirstJob/detail.vue  | 39 +++++++++++++++++++++++++------------
 src/components/FirstJob/joblist.vue |  2 +-
 src/utils/request.js                |  4 ++--
 3 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/src/components/FirstJob/detail.vue b/src/components/FirstJob/detail.vue
index fb1320b..44b5441 100644
--- a/src/components/FirstJob/detail.vue
+++ b/src/components/FirstJob/detail.vue
@@ -170,7 +170,7 @@
 						</div>
 						<div class="sub-bottombox fss">
 							<button type="primary" class="jobDespBtn" v-if="jobClassify == 1">
-								<a :href="jobDetail.customServiceUrl" target="_blank"> <i class="iconfont icon-kefu_lan mr6"></i>联系客服</a>
+								<a :href="jobDetail.customServiceUrl || 'javascript:;'" :target="jobDetail.customServiceUrl ? '_blank' : '_self'"> <i class="iconfont icon-kefu_lan mr6"></i>联系客服</a>
 							</button>
 
 							<a-dropdown :trigger="['click']" overlayClassName="special-dropdown" v-else>
@@ -191,7 +191,7 @@
 						<div class="infotitle">
 							<span @click="tabchange = 1" :class="tabchange === 1 ? 'active' : ''">基本信息</span>
 							<span @click="tabchange = 0" :class="tabchange === 0 ? 'active' : ''">财务结算</span>
-							<span @click="tabchange = 2" :class="tabchange === 2 ? 'active' : ''">职位通告</span>
+							<span @click="tabchange = 2" :class="tabchange === 2 ? 'active' : ''">职位描述</span>
 						</div>
 					</h1>
 					<div class="pay" id="tip" v-show="tabchange === 1">
@@ -212,22 +212,37 @@
 										<span slot="label" class>发薪日</span>
 										<span>{{ jobDetail.payDay || "-" }}</span>
 									</a-descriptions-item>
-									<a-descriptions-item>
-										<span slot="label" class>保险</span>
-										<span>{{ jobDetail.employeeInsurance || "-" }}</span>
-									</a-descriptions-item>
 									<a-descriptions-item>
 										<span slot="label" class>银行卡</span>
 										<span>{{ jobDetail.bankInfo || "-" }}</span>
 									</a-descriptions-item>
+                  <a-descriptions-item>
+										<span slot="label" class>保险</span>
+										<span>{{ jobDetail.employeeInsurance || "-" }}</span>
+									</a-descriptions-item>
 									<a-descriptions-item>
 										<span slot="label" class>押金</span>
 										<span>{{ jobDetail.foregift || "-" }}</span>
 									</a-descriptions-item>
-									<a-descriptions-item>
-										<span slot="label" class>培训/试用期</span>
-										<span>{{ jobDetail.training || "-" }}</span>
-									</a-descriptions-item>
+                  <template v-if="jobClassify == 2">
+                    <a-descriptions-item>
+                      <span slot="label" class>培训/试用期</span>
+                      <span>{{ jobDetail.training || "-" }}</span>
+                    </a-descriptions-item>
+                  </template>
+                  <template v-else>
+                    <a-descriptions-item v-if="jobClassify == 1">
+                      <span slot="label" class>培训</span>
+                      <span>{{ jobDetail.training || "-" }}</span>
+                    </a-descriptions-item>
+                    <a-descriptions-item>
+										<span slot="label" class>试用期</span>
+										<span>{{ jobDetail.probation || "-" }}</span>
+									</a-descriptions-item> 
+                  </template>
+
+
+
 									<!-- <a-descriptions-item>
 										<span slot="label" class>试用期</span>
 										<span>{{ jobDetail.probation || "-" }}</span>
@@ -236,12 +251,12 @@
 										<span slot="label" class>福利待遇</span>
 										<span>{{ jobDetail.boon || "-" }}</span>
 									</a-descriptions-item>
-									<!-- <a-descriptions-item>
+									 <a-descriptions-item v-if="jobClassify == 1">
 										<span slot="label" class>薪资说明</span>
 										<span style="white-space: break-spaces">
 											{{ jobDetail.salaryDesp || "-" }}
 										</span>
-									</a-descriptions-item> -->
+									</a-descriptions-item>
 								</a-descriptions>
 							</div>
 							<!-- 岗位要求 -->
diff --git a/src/components/FirstJob/joblist.vue b/src/components/FirstJob/joblist.vue
index 48a8df9..934e35e 100644
--- a/src/components/FirstJob/joblist.vue
+++ b/src/components/FirstJob/joblist.vue
@@ -3469,7 +3469,7 @@ export default {
 			overflow: hidden;
 			position: relative;
 			width: 240px;
-			height: 220px;
+			height: 210px;
 			// height: 114px;
 			// padding: 0 20px 20px 20px;
 			border-radius: 6px;
diff --git a/src/utils/request.js b/src/utils/request.js
index c5ddd8b..8471bee 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -8,8 +8,8 @@ console.log('use message in request', vue);
 // import Vue from "vue";
 // console.log('use message in request2', Vue);
 // const baseURL = "http://1shoudan.com"; // 正式环境线上 废弃
-// const baseURL = "//idaotian.com"; // 正式环境线上
-const baseURL = "//test.renminshitang.com.cn/daotian/api_dev"; // 测试环境本地
+const baseURL = "//idaotian.com"; // 正式环境线上
+// const baseURL = "//test.renminshitang.com.cn/daotian/api_dev"; // 测试环境本地
 // const baseURL = "//idagou.cn"; // 正式环境线上 废弃
 // console.log(baseURL); 
 // const baseURL = "http://localhost:8001";