yangc 8 rokov pred
rodič
commit
469b89f1da
2 zmenil súbory, kde vykonal 26 pridanie a 12 odobranie
  1. 25 11
      components/default/Header.vue
  2. 1 1
      nuxt.config.js

+ 25 - 11
components/default/Header.vue

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

+ 1 - 1
nuxt.config.js

@@ -1,6 +1,6 @@
 const path = require('path')
 const path = require('path')
 const isProdMode = Object.is(process.env.NODE_ENV, 'production')
 const isProdMode = Object.is(process.env.NODE_ENV, 'production')
-const baseUrl = process.env.BASE_URL || (isProdMode ? 'http://www.usoftmall.com/' : 'http://192.168.253.60:9090/platform-b2c/')
+const baseUrl = process.env.BASE_URL || (isProdMode ? 'http://www.usoftmall.com/' : 'http://192.168.253.123:8080/platform-b2c/')
 
 
 module.exports = {
 module.exports = {
   router: {
   router: {