From 51eccd718ba6a6a131c9ed827933561d574b5b80 Mon Sep 17 00:00:00 2001
From: wangxia <779219182@qq.com>
Date: Mon, 29 Apr 2024 11:03:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E5=9B=A2=E9=98=9F=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FirstJob/joblist.vue |  6 +++---
 src/main-dev.js                     |  4 ++--
 src/main-prod.js                    |  6 ++++--
 src/utils/request.js                | 29 +++++++++++++++++++----------
 4 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/src/components/FirstJob/joblist.vue b/src/components/FirstJob/joblist.vue
index cb31adc..3ef7af0 100644
--- a/src/components/FirstJob/joblist.vue
+++ b/src/components/FirstJob/joblist.vue
@@ -222,7 +222,7 @@
 			<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 }" v-if="loginValue.agencyName == '郑州一才工作'" data-type="1">一才</div>
+					<div class="tabSubset" :class="{ active: signType == 1 }" v-if="loginValue.agencyName == '郑州一才工作' || loginValue.agencyName == '一才工作'" data-type="1">一才</div>
 					<!-- <div class="tabSubset" :class="{ active: signType == 2 }" data-type="2">三方</div> -->
 				</div>
 				<div class="filter" v-show="signType == ''" :class="[filterStatus == 0 ? '' : 'nobd']" style>
@@ -1754,8 +1754,8 @@ export default {
 				this.formvalue.aliasName = "";
 				this.formvalue.keys = "";
 				this.formvalue.ageStr = "";
-
-        if (this.formvalue.signType != 0) {
+        console.log('this.formvalue',this.formvalue);
+        if (this.formvalue.signType == 1) {
 					this.getJobListYicai();
 				} else {
 					this.getJobList();
diff --git a/src/main-dev.js b/src/main-dev.js
index e50de89..5bd1562 100644
--- a/src/main-dev.js
+++ b/src/main-dev.js
@@ -46,9 +46,9 @@ Vue.prototype.$moment = moment; //挂载到当前vue实例对象
 
 Vue.config.productionTip = false;
 Vue.use(antd);
-new Vue({
+let newVue = new Vue({
   router,
   store,
   render: (h) => h(App),
 }).$mount("#app");
-export default Vue;
+export default newVue;
diff --git a/src/main-prod.js b/src/main-prod.js
index cadc2e9..73391b0 100644
--- a/src/main-prod.js
+++ b/src/main-prod.js
@@ -48,9 +48,11 @@ Vue.prototype.$moment = moment; //挂载到当前vue实例对象
 
 Vue.config.productionTip = false;
 Vue.use(antd);
-new Vue({
+let newVue = new Vue({
   router,
   store,
   render: (h) => h(App),
 }).$mount("#app");
-export default Vue;
+export default newVue;
+
+// export default Vue;
diff --git a/src/utils/request.js b/src/utils/request.js
index f4861c2..df097a1 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -1,9 +1,12 @@
 import axios from "axios";
 import router from "@/router";
+import vue from '../main-dev.js'
 import Cookies from "js-cookie";
 import qs from "qs";
-
+console.log('use message in request', this);
+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"; // 测试环境本地
@@ -84,14 +87,17 @@ service.interceptors.response.use(
     } else if (response.data.status === 2002) {// 职位名称
       // message.error('职位名称：请不要填写【' + response.data.msg + '】相关违禁内容');
       console.log('response.data.status === 2002', response.data.status);
+      vue.$message.error(response.data.msg)
       // this.$message.error(response.data.msg);
-      localStorage.removeItem("LOGIN_DATA");
-      localStorage.removeItem("LOGIN_DATA_token");
-      localStorage.removeItem("DAOTIAN_agencyid");
-      // router.push({
-      //   path: "/login",
-      // });
-      router.push("/login");
+      setTimeout(() => {
+        localStorage.removeItem("LOGIN_DATA");
+        localStorage.removeItem("LOGIN_DATA_token");
+        localStorage.removeItem("DAOTIAN_agencyid");
+        // router.push({
+        //   path: "/login",
+        // });
+        router.push("/login");
+      }, 2000);
 
       return Promise.reject(new Error("token过期"));
 
@@ -100,8 +106,11 @@ service.interceptors.response.use(
       //   msg: response.data.msg
       // });
     } else {
-      // Message.error(message)
-      return Promise.reject(new Error(msg));
+      // Message.error(response.data.msg)
+      // vue.$message.error(response.data.msg)
+      return response;
+
+      // return Promise.reject(new Error(msg));
     }
   },
   (error) => {