Browse Source

【bug修复】切换账户下拉宽度设置最小宽度、首页资讯右移处理。

ouxq 8 years ago
parent
commit
d287a3ca0f
2 changed files with 13 additions and 3 deletions
  1. 11 3
      components/default/Header.vue
  2. 2 0
      components/home/News.vue

+ 11 - 3
components/default/Header.vue

@@ -17,7 +17,7 @@
               <ul class="dropdown-menu">
                 <li class="menu-item-first">
                   <i class="fa fa-map-marker" v-if="!enterprise.enName"></i>&nbsp;
-                  <span v-text="enterprise.enName?enterprise.enName:user.data.userName + '(个人账户)'"></span>
+                  <span v-text="enterprise.enName?enterprise.enName:user.data.userName + '(个人账户)'" class="member-text"></span>
                   <a class="pull-right" @click="toggleEnterprises()" v-if="user.data.enterprises && user.data.enterprises.length > 1">
                     {{ showEnterprises ? '取消' : '切换' }}
                   </a>
@@ -131,6 +131,13 @@
     color: #1162a4 !important;
     line-height: inherit;
   }
+  .member-text{
+    width: 80%;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: inline-block;
+  }
   @import '~assets/scss/mixins';
   @import '~assets/scss/variables';
 
@@ -193,12 +200,13 @@
             }
 
             .dropdown-menu {
-              width: 220px;
+              min-width: 220px;
               margin-left: -1px;
               border: $border;
               border-top: none;
-              padding: 1em;
+              padding: .5em;
               margin:0;
+              display: inline-table;
 
               .menu-item-first {
                 margin-bottom: 10px;

+ 2 - 0
components/home/News.vue

@@ -57,6 +57,8 @@
 </script>
 <style lang="scss" scoped>
   .news {
+    width: 100%;
+    margin: 0 auto;
     height: 280px;
     background: url("/images/news/news-bg.jpg");