页面新页面跳转

cyl/dev
wangxia 2 years ago
parent f587dc2656
commit c5a493321b

@ -1357,7 +1357,7 @@ export default {
async getCityWhichHasJob() { async getCityWhichHasJob() {
try { try {
const { data } = await getCityWhichHasJobApi() const { data } = await getCityWhichHasJobApi()
// console.log(data); console.log(data);
if (data.status == 200) { if (data.status == 200) {
let pinyinList = [] let pinyinList = []
data.data.forEach((item) => { data.data.forEach((item) => {

@ -53,14 +53,11 @@
</div> </div>
<span v-if="isLogin" class="logined fsa"> <span v-if="isLogin" class="logined fsa">
<div class v-if="loginValue.agencyName == '郑州一才工作'"> <div class v-if="loginValue.agencyName == '郑州一才工作'">
<a-dropdown <a-dropdown :trigger="['click']" overlayClassName="logindropdown" placement="bottomRight" :getPopupContainer="
:trigger="['click']" overlayClassName="logindropdown" placement="bottomRight"
:getPopupContainer="
(triggerNode) => { (triggerNode) => {
return triggerNode.parentNode || document.body; return triggerNode.parentNode || document.body;
} }
" ">
>
<div class="mr20 user-box"> <div class="mr20 user-box">
<i class="iconfont icon-xiaoxi"></i> <i class="iconfont icon-xiaoxi"></i>
</div> </div>
@ -84,13 +81,11 @@
</div> </div>
</a-dropdown> </a-dropdown>
</div> </div>
<a-dropdown :trigger="['click']" overlayClassName="logindropdown" placement="bottomRight" <a-dropdown :trigger="['click']" overlayClassName="logindropdown" placement="bottomRight" :getPopupContainer="
:getPopupContainer="
(triggerNode) => { (triggerNode) => {
return triggerNode.parentNode || document.body; return triggerNode.parentNode || document.body;
} }
" ">
>
<span class="fsa fsa-box"> <span class="fsa fsa-box">
<span class="iconfont icon-morentouxiang mr4 f32" v-if="!userbaseInfo.imgSrc"></span> <span class="iconfont icon-morentouxiang mr4 f32" v-if="!userbaseInfo.imgSrc"></span>
<img :src="userbaseInfo.imgSrc" class="mr4" style="border-radius:50%;width:32px;height:32px;" alt v-else /> <img :src="userbaseInfo.imgSrc" class="mr4" style="border-radius:50%;width:32px;height:32px;" alt v-else />
@ -112,7 +107,7 @@
</span> </span>
<i class="iconfont icon-youjiantou"></i> <i class="iconfont icon-youjiantou"></i>
</div> </div>
</router-link> --> </router-link>-->
<!-- 2023-11-29 注释该条件 && (loginValue.agencyRole == 2 || loginValue.agencyRole == 1 ) --> <!-- 2023-11-29 注释该条件 && (loginValue.agencyRole == 2 || loginValue.agencyRole == 1 ) -->
<router-link to="###" v-if="loginValue.agencyName == '郑州一才工作'"> <router-link to="###" v-if="loginValue.agencyName == '郑州一才工作'">
<div @click="goAdmin"> <div @click="goAdmin">
@ -625,31 +620,35 @@ export default {
let obj = JSON.parse(localStorage.getItem('LOGIN_DATA')) let obj = JSON.parse(localStorage.getItem('LOGIN_DATA'))
if (window.location.hostname == 'localhost') { if (window.location.hostname == 'localhost') {
// URLtoken // URLtoken
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 { } else {
// //
localStorage.setItem('daotian_to_admin_token', obj.token) localStorage.setItem('daotian_to_admin_token', obj.token)
localStorage.setItem('daotian_to_admin_avatar', obj.imgSrc) 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_username', obj.user.userName ? obj.user.userName : obj.user.nickName)
localStorage.setItem('daotian_to_admin_roleid', obj.user.agencyRoleId) 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(){ goJiaofu() {
let obj = JSON.parse(localStorage.getItem('LOGIN_DATA')) let obj = JSON.parse(localStorage.getItem('LOGIN_DATA'))
if (window.location.hostname == 'localhost') { if (window.location.hostname == 'localhost') {
// URLtoken // URLtoken
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.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 { } else {
// //
localStorage.setItem('daotian_to_admin_token', obj.token) localStorage.setItem('daotian_to_admin_token', obj.token)
localStorage.setItem('daotian_to_admin_avatar', obj.imgSrc) 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_username', obj.user.userName ? obj.user.userName : obj.user.nickName)
localStorage.setItem('daotian_to_admin_roleid', obj.user.agencyRoleId) localStorage.setItem('daotian_to_admin_roleid', obj.user.agencyRoleId)
window.location.href = 'http://idaotian.com/dist2.0.0/#/other/delivery' // window.location.href = 'http://idaotian.com/dist2.0.0/#/other/delivery'
} window.open('http://idaotian.com/dist2.0.0/#/other/delivery')
} }
}, },
},
} }
</script> </script>
@ -696,7 +695,7 @@ export default {
/deep/ .pagetitle { /deep/ .pagetitle {
background-color: #f0f0f0; background-color: #f0f0f0;
padding: 0; padding: 0;
height: 64px; height: 56px;
display: flex; display: flex;
align-items: center; align-items: center;
// height: 32px; // height: 32px;
@ -1090,7 +1089,7 @@ export default {
} }
} }
.user-box{ .user-box {
width: 44px; width: 44px;
height: 44px; height: 44px;
border-radius: 50%; border-radius: 50%;
@ -1099,26 +1098,26 @@ export default {
line-height: 44px; line-height: 44px;
margin-right: 12px !important; margin-right: 12px !important;
cursor: pointer; cursor: pointer;
&:hover{ &:hover {
background-color: #e5e5e5; background-color: #e5e5e5;
} }
&:active{ &:active {
background-color: #d9d9d9; background-color: #d9d9d9;
} }
} }
.fsa-box{ .fsa-box {
padding: 6px 12px; padding: 6px 12px;
background: transparent; background: transparent;
border-radius: 4px; border-radius: 4px;
cursor: pointer; cursor: pointer;
&:hover{ &:hover {
background-color: #e5e5e5; background-color: #e5e5e5;
} }
&:active{ &:active {
background-color: #d9d9d9; background-color: #d9d9d9;
} }
} }
/deep/ .ant-dropdown{ /deep/ .ant-dropdown {
top: 68px !important; top: 68px !important;
} }
</style> </style>

Loading…
Cancel
Save