From 29eb9876413e56eb8cef7d802e221ac0ca4368d1 Mon Sep 17 00:00:00 2001 From: wangxia <779219182@qq.com> Date: Fri, 19 Apr 2024 14:51:36 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A4=9A=E5=9B=A2=E9=98=9F=E5=88=87?= =?UTF-8?q?=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/login.js | 7 + src/api/userinfo.js | 15 +- src/components/Login/login.vue | 910 +++++++++++++++++++++-------------------- src/style/index.less | 2 +- src/utils/request.js | 47 ++- src/views/main.vue | 134 +++++- 6 files changed, 655 insertions(+), 460 deletions(-) diff --git a/src/api/login.js b/src/api/login.js index c8d3628..0bc4273 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -43,3 +43,10 @@ export function updatePswApi(data) { data: setqs(data), }); } +// 检查token信息获取最新登录信息 +export function checkTokenApi(data) { + return request({ + url: "/appLoginByToken", + method: "get", + }); +} diff --git a/src/api/userinfo.js b/src/api/userinfo.js index 221c61a..0cb7077 100644 --- a/src/api/userinfo.js +++ b/src/api/userinfo.js @@ -213,8 +213,21 @@ export function dataStatisticsListApiold (data) { }); } +// 团队列表获取 +export function getTeamListApi (data) { + return request({ + url: "/yishoudan/agency/group/user/listByUser", + method: "get", + }); +} - +// 切换团队 +export function changeTeamApi(agencyId) { + return request({ + url: `/yishoudan/agency/group/user/changeGroup/${agencyId}`, + method: "get", + }); +} diff --git a/src/components/Login/login.vue b/src/components/Login/login.vue index cdae9e0..7258d53 100644 --- a/src/components/Login/login.vue +++ b/src/components/Login/login.vue @@ -1,467 +1,497 @@ diff --git a/src/style/index.less b/src/style/index.less index c5d00ac..74e2b42 100644 --- a/src/style/index.less +++ b/src/style/index.less @@ -1,4 +1,4 @@ -@import "http://at.alicdn.com/t/c/font_3135652_nopyx9nvfil.css"; +@import "http://at.alicdn.com/t/c/font_3135652_nd5ivglbv4.css"; @font-face { font-family: "DingTalk"; /* 这里的字体名称是自定义的 */ src: url("../assets/fonts/DingTalk\ Sans.ttf"); /* 服务器上ttf文件的路径，记得配置域名权限 */ diff --git a/src/utils/request.js b/src/utils/request.js index accc528..f4861c2 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"; @@ -36,11 +36,12 @@ service.interceptors.request.use( // } if (localStorage.getItem("LOGIN_DATA")) { - req.headers.Authorization = "Bearer " + JSON.parse(localStorage.getItem("LOGIN_DATA")).token; + 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', + req.headers["g-open-env"] = 'WEB-PAGE', - console.log('getToken++++++++++++++++++++++++++++++++++++++++++++++++++++'); + console.log('getToken++++++++++++++++++++++++++++++++++++++++++++++++++++'); } // application/json // if(req.headers.common.Accept.indexOf('application/json') > 0 || req.headers.Accept.indexOf('application/json') > 0){ @@ -54,20 +55,50 @@ service.interceptors.request.use( ); service.interceptors.response.use( (response) => { - // console.log(response); + console.log('response', response); let { msg, status } = response.data; // status = 9999 // return response; // console.log(status); - if (status == 9999) { + // response.data.status = 9999 + if (response.data.status == 9999) { localStorage.removeItem("LOGIN_DATA"); + localStorage.removeItem("LOGIN_DATA_token"); + localStorage.removeItem("DAOTIAN_agencyid"); router.push("/login"); // 跳转到登录页面 // this.$message.warning(msg); return Promise.reject(new Error("token过期")); } - if (response.status === 200) { + if (response.data.status === 200) { return response; + } else if (response.data.status === 2001) {// 职位名称 + // message.error('职位名称：请不要填写【' + response.data.msg + '】相关违禁内容'); + // this.$message.error(response.data.msg); + return response; + + // return Promise.reject({ + // code: 2001, + // msg: response.data.msg + // }); + } else if (response.data.status === 2002) {// 职位名称 + // message.error('职位名称：请不要填写【' + response.data.msg + '】相关违禁内容'); + console.log('response.data.status === 2002', response.data.status); + // 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"); + + return Promise.reject(new Error("token过期")); + + // return Promise.reject({ + // code: 2002, + // msg: response.data.msg + // }); } else { // Message.error(message) return Promise.reject(new Error(msg)); diff --git a/src/views/main.vue b/src/views/main.vue index 4757bc0..7eefd2a 100644 --- a/src/views/main.vue +++ b/src/views/main.vue @@ -55,10 +55,10 @@
  • - + - 职位报名 - + 职位报名 +
    • @@ -120,6 +120,37 @@ +
    + +
    +
    +
    + + +
    +
    {{ userbaseInfo.agencyName }}
    +
    + + + +
    + + +
    +
    +
    +
    + + +
    +
    {{ item.agencyName }}
    +
    +
    当前
    +
    +
    + +     +
    { + console.log(res); + + that.teamList = res.data.data; + console.log("that.teamList", that.teamList); + + that.teamList.forEach((item, index) => { + if (item.id == that.loginValue.user.agencyId) { + item.checked = true; + } + }); + }); + }, + changeTeam(_item) { + let that = this; + if (_item.id == that.loginValue.user.agencyId) { + return false; + } + console.log(_item); + changeTeamApi(_item.id).then((res1) => { + console.log("res1", res1); + if (res1.data.status == 2001) { + // localStorage.setItem("DAOTIAN_userinfo_agencyid", _item.id); + that.$message.error(res1.data.msg); + that.getTeamList(); + } else { + localStorage.setItem("DAOTIAN_agencyid", _item.id); + checkTokenApi().then((res) => { + console.log(res.data); + localStorage.setItem("LOGIN_DATA", JSON.stringify(res.data.data)); + // return + // localStorage.setItem("DAOTIAN_token", res.data.token); + that.reload(); + // location.reload(); + // router.push("/merchantManagement/homePage"); + }); + } + }); + }, async logout() { // logoutApi().then((result) => { // console.log(result); @@ -543,6 +621,7 @@ export default { if (data.status === 200) { localStorage.removeItem("LOGIN_DATA"); localStorage.removeItem("DAOTIAN_token"); + localStorage.removeItem("LOGIN_DATA_token"); localStorage.removeItem("daotian_to_admin_token"); this.reload(); this.$router.push("/main"); @@ -595,33 +674,35 @@ 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)); if (window.location.hostname == "localhost") { // 测试环境，通过URL获取token - window.open("http://localhost:3000/#/login?token=" + obj.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)); + 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)); } else { // 正式环境，通过缓存获取 localStorage.setItem("daotian_to_admin", JSON.stringify(obj)); - localStorage.setItem("daotian_to_admin_token", obj.token); + localStorage.setItem("daotian_to_admin_token", token); localStorage.setItem("daotian_to_admin_avatar", obj.imgSrc); localStorage.setItem("daotian_to_admin_username", obj.user.userName ? obj.user.userName : obj.user.nickName); localStorage.setItem("daotian_to_admin_roleid", obj.user.agencyRoleId); localStorage.setItem("daotian_to_admin_agencyid", obj.user.agencyId); if (window.location.origin.indexOf("www") > -1) { - window.open("http://www.ibocai.cn/#/login?token=" + obj.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)); + window.open("http://www.ibocai.cn/#/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)); } else { - window.open("http://ibocai.cn/#/login?token=" + obj.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)); + window.open("http://ibocai.cn/#/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)); } } }, goJiaofu() { let obj = JSON.parse(localStorage.getItem("LOGIN_DATA")); + let token = JSON.parse(localStorage.getItem("LOGIN_DATA_token")); if (window.location.hostname == "localhost") { // 测试环境，通过URL获取token - window.open("http://localhost:3000/#/other/delivery?token=" + obj.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)); + window.open("http://localhost:3000/#/other/delivery?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)); } else { // 正式环境，通过缓存获取 - localStorage.setItem("daotian_to_admin_token", obj.token); + localStorage.setItem("daotian_to_admin_token", token); localStorage.setItem("daotian_to_admin", JSON.stringify(obj)); localStorage.setItem("daotian_to_admin_avatar", obj.imgSrc); localStorage.setItem("daotian_to_admin_username", obj.user.userName ? obj.user.userName : obj.user.nickName); @@ -1106,4 +1187,37 @@ export default { /deep/ .ant-dropdown { top: 68px !important; } +.hover-blue:hover { + background-color: #f5f5f5; +} +.more-team { + .more-team-button { + height: 32px; + margin-right: 16px; + border-radius: 4px; + cursor: pointer; + border: 1px solid #ddd; + &:hover{ + .hover-f40{ + color: #ff4400; + } + } + } + .more-team-drop { + 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; + } +} 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 2/3] =?UTF-8?q?=E5=A4=9A=E5=9B=A2=E9=98=9F=E5=88=87?= =?UTF-8?q?=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 @@
    全部
    -
    一才
    +
    一才
    @@ -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) => { 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 3/3] =?UTF-8?q?=E9=9D=A2=E5=8C=85=E5=B1=91:=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E8=AF=A6=E6=83=85->=E8=81=8C=E4=BD=8D=E8=AF=A6?= =?UTF-8?q?=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 @@ - - 企业详情 + + 职位详情 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 @@ - {{ from == "vocational" ? "详情" : "企业详情" }} + {{ from == "vocational" ? "详情" : "职位详情" }} @@ -424,7 +424,7 @@

    - 企业详情 + 职位详情

    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 @@
    -