Merge branch 'feature/yc-switch_enterprise-1207' into orderByLoginTime-1207

src/main/webapp/resources/view/common/site-nav.html

@@ -45,9 +45,12 @@
     }
 
     #site-nav .dropdown .dropdown-menu {
+        top: 36px;
+        left: 0;
+        min-width: 100%;
         display: none;
         margin: 0;
-        padding: 1em;
+        padding: 0 6px 13px;
         border-radius: 0;
         background: #ffffff;
         border: 1px solid #999999;
@@ -58,9 +61,30 @@
         -moz-box-shadow: none;
         box-shadow: none;
         text-align: left;
+        max-height: 330px;
+        overflow-y: auto;
     }
-    #site-nav .dropdown .dropdown-menu a{
-        color: #1162a4;
+
+    #site-nav .dropdown .dropdown-menu >ul >li {
+        padding: 0 12px;
+        line-height: 30px;
+        max-width: 300px;
+    }
+    #site-nav .dropdown .dropdown-menu >ul >li.switch-enterprise-title {
+        background: #eee;
+        cursor: default;
+    }
+    #site-nav .dropdown .dropdown-menu >ul >li.switch-enterprises {
+        background: #f6f6f6;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+    #site-nav .dropdown .dropdown-menu >ul >li.switch-enterprises a {
+        color: #333;
+    }
+    #site-nav .dropdown .dropdown-menu >ul >li.switch-enterprises a:hover {
+        color: #5078cb;
     }
     #site-nav .dropdown:hover .dropdown-toggle {
         border: 1px solid #999999;
@@ -139,7 +163,7 @@
         <li ng-if="!userInfo"><a ng-click="signinModal()" href="javascript:void(0)">登录</a></li>
         <li ng-if="!userInfo"><a ng-click="registerModal()" href="javascript:void(0)">注册</a></li>
         <!--<li ng-if="!userInfo"><a href="http://account.ubtob.com/sso/register?returnURL=http%253A%252F%252Fwww.usoftmall.com%252Flogin%252Fproxy&appId=mall">注册</a></li>-->
-        <li ng-if="userInfo" class="dropdown" ng-mouseleave="toggleSwitchFalse()">
+        <li ng-if="userInfo" class="dropdown">
             <a class="dropdown-toggle" href="javascript:void(0)">欢迎您，
                 <span ng-bind="userInfo.userName"></span>
                 <span> | </span>
@@ -148,25 +172,26 @@
                 <span style="float:right;margin-left: 8px;max-width: 190px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;display: inline-block;" ng-if="userInfo.enterprise" ng-bind="userInfo.enterprise.enName" ></span>
                 <span style="float:right;margin-left: 8px;max-width: 190px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;display: inline-block;" ng-if="!userInfo.enterprise" ng-bind="'个人账户'" ></span>
             </a>
-            <div class="dropdown-menu" style="top: 36px; left: 0; min-width: 220px; width: 100%">
+            <div class="dropdown-menu">
                <!-- <p>欢迎您，<span ng-bind="userInfo.userName"></span>
                     <a href="javascript:void(0)" class="pull-right" ng-click="logout()">退出</a>
                 </p>-->
-                <p>
-                    <!--<i class="fa fa-map-marker"></i> <span ng-if="userInfo.enterprises" ng-bind="userInfo.enterprise.enName"></span><span ng-if="!userInfo.enterprises" ng-bind="userInfo.userName"></span><span ng-if="!userInfo.enterprises">（个人账户）</span>-->
+                <!--<p>
+                    &lt;!&ndash;<i class="fa fa-map-marker"></i> <span ng-if="userInfo.enterprises" ng-bind="userInfo.enterprise.enName"></span><span ng-if="!userInfo.enterprises" ng-bind="userInfo.userName"></span><span ng-if="!userInfo.enterprises">（个人账户）</span>&ndash;&gt;
                     <i class="fa fa-map-marker" style="position: relative;bottom: 2px;"></i>
                     <span ng-if="userInfo.enterprise" ng-bind="userInfo.enterprise.enName" class="member-text"></span>
                     <span ng-if="!userInfo.enterprise" ng-bind="' 个人账户'" class="member-text"></span>
                     <a href="javascript:void(0)" class="pull-right" ng-if="userInfo.enterprises" ng-click="toggleSwitch()" ng-bind="switching?'取消':'切换'">切换</a>
-                </p>
-                <ul class="unstyled" ng-show="switching" style="-webkit-padding-start: 0;">
-                    <li ng-repeat="en in userInfo.enterprises" ng-if="!en.current && userInfo.enterprises" style="line-height: 30px;">
+                </p>-->
+                <ul class="unstyled" style="-webkit-padding-start: 0;">
+                    <li ng-if="userInfo.enterprises && userInfo.enterprises.length > 0" class="switch-enterprise-title">您可切换至以下账户：</li>
+                    <li ng-repeat="en in userInfo.enterprises" ng-if="!en.current && userInfo.enterprises" class="switch-enterprises">
                         <a href="javascript:void(0)"  ng-bind="en.enName" title="{{en.enName}}" ng-click="switchto(en.uu)"></a>
                     </li>
                     <!--<li ng-if="!userInfo.enterprises">
                         <a href="javascript:void(0)"><span ng-bind="userInfo.userName"></span><span>（个人账户）</span></a>
                     </li>-->
-                    <li style="line-height: 30px;">
+                    <li class="switch-enterprises">
                         <a href="javascript:void(0)" ng-click="switchto('0')" ng-if="userInfo.enterprise"><span ng-bind="userInfo.userName"></span><span>（个人账户）</span></a>
                     </li>
                 </ul>