头部企业信息修改

components/default/Header.vue

@@ -12,11 +12,13 @@
           <template v-if="user.logged">
             <div class="item-wrap dropdown">
               <div class="item dropdown-toggle">
-                欢迎您，{{ user.data.userName }}&nbsp;<a @click="logout()">[退出]</a>
+                欢迎您，{{ user.data.userName }}&nbsp;|&nbsp;
+                <a @click="logout()">[退出]</a>
+                <span>{{enterprise.enName}}</span>
               </div>
               <ul class="dropdown-menu">
                 <li class="menu-item-first">
-                  <span class="member-text" :title="enterprise.enName"><i class="fa fa-map-marker"></i>&nbsp;{{ enterprise.enName }}</span>
+                  <span class="member-text" :title="enterprise.enName"><i class="fa fa-map-marker"></i>&nbsp;{{ 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>
@@ -66,9 +68,9 @@
       enterprise () {
         let ens = this.user.data.enterprises
         if (ens && ens.length) {
-          return ens.find(item => item.current) || {enName: this.user.data.userName + '（个人账户）'}
+          return ens.find(item => item.current) || {enName: '个人账户'}
         } else {
-          return {enName: this.user.data.userName + '（个人账户）'}
+          return {enName: '个人账户'}
         }
       },
       url () {
@@ -239,9 +241,20 @@
 
             .dropdown-toggle {
               line-height: $nav-height;
-
-              a:hover {
-                color: $red !important;
+              a {
+                margin-left: 15px;
+                float: right;
+                &:hover {
+                  color: $red !important;
+                }
+              }
+              span {
+                display: inline-block;
+                max-width: 190px;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+                float: right;
               }
             }