|
|
@@ -10,19 +10,19 @@
|
|
|
</div>
|
|
|
<div class="navbar-right">
|
|
|
<template v-if="user.logged">
|
|
|
- <div class="item-wrap dropdown">
|
|
|
+ <div class="item-wrap dropdown" @mouseenter="showEnterpriseToggle = true" @mouseleave="showEnterpriseToggle = false">
|
|
|
<div class="item dropdown-toggle">
|
|
|
欢迎您,{{ user.data.userName }} |
|
|
|
<a @click="logout()">[退出]</a>
|
|
|
<span>{{enterprise.enName}}</span>
|
|
|
</div>
|
|
|
- <ul class="dropdown-menu">
|
|
|
+ <ul class="dropdown-menu" v-if="showEnterpriseToggle">
|
|
|
<li class="menu-item-first">
|
|
|
<!--<span class="member-text" :title="enterprise.enName"><i class="fa fa-map-marker"></i> {{ enterprise.uu?enterprise.enName: user.data.userName + '(个人账户)' }}</span>-->
|
|
|
<!--<a class="pull-right" @click="toggleEnterprises()" v-if="user.data.enterprises && user.data.enterprises.length > 0">-->
|
|
|
<!--{{ showEnterprises ? '取消' : '切换' }}-->
|
|
|
<!--</a>-->
|
|
|
- <span>切换至以下账户:</span>
|
|
|
+ <span>您可切换至以下账户:</span>
|
|
|
<!--<input type="text" placeholder="请输入公司名称" v-model="keyword"><span class="search-enterprise" @click="searchEnterprise()">搜索</span>-->
|
|
|
</li>
|
|
|
<li class="menu-item"
|
|
|
@@ -58,14 +58,15 @@
|
|
|
<script>
|
|
|
export default {
|
|
|
name: 'header',
|
|
|
-// data () {
|
|
|
-// return {
|
|
|
+ data () {
|
|
|
+ return {
|
|
|
// showEnterprises: false
|
|
|
// searchEnterpriseArr: [],
|
|
|
// keyword: '',
|
|
|
// isSearching: false
|
|
|
-// }
|
|
|
-// },
|
|
|
+ showEnterpriseToggle: false
|
|
|
+ }
|
|
|
+ },
|
|
|
computed: {
|
|
|
user () {
|
|
|
return this.$store.state.option.user
|
|
|
@@ -111,6 +112,7 @@
|
|
|
// 切换当前企业
|
|
|
switchEnterprise (en) {
|
|
|
// this.toggleEnterprises()
|
|
|
+ this.showEnterpriseToggle = false
|
|
|
this.$http.get(`/user/authentication/${en.uu}`).then(() => {
|
|
|
this.$store.dispatch('loadUserInfo')
|
|
|
// let href = window.location.href
|
|
|
@@ -256,9 +258,11 @@
|
|
|
}
|
|
|
|
|
|
.dropdown {
|
|
|
-
|
|
|
.dropdown-toggle {
|
|
|
line-height: $nav-height;
|
|
|
+ border-left: 1px solid $black-light;
|
|
|
+ border-right: 1px solid $black-light;
|
|
|
+ height: 35px;
|
|
|
a {
|
|
|
margin-left: 15px;
|
|
|
float: right;
|
|
|
@@ -266,6 +270,10 @@
|
|
|
color: $red !important;
|
|
|
}
|
|
|
}
|
|
|
+ &:hover {
|
|
|
+ border-left: 1px solid #999;
|
|
|
+ border-right: 1px solid #999;
|
|
|
+ }
|
|
|
span {
|
|
|
display: inline-block;
|
|
|
max-width: 190px;
|
|
|
@@ -277,19 +285,24 @@
|
|
|
}
|
|
|
|
|
|
.dropdown-menu {
|
|
|
- padding: 0;
|
|
|
+ padding: 0 6px 13px;
|
|
|
margin:0;
|
|
|
- border: none;
|
|
|
border-radius: 0;
|
|
|
max-height: 330px;
|
|
|
overflow-y: auto;
|
|
|
right: unset;
|
|
|
- background: #f6f6f6;
|
|
|
+ background: #fff;
|
|
|
+ border: 1px solid #999999;
|
|
|
+ border-top: none;
|
|
|
+ -webkit-box-shadow: none;
|
|
|
+ -moz-box-shadow: none;
|
|
|
+ box-shadow: none;
|
|
|
|
|
|
.menu-item-first {
|
|
|
background: #eee;
|
|
|
padding: 0 12px;
|
|
|
line-height: 30px;
|
|
|
+ max-width: 300px;
|
|
|
>span:nth-child(1) {
|
|
|
cursor: default;
|
|
|
}
|
|
|
@@ -316,6 +329,7 @@
|
|
|
.menu-item {
|
|
|
padding: 0 12px;
|
|
|
max-width: 300px;
|
|
|
+ background: #f6f6f6;
|
|
|
a {
|
|
|
color: #333;
|
|
|
line-height: 30px;
|