From c5a493321b98de06dd5094dc066a8d19359d0ed8 Mon Sep 17 00:00:00 2001 From: wangxia <779219182@qq.com> Date: Tue, 12 Dec 2023 16:43:32 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=96=B0=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/FirstJob/joblist.vue | 2 +- src/views/main.vue | 127 ++++++++++++++++++------------------ 2 files changed, 64 insertions(+), 65 deletions(-) diff --git a/src/components/FirstJob/joblist.vue b/src/components/FirstJob/joblist.vue index 7aa2c70..7886253 100644 --- a/src/components/FirstJob/joblist.vue +++ b/src/components/FirstJob/joblist.vue @@ -1357,7 +1357,7 @@ export default { async getCityWhichHasJob() { try { const { data } = await getCityWhichHasJobApi() - // console.log(data); + console.log(data); if (data.status == 200) { let pinyinList = [] data.data.forEach((item) => { diff --git a/src/views/main.vue b/src/views/main.vue index 2725f0e..9353ad0 100644 --- a/src/views/main.vue +++ b/src/views/main.vue @@ -53,14 +53,11 @@
- + ">
@@ -84,13 +81,11 @@
- + "> @@ -112,8 +107,8 @@ - --> - + --> +
@@ -122,14 +117,14 @@
- -
- - 交付助手 - - -
- + +
+ + 交付助手 + + +
+ @@ -625,30 +620,34 @@ export default { let obj = JSON.parse(localStorage.getItem('LOGIN_DATA')) if (window.location.hostname == 'localhost') { // 测试环境，通过URL获取token - window.location.href = 'http://localhost:3000/#/merchantManagement/homePage?token=' + obj.token + '&username=' + (obj.user.userName ? obj.user.userName : obj.user.nickName) + '&avatar=' + obj.imgSrc + '&roleid=' + obj.user.agencyRoleId; + // window.location.href = 'http://localhost:3000/#/merchantManagement/homePage?token=' + obj.token + '&username=' + (obj.user.userName ? obj.user.userName : obj.user.nickName) + '&avatar=' + obj.imgSrc + '&roleid=' + obj.user.agencyRoleId; + window.open('http://localhost:3000/#/merchantManagement/homePage?token=' + obj.token + '&username=' + (obj.user.userName ? obj.user.userName : obj.user.nickName) + '&avatar=' + obj.imgSrc + '&roleid=' + obj.user.agencyRoleId) } else { // 正式环境，通过缓存获取 localStorage.setItem('daotian_to_admin_token', obj.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) - window.location.href = 'http://idaotian.com/dist2.0.0/#/merchantManagement/homePage' + // window.location.href = 'http://idaotian.com/dist2.0.0/#/merchantManagement/homePage' + window.open('http://idaotian.com/dist2.0.0/#/merchantManagement/homePage') + } + }, + goJiaofu() { + let obj = JSON.parse(localStorage.getItem('LOGIN_DATA')) + if (window.location.hostname == 'localhost') { + // 测试环境，通过URL获取token + // window.location.href = '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; + 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) + } else { + // 正式环境，通过缓存获取 + localStorage.setItem('daotian_to_admin_token', obj.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) + // window.location.href = 'http://idaotian.com/dist2.0.0/#/other/delivery' + window.open('http://idaotian.com/dist2.0.0/#/other/delivery') } }, - goJiaofu(){ - let obj = JSON.parse(localStorage.getItem('LOGIN_DATA')) - if (window.location.hostname == 'localhost') { - // 测试环境，通过URL获取token - window.location.href = '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; - } else { - // 正式环境，通过缓存获取 - localStorage.setItem('daotian_to_admin_token', obj.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) - window.location.href = 'http://idaotian.com/dist2.0.0/#/other/delivery' - } - } }, } @@ -696,7 +695,7 @@ export default { /deep/ .pagetitle { background-color: #f0f0f0; padding: 0; - height: 64px; + height: 56px; display: flex; align-items: center; // height: 32px; @@ -1090,35 +1089,35 @@ export default { } } -.user-box{ - width: 44px; - height: 44px; - border-radius: 50%; - background-color: transparent; - text-align: center; - line-height: 44px; - margin-right: 12px !important; - cursor: pointer; - &:hover{ - background-color: #e5e5e5; - } - &:active{ - background-color: #d9d9d9; - } +.user-box { + width: 44px; + height: 44px; + border-radius: 50%; + background-color: transparent; + text-align: center; + line-height: 44px; + margin-right: 12px !important; + cursor: pointer; + &:hover { + background-color: #e5e5e5; + } + &:active { + background-color: #d9d9d9; + } } -.fsa-box{ - padding: 6px 12px; - background: transparent; - border-radius: 4px; - cursor: pointer; - &:hover{ - background-color: #e5e5e5; - } - &:active{ - background-color: #d9d9d9; - } +.fsa-box { + padding: 6px 12px; + background: transparent; + border-radius: 4px; + cursor: pointer; + &:hover { + background-color: #e5e5e5; + } + &:active { + background-color: #d9d9d9; + } } -/deep/ .ant-dropdown{ - top: 68px !important; +/deep/ .ant-dropdown { + top: 68px !important; }