From f696d48c3332e575365d551de3d3676b1fd65890 Mon Sep 17 00:00:00 2001
From: zsk <710162063@qq.com>
Date: Wed, 12 Jun 2024 11:49:35 +0800
Subject: [PATCH] no message

---
 src/components/FirstJob/detail.vue                 | 11 +++++----
 src/components/FirstJob/joblist.vue                | 27 ++++++++++++++++++----
 .../merchantManagement/roleManagementDetail.vue    |  2 +-
 src/utils/request.js                               |  4 ++--
 4 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/src/components/FirstJob/detail.vue b/src/components/FirstJob/detail.vue
index 40bfb34..72daece 100644
--- a/src/components/FirstJob/detail.vue
+++ b/src/components/FirstJob/detail.vue
@@ -405,15 +405,16 @@
 			<div class="maincontentright">
 				<div class="hotphone">
 					<h1 class="bottombox" style>
-						<i>客户经理</i>
+						<i>项目方</i>
 					</h1>
 					<img style="width: 60px; height: 60px; border-radius: 50%" class="mt24" :src="managerInfo.avatar || 'https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/service.jpg'" alt />
-					<div style="color: #333; font-weight: 600">
-						<p class="f16" style="margin-top: 10px; margin-bottom: 0">
+					<div style="color: #333;">
+						<p class="f14" style="margin-top: 10px; margin-bottom: 0">
 							{{ managerInfo.name }}
-							<i class="iconfont icon-dianhua1 ml4 f14" style="line-height: 24px; color: #ff4400"></i>
+							<!-- <i class="iconfont icon-dianhua1 ml4 f14" style="line-height: 24px; color: #ff4400"></i> -->
 						</p>
-						<p class="f16">{{ managerInfo.workPhone || "-" }}</p>
+            <img src="https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/ysd1.png" style="width: 20px;height: 20px;" alt="">
+						<!-- <p class="f16">{{ managerInfo.workPhone || "-" }}</p> -->
 					</div>
 					<!-- <p class="mt24 f16">{{ managerInfo.workPhone || "-" }}</p>
 					<p class="f16">
diff --git a/src/components/FirstJob/joblist.vue b/src/components/FirstJob/joblist.vue
index cb31adc..87a4f26 100644
--- a/src/components/FirstJob/joblist.vue
+++ b/src/components/FirstJob/joblist.vue
@@ -515,6 +515,14 @@
                   rel="opener"
                   >-->
 									<div class="jobname">{{ item.jobName }}</div>
+                  <div class="xmfDiv">
+                    <img src="https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/xmf.svg" class="ml4" alt="">
+                    <span class="f12 ml12" style="color:#646572">江西人海科技有限公司</span>
+                  </div>
+
+                  <img src="https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/ysd1.png" style="width: 20px;height: 20px;" alt="">
+
+
 									<!-- </router-link> -->
 									<div class="jobinfo">
 										<span>{{ item.district }}</span>
@@ -532,9 +540,9 @@
 										<span v-for="(item1, index) in item.jobSpecialLabelNames" :key="index">{{ item1 }}</span>
 										<span v-if="item.jobSpecialLabelNames.length == 0">暂无特色</span>
 									</div>
-									<div class="jobpricemonth" v-if="item.minMonthlyPay">
-										<!-- :style="{ opacity: item.minMonthlyPay ? '1' : '0' }" -->
-
+									
+									<div class="jobpricehour" v-html="getSalaryClassifyValue(item.salaryClassify, item.salaryClassifyValue)"></div>
+                  <div class="jobpricemonth" v-if="item.minMonthlyPay">
 										<template v-if="formvalue.signType != 1">
 											<span>{{ item.minMonthlyPay ? item.minMonthlyPay : "" }}</span
 											>-<span>{{ item.maxMonthlyPay ? item.maxMonthlyPay : "" }}</span
@@ -546,7 +554,6 @@
 											>元/月
 										</template>
 									</div>
-									<div class="jobpricehour" v-html="getSalaryClassifyValue(item.salaryClassify, item.salaryClassifyValue)"></div>
 								</div>
 							</div>
 						</span>
@@ -3219,19 +3226,31 @@ export default {
 						}
 					}
 					.jobpricemonth {
+            display: inline-block;
 						margin-top: 10px;
 						font-size: 14px;
 						font-weight: 400;
 						text-align: left;
 						color: #333;
 						line-height: 20px;
+            margin-left: 8px;
 					}
+          .xmfDiv{
+            display: inline-block;
+            height: 20px;
+            margin-top: 4px;
+            background: #f1faff;
+            border-radius: 2px;
+            line-height: 16px;
+            padding-right: 4px;
+          }
 					.jobpricehour {
 						margin-top: 8px;
 						font-size: 14px;
 						font-weight: normal;
 						text-align: left;
 						color: #ff4400;
+            display: inline-block;
 						// line-height: 24px;
 						font-weight: 600;
 						span {
diff --git a/src/components/merchantManagement/roleManagementDetail.vue b/src/components/merchantManagement/roleManagementDetail.vue
index d7cb010..86d1de8 100644
--- a/src/components/merchantManagement/roleManagementDetail.vue
+++ b/src/components/merchantManagement/roleManagementDetail.vue
@@ -17,7 +17,7 @@
         <!-- 角色信息 -->
         <div class="fw500 mb16 f16">角色信息</div>
         <div class="fss">
-          <a-form-item class="addItem fss" label="角色名称：">
+          <a-form-item class="addItem fss" label="角色名称1：">
             <span>{{roleInfo.roleName || '-'}}</span>
           </a-form-item>
           <a-form-item class="addItem fss" label="角色描述：" style="margin-left:44px">
diff --git a/src/utils/request.js b/src/utils/request.js
index accc528..61d96fa 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -5,8 +5,8 @@ import qs from "qs";
 
 // import Vue from "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";