From b7b1af97a1230d44e7a39573523f0f379e7ca99f Mon Sep 17 00:00:00 2001
From: zsk <710162063@qq.com>
Date: Mon, 17 Jun 2024 15:28:29 +0800
Subject: [PATCH] 1

---
 src/components/FirstJob/components/recommend.vue |  2 +-
 src/components/FirstJob/detail.vue               |  4 ++++
 src/components/FirstJob/joblist.vue              | 21 ++++++++++++++-------
 src/components/main/index.vue                    |  2 +-
 src/utils/request.js                             |  4 ++--
 src/views/main.vue                               |  3 ++-
 6 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/components/FirstJob/components/recommend.vue b/src/components/FirstJob/components/recommend.vue
index 64e53e1..3722fb9 100644
--- a/src/components/FirstJob/components/recommend.vue
+++ b/src/components/FirstJob/components/recommend.vue
@@ -10,7 +10,7 @@
       </div>
       <div class="jobBox">
         <div class="jobinfobox" v-for="(item, index) in relationList" :key="index">
-          <router-link target="_blank" :to="'/detail?id=' + item.id" @click.prevent="resetpage">
+          <router-link target="_blank" :to="'/detail?id=' + item.id +'&jobClassify='+item.jobClassify" @click.prevent="resetpage">
             <!-- <a href="javascript:;" > -->
             <div class="imgbox">
               <img v-if="item.logo" :src="item.logo" alt />
diff --git a/src/components/FirstJob/detail.vue b/src/components/FirstJob/detail.vue
index 9518c01..3a44580 100644
--- a/src/components/FirstJob/detail.vue
+++ b/src/components/FirstJob/detail.vue
@@ -783,11 +783,15 @@ export default {
 		// console.log(this.$router.matcher.match());
 		if (sessionStorage.getItem("PAGE_TYPE")) {
 			this.id = JSON.parse(sessionStorage.getItem("PAGE_TYPE")).id;
+
 			this.jobClassify = JSON.parse(sessionStorage.getItem("PAGE_TYPE")).jobClassify;
 			this.currentPageNum = JSON.parse(sessionStorage.getItem("PAGE_TYPE")).pageNum;
 
 			console.log("PAGE_TYPE", JSON.parse(sessionStorage.getItem("PAGE_TYPE")));
 		}
+    if(this.$route.query.jobClassify){
+      this.jobClassify = this.$route.query.jobClassify
+    }
 		if (this.$route.query.id) {
 			this.id = this.$route.query.id;
 		}
diff --git a/src/components/FirstJob/joblist.vue b/src/components/FirstJob/joblist.vue
index 45d00c0..015d605 100644
--- a/src/components/FirstJob/joblist.vue
+++ b/src/components/FirstJob/joblist.vue
@@ -221,8 +221,9 @@
 		<div class="w" id="maincontent">
 			<div class="maincontentleft" v-if="!isVocational" style="padding-top: 50px">
 				<div class="tabBar" @click="changeTab($event)">
-					<div class="tabSubset" :class="{ active: signType == '' }" data-type="0">全部</div>
-					<div class="tabSubset" :class="{ active: signType == 1 }"  data-type="1">一才</div>
+					<div class="tabSubset" :class="{ active: signType == '' }" v-if="!hasTab" data-type="0">全部</div>
+					<div class="tabSubset" :class="{ active: signType == 1 }" v-if="loginValue.agencyName == '郑州一才工作' || loginValue.agencyName == '一才工作'" data-type="1">一才</div>
+          <!-- v-if="loginValue.agencyName == '郑州一才工作' || loginValue.agencyName == '一才工作'" -->
           <!-- v-if="loginValue.agencyName == '郑州一才工作' || loginValue.agencyName == '一才工作'" -->
 					<!-- <div class="tabSubset" :class="{ active: signType == 2 }" data-type="2">三方</div> -->
 				</div>
@@ -543,13 +544,13 @@
 									</div>				
 									<div class="jobpricehour" v-html="getSalaryClassifyValue(item.salaryClassify, item.salaryClassifyValue)"></div>
                   <div class="jobpricemonth" v-if="item.minMonthlyPay">
-										<template v-if="formvalue.signType != 1">
-
+										<template v-if="signType != 1">
 											<span>{{ item.minMonthlyPay ? item.minMonthlyPay : "" }}</span
 											>-<span>{{ item.maxMonthlyPay ? item.maxMonthlyPay : "" }}</span
 											>元/月
 										</template>
 										<template v-else>
+                      
 											<span>{{ item.minMonthlyPay ? item.minMonthlyPay / 100 : "" }}</span
 											>-<span>{{ item.maxMonthlyPay ? item.maxMonthlyPay / 100 : "" }}</span
 											>元/月
@@ -1068,6 +1069,7 @@ export default {
 			minAge: "",
 			maxAge: "",
 			managerInfo: {},
+      hasTab:false, //判断是不是从后台来的
 		};
 	},
 	// 计算属性
@@ -1201,8 +1203,13 @@ export default {
 			this.signType = info.signType ? info.signType : "";
 			this.currentPage = info.pageNum ? info.pageNum : 1;
 		}
-    if(this.$route.query.tab == 1){
+
+    if(this.$route.query.tab == 1 || localStorage.getItem("hasTab")){
       this.signType = 1;
+      this.hasTab = true;
+      //写入session缓存
+      localStorage.setItem("hasTab", this.hasTab)
+
     }
 
 		if (this.$route.query.type) {
@@ -1356,8 +1363,8 @@ export default {
 			console.log(this.formvalue);
 			try {
 				newdata = {
-					// agencyId: "3087", //正式版
-					agencyId: "2743", //测试版
+					agencyId: "3087", //正式版
+					// agencyId: "2743", //测试版
 					recruitment: "1",
 					keys: "",
 					pageNum: 1,
diff --git a/src/components/main/index.vue b/src/components/main/index.vue
index bf1e274..b7a691b 100644
--- a/src/components/main/index.vue
+++ b/src/components/main/index.vue
@@ -121,7 +121,7 @@
               <use xlink:href="#icon-bocai2" />
             </svg>｜Copyright © 2015-2023 Bocai. All Rights Reserved.｜
           </span>
-          <a target="_blank" href="https://beian.miit.gov.cn/#/Integrated/index">豫ICP备2023001993号</a>
+          <a target="_blank" href="https://beian.miit.gov.cn/#/Integrated/index">豫ICP备2023001993号-25A</a>
         </div>
       </div>
     </footer>
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";
diff --git a/src/views/main.vue b/src/views/main.vue
index d8a04ae..ddb5c0c 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -324,7 +324,7 @@
 							<use xlink:href="#icon-bocai2" /></svg
 						>｜Copyright © 2015-2023 Bocai. All Rights Reserved.｜
 					</span>
-					<a target="_blank" href="https://beian.miit.gov.cn/#/Integrated/index">豫ICP备2023001993号</a>
+					<a target="_blank" href="https://beian.miit.gov.cn/#/Integrated/index">豫ICP备2023001993号-25A</a>
 				</div>
 			</div>
 		</footer>
@@ -655,6 +655,7 @@ export default {
 					localStorage.removeItem("DAOTIAN_token");
 					localStorage.removeItem("LOGIN_DATA_token");
 					localStorage.removeItem("daotian_to_admin_token");
+          localStorage.removeItem("hasTab")
 					this.reload();
 					this.$router.push("/main");
 				} else {