From ba31d30d2a29e937e59d4a6a1b4638ab9f90bd20 Mon Sep 17 00:00:00 2001
From: wangxia <779219182@qq.com>
Date: Thu, 6 Jun 2024 17:20:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9D=A2=E5=8C=85=E5=B1=91:=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85->=E8=81=8C=E4=BD=8D=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/userinfo.js                                |   2 +-
 src/components/FirstJob/components/recommend.vue   |   2 +-
 .../FirstJob/components/recordSuccess.vue          |   4 +-
 src/components/FirstJob/detail.vue                 |   4 +-
 src/components/FirstJob/joblist.vue                |   2 +-
 src/components/FirstJob/recordBill.vue             |   4 +-
 src/components/FirstJob/recordBillYicai.vue        |   4 +-
 src/components/Login/login.vue                     |   2 +-
 src/style/index.less                               |  24 ++--
 src/utils/request.js                               |  15 ++-
 src/views/main.vue                                 | 147 ++++++++++++++-------
 11 files changed, 134 insertions(+), 76 deletions(-)

diff --git a/src/api/userinfo.js b/src/api/userinfo.js
index 0cb7077..b85cf3b 100644
--- a/src/api/userinfo.js
+++ b/src/api/userinfo.js
@@ -116,7 +116,7 @@ export function setUserPswApi (data) {
 export function setUserTelApi (data) {
   return request({
     url: "/yishoudan/user/changeTel",
-    // method: "post",
+    method: "post",
     data: setqs(data),
   });
 }
diff --git a/src/components/FirstJob/components/recommend.vue b/src/components/FirstJob/components/recommend.vue
index e118c56..4a696e0 100644
--- a/src/components/FirstJob/components/recommend.vue
+++ b/src/components/FirstJob/components/recommend.vue
@@ -168,7 +168,7 @@ export default {
     }
   }
   .jobBox {
-    padding: 16px 20px;
+    padding: 16px 20px 0 20px;
     border-radius: 0 0 6px 6px;
     overflow: hidden;
     .jobinfobox:last-of-type {
diff --git a/src/components/FirstJob/components/recordSuccess.vue b/src/components/FirstJob/components/recordSuccess.vue
index 6f8124e..2c20d89 100644
--- a/src/components/FirstJob/components/recordSuccess.vue
+++ b/src/components/FirstJob/components/recordSuccess.vue
@@ -13,8 +13,8 @@
       <!-- <a-breadcrumb-item href="" v-if="!islist"> -->
       <a-breadcrumb-item>
         <router-link :to="'/detail?id=' + firminfo.id">
-          <!-- <span @click="$router.back(-1)">企业详情</span> -->
-          <span>企业详情</span>
+          <!-- <span @click="$router.back(-1)">职位详情</span> -->
+          <span>职位详情</span>
         </router-link>
       </a-breadcrumb-item>
       <a-breadcrumb-item href="">
diff --git a/src/components/FirstJob/detail.vue b/src/components/FirstJob/detail.vue
index 40bfb34..94473e1 100644
--- a/src/components/FirstJob/detail.vue
+++ b/src/components/FirstJob/detail.vue
@@ -13,7 +13,7 @@
 				</a>
 			</a-breadcrumb-item>
 			<a-breadcrumb-item href>
-				<span style="color: #333">{{ from == "vocational" ? "详情" : "企业详情" }}</span>
+				<span style="color: #333">{{ from == "vocational" ? "详情" : "职位详情" }}</span>
 			</a-breadcrumb-item>
 		</a-breadcrumb>
 		<!-- 主体区域 -->
@@ -424,7 +424,7 @@
 				<div class="companyinfo" v-if="from != 'vocational'">
 					<div class="companydetail">
 						<h1 class="bottombox">
-							<i>企业详情</i>
+							<i>职位详情</i>
 						</h1>
 					</div>
 					<div class="companylocation" style="text-align: center; padding: 0 20px 20px" v-if="positionInfo.lng">
diff --git a/src/components/FirstJob/joblist.vue b/src/components/FirstJob/joblist.vue
index 3ef7af0..80f253a 100644
--- a/src/components/FirstJob/joblist.vue
+++ b/src/components/FirstJob/joblist.vue
@@ -535,7 +535,7 @@
 									<div class="jobpricemonth" v-if="item.minMonthlyPay">
 										<!-- :style="{ opacity: item.minMonthlyPay ? '1' : '0' }" -->
 
-										<template v-if="formvalue.signType != 1">
+										<template v-if="signType != 1">
 											<span>{{ item.minMonthlyPay ? item.minMonthlyPay : "" }}</span
 											>-<span>{{ item.maxMonthlyPay ? item.maxMonthlyPay : "" }}</span
 											>元/月
diff --git a/src/components/FirstJob/recordBill.vue b/src/components/FirstJob/recordBill.vue
index 1ad972e..5b394c4 100644
--- a/src/components/FirstJob/recordBill.vue
+++ b/src/components/FirstJob/recordBill.vue
@@ -14,8 +14,8 @@
 			</a-breadcrumb-item>
 			<a-breadcrumb-item>
 				<router-link :to="'/detail'">
-					<!-- <span @click="$router.back(-1)">企业详情</span> -->
-					<span>企业详情</span>
+					<!-- <span @click="$router.back(-1)">职位详情</span> -->
+					<span>职位详情</span>
 				</router-link>
 			</a-breadcrumb-item>
 			<a-breadcrumb-item href>
diff --git a/src/components/FirstJob/recordBillYicai.vue b/src/components/FirstJob/recordBillYicai.vue
index a2a3f46..fe45de4 100644
--- a/src/components/FirstJob/recordBillYicai.vue
+++ b/src/components/FirstJob/recordBillYicai.vue
@@ -14,8 +14,8 @@
 			</a-breadcrumb-item>
 			<a-breadcrumb-item>
 				<router-link :to="'/detailYicai'">
-					<!-- <span @click="$router.back(-1)">企业详情</span> -->
-					<span>企业详情</span>
+					<!-- <span @click="$router.back(-1)">职位详情</span> -->
+					<span>职位详情</span>
 				</router-link>
 			</a-breadcrumb-item>
 			<a-breadcrumb-item href>
diff --git a/src/components/Login/login.vue b/src/components/Login/login.vue
index 7258d53..7bf7308 100644
--- a/src/components/Login/login.vue
+++ b/src/components/Login/login.vue
@@ -367,7 +367,7 @@ export default {
 			margin-top: 20px;
 			font-size: 14px;
 			text-align: left;
-			color: #cccccc;
+			color: #999;
 			line-height: 22px;
 			cursor: pointer;
 		}
diff --git a/src/style/index.less b/src/style/index.less
index 74e2b42..4f0f683 100644
--- a/src/style/index.less
+++ b/src/style/index.less
@@ -454,6 +454,9 @@ i {
 .c3 {
 	color: #333;
 }
+.cf40 {
+	color: #f40;
+}
 .c6 {
 	color: #666;
 }
@@ -476,6 +479,11 @@ i {
 	align-items: center;
 	justify-content: start;
 }
+.fse {
+	display: flex;
+	align-items: center;
+	justify-content: end;
+}
 .fsc {
 	display: flex;
 	align-items: center;
@@ -757,19 +765,19 @@ i {
 	// left: 0;
 	// left: calc((100vw - 1200px) / 2 + 1013px) !important;
 	.loginbox:not(.backTable) {
-		width: 180px;
+		// width: 180px;
 		// height: 114px;
 		overflow: hidden;
 		background-color: #fff;
 		border-radius: 4px;
 		text-align: center;
 		box-shadow: 0px 0px 10px rgba(128, 128, 128, 0.4);
-		padding: 0 16px 10px 16px;
+		padding: 4px;
 		> div {
-			padding: 16px;
+			// padding: 16px;
 			text-align: center;
 			font-size: 16px;
-			font-weight: bold;
+			// font-weight: bold;
 			border-bottom: 1px solid #eee;
 		}
 		> a {
@@ -780,10 +788,10 @@ i {
 				line-height: 24px;
 				// font-weight: bold;
 				justify-content: space-between;
-				border-bottom: 1px solid #eee;
-				&:hover {
-					color: #ff4400;
-				}
+				// border-bottom: 1px solid #eee;
+				// &:hover {
+				// 	color: #ff4400;
+				// }
 				span {
 					line-height: 24px;
 
diff --git a/src/utils/request.js b/src/utils/request.js
index df097a1..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";
@@ -39,12 +39,17 @@ service.interceptors.request.use(
     // }
 
     if (localStorage.getItem("LOGIN_DATA")) {
+      console.log('req', req);
+      console.log('req url', req.url);
+
       req.headers.Authorization = "Bearer " + localStorage.getItem("LOGIN_DATA_token");
       req.headers.agencyId = JSON.parse(localStorage.getItem("DAOTIAN_agencyid"))
       req.headers.appId = "daotianpc";
-      req.headers["g-open-env"] = 'WEB-PAGE',
-
-        console.log('getToken++++++++++++++++++++++++++++++++++++++++++++++++++++');
+      req.headers["g-open-env"] = 'WEB-PAGE'
+      if (req.url == '/assistant/custom/job/v2/list') {
+        req.headers.appId = ''
+      }
+      console.log('getToken++++++++++++++++++++++++++++++++++++++++++++++++++++');
     }
     // application/json
     // if(req.headers.common.Accept.indexOf('application/json') > 0 || req.headers.Accept.indexOf('application/json') > 0){
diff --git a/src/views/main.vue b/src/views/main.vue
index 7eefd2a..d8a04ae 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -120,41 +120,39 @@
 								</div>
 							</a-dropdown>
 						</div>
-						<div class="g_mr_16 more-team">
+						<!-- v-if="false" -->
+						<!-- <div class="g_mr_16 more-team">
 							<a-dropdown :trigger="['click']" class="" placement="bottomRight" :getPopupContainer="(node) => node.parentNode">
 								<div class="fsa more-team-button" style="padding: 0px 12px">
 									<div class="fss">
 										<div>
-											<!-- <i class="icon-qiehuantuandui iconfont g_mr_5" style="font-size: 16px"></i> -->
 											<div class="logo">{{ userbaseInfo.agencyName && userbaseInfo.agencyName.charAt(0) }}</div>
 										</div>
 										<div class="hover-f40" style="max-width: 98px">{{ userbaseInfo.agencyName }}</div>
 									</div>
-									<!-- <div> -->
-									<i class="iconfont icon-paixu f12" style="color:#ccc;margin-left:4px"></i>
-									<!-- </div> -->
+									<i class="iconfont icon-paixu f12" style="color: #ccc; margin-left: 4px"></i>
 								</div>
 
-								<!-- <template #overlay> -->
-								<div class="more-team-drop" slot="overlay" style="box-shadow: 0px 2px 4px 0px rgba(229, 229, 229, 0.5), 0px 4px 12px 0px rgba(0, 0, 0, 0.15)">
-									<div class="fsa p12 pr8 hover-blue" style="border-radius:4px;cursor:pointer" @click="changeTeam(item)" v-for="(item, index) in teamList">
-										<div class="fss">
-											<div>
-												<img v-if="item.logo" :src="item.logo" alt="" />
-												<div v-else class="logo">{{ item.agencyName && item.agencyName.charAt(0) }}</div>
+								<div class="" slot="overlay" style="box-shadow: 0px 2px 4px 0px rgba(229, 229, 229, 0.5), 0px 4px 12px 0px rgba(0, 0, 0, 0.15)">
+									<div class="more-team-drop">
+										<div class="fsa p12 pr8 hover-blue" style="border-radius: 4px; cursor: pointer" @click="changeTeam(item)" v-for="(item, index) in teamList">
+											<div class="fss">
+												<div>
+													<img v-if="item.logo" :src="item.logo" alt="" />
+													<div v-else class="logo">{{ item.agencyName && item.agencyName.charAt(0) }}</div>
+												</div>
+												<div class="" style="width: 98px">{{ item.agencyName }}</div>
 											</div>
-											<div class="" style="width: 98px">{{ item.agencyName }}</div>
+											<div class="ml12 f12 cf4" v-if="item.checked">当前</div>
 										</div>
-										<div class="ml12 f12 cf4" v-if="item.checked">当前</div>
 									</div>
 								</div>
-								<!-- </template> -->
 							</a-dropdown>
-						</div>
+						</div> -->
 						<a-dropdown
 							:trigger="['click']"
-							overlayClassName="logindropdown"
 							placement="bottomRight"
+							overlayClassName="logindropdown"
 							:getPopupContainer="
 								(triggerNode) => {
 									return triggerNode.parentNode || document.body;
@@ -166,11 +164,11 @@
 								<img :src="userbaseInfo.imgSrc" class="mr4" style="border-radius: 50%; width: 28px; height: 28px" alt v-else />
 								<div class="ml4 f14 c6">{{ userbaseInfo.userName || userbaseInfo.nickName || "-" }}</div>
 							</span>
-							<div class="loginbox" slot="overlay">
+							<div class="loginbox" slot="overlay" style="width: 224px">
 								<router-link to="/accountsetting">
-									<div>
+									<div class="hover-blue br4" style="padding: 12px 12px">
 										<span> <i class="iconfont icon-gerenzhongxin"></i>个人中心 </span>
-										<i class="iconfont icon-youjiantou"></i>
+										<i class="iconfont icon-youjiantou c9"></i>
 									</div>
 								</router-link>
 								<!-- <router-link to="/merchantBack" v-if="loginValue.agencyName == '郑州一才工作' ">
@@ -182,12 +180,39 @@
                   </div>
                 </router-link>-->
 								<!-- 2023-11-29 注释该条件 && (loginValue.agencyRole == 2 || loginValue.agencyRole == 1 ) -->
-								<router-link to="###" v-if="loginValue.agencyName == '郑州一才工作' || loginValue.id == '116253'">
-									<div @click="goAdmin">
-										<span> <i class="iconfont icon-shangjiahoutai"></i>商家后台 </span>
-										<i class="iconfont icon-youjiantou"></i>
+								<!-- v-if="loginValue.agencyName == '郑州一才工作' || loginValue.id == '116253'" -->
+
+								<div @click.stop="goAdmin" class="hover-blue br4 fsa" style="padding: 12px 12px; line-height: 25px; border-bottom: 0" v-if="loginValue.agencyName == '郑州一才工作' || loginValue.id == '116253'">
+									<span class="f14"> <i class="iconfont icon-shangjiahoutai mr6"></i>商家后台 </span>
+									<i class="iconfont icon-youjiantou c9"></i>
+								</div>
+
+								<a-dropdown :trigger="['click']" class="more-team" :getPopupContainer="(node) => node.parentNode" overlayClassName="setPosition">
+									<span class="fsa more-team-button hover-blue br4" style="padding: 6px 12px" @click.stop>
+										<div class="fss">
+											<div>
+												<i class="icon-qiehuantuandui iconfont g_mr_5" style="font-size: 16px"></i>
+												切换团队
+											</div>
+										</div>
+										<div class="fse">
+											<div class="cf40 esl" style="max-width: 98px">{{ userbaseInfo.agencyName }}</div>
+											<i class="iconfont icon-youjiantou c9"></i>
+										</div>
+									</span>
+									<div class="more-team-drop" slot="overlay">
+										<div class="fsa p12 hover-blue" style="border-radius: 4px; cursor: pointer" @click="changeTeam(item)" v-for="(item, index) in teamList">
+											<div class="fss">
+												<div>
+													<img v-if="item.logo" class="mr8" :src="item.logo" style="width: 16px; height: 16px" alt="" />
+													<div v-else class="logo mr8">{{ item.agencyName && item.agencyName.charAt(0) }}</div>
+												</div>
+												<div class="tl" style="width: 98px">{{ item.agencyName }}</div>
+											</div>
+											<div class="ml12 f12 cf4" v-if="item.checked">当前</div>
+										</div>
 									</div>
-								</router-link>
+								</a-dropdown>
 								<!-- <router-link to="###" v-if="loginValue.agencyName == '郑州一才工作'">
                   <div @click="goJiaofu">
                     <span>
@@ -196,7 +221,7 @@
                     <i class="iconfont icon-youjiantou"></i>
                   </div>
                 </router-link> -->
-								<button @click="logout">退出登录</button>
+								<button @click="logout" class="mb6">退出登录</button>
 							</div>
 						</a-dropdown>
 					</span>
@@ -601,9 +626,16 @@ export default {
 					checkTokenApi().then((res) => {
 						console.log(res.data);
 						localStorage.setItem("LOGIN_DATA", JSON.stringify(res.data.data));
+						let routeUrl = that.$router.resolve({
+							path: "/list",
+						});
+						window.open(routeUrl.href, "_blank");
+						setTimeout(() => {
+							window.close();
+						}, 10);
 						// return
 						// localStorage.setItem("DAOTIAN_token", res.data.token);
-						that.reload();
+						// that.reload();
 
 						// location.reload();
 						// router.push("/merchantManagement/homePage");
@@ -674,8 +706,9 @@ export default {
 
 		goAdmin() {
 			let obj = JSON.parse(localStorage.getItem("LOGIN_DATA"));
-			let token = JSON.parse(localStorage.getItem("LOGIN_DATA_token"));
-			console.log(JSON.stringify(obj.user));
+			let token = localStorage.getItem("LOGIN_DATA_token");
+			console.log(obj);
+			console.log(token);
 			if (window.location.hostname == "localhost") {
 				// 测试环境，通过URL获取token
 				window.open("http://localhost:3000/#/login?token=" + token + "&username=" + (obj.user.userName ? obj.user.userName : obj.user.nickName) + "&avatar=" + obj.imgSrc + "&roleid=" + obj.user.agencyRoleId + "&agencyid=" + obj.user.agencyId + "&userInfo=" + JSON.stringify(obj));
@@ -1187,37 +1220,49 @@ export default {
 /deep/ .ant-dropdown {
 	top: 68px !important;
 }
-.hover-blue:hover {
-	background-color: #f5f5f5;
+.hover-blue {
+	cursor: pointer;
+	&:hover {
+		background-color: #f5f5f5;
+	}
 }
+
 .more-team {
 	.more-team-button {
-    height: 32px;
-    margin-right: 16px;
+		height: 32px;
+		margin-right: 16px;
 		border-radius: 4px;
 		cursor: pointer;
 		border: 1px solid #ddd;
-    &:hover{
-      .hover-f40{
-        color: #ff4400;
-      }
-    }
+		&:hover {
+			.hover-f40 {
+				color: #ff4400;
+			}
+		}
 	}
+
 	.more-team-drop {
-    padding: 6px;
+		padding: 6px;
 		background: #fff;
-    border-radius: 4px;
-	}
-	.logo {
-		width: 16px;
-		height: 16px;
-		text-align: center;
-		line-height: 16px;
-		color: #fff;
-		font-size: 10px;
-		background: #ff6a00;
-		border-radius: 2px;
-    margin-right: 8px;
+		border-radius: 4px;
 	}
 }
+/deep/.setPosition {
+	padding: 4px;
+	left: -218px !important;
+	border-radius: 4px;
+	background-color: #fff;
+	box-shadow: 0px 2px 4px 0px rgba(229, 229, 229, 0.5), 0px 4px 12px 0px rgba(0, 0, 0, 0.15);
+}
+.logo {
+	width: 16px;
+	height: 16px;
+	text-align: center;
+	line-height: 16px;
+	color: #fff;
+	font-size: 10px;
+	background: #ff6a00;
+	border-radius: 2px;
+	margin-right: 8px;
+}
 </style>