修改头部导航

src/main/webapp/WEB-INF/views/normal/index.html

@@ -53,17 +53,12 @@
 						<input type="search" ng-model="keyword" placeholder=" 输入企业或器件" ng-search="search(keyword)"><a class="btn input-group-addon" ng-click="search(keyword)">搜索</a>
 					</div>
 				</ul>
-				<div id="home-headerBtns" ng-controller="HeaderCtrl">
-					<a href="javascript:void(0);" class="user-btn" ui-sref="approvalflow.user"><span ng-bind="userInfo.userName"></span><i class="fa fa-user fa-lg"></i></a>
-					<a href="javascript:void(0);" class="moblie-btn"><i class="fa fa-tablet fa-lg"></i></a>
-					<a ng-click="showMessage()" title="查看消息" ng-class="{'notice-dot': message.toRead > 0}"><i class="fa fa-comments-o fa-lg"></i><em></em></a>
-					<a ui-sref="approvalflow.flow"><i class="fa fa-cog fa-lg"></i></a>
-					<a ng-click="logout()" title="退出登录"><i class="fa fa-power-off fa-lg"></i></a>
+				<div id="home-headerName">
+					<a ui-sref="approvalflow.enterprise"><span>{{userInfo.enterprise.enName}}&nbsp;({{userInfo.enterprise.uu}})</span> <i class="fa fa-chevron-down"></i></a>
 				</div>
-				<div class="user-tk">
+				<div class="name-tk">
 					<div>
 						<ul class="user-message">
-							<li class="active"><a ui-sref="approvalflow.enterprise"><span>{{userInfo.enterprise.enName}}</span><span>({{userInfo.enterprise.uu}})</span></a></li>
 							<li ng-repeat="e in userInfo.enSelect">
 								<a ng-click="switchto(e.uu)">{{e.enName}}</a>
 							</li>
@@ -71,6 +66,21 @@
 						<div class="cart"><img src="static/img/all/carts.png" alt=""/></div>
 					</div>
 				</div>
+				<div id="home-headerBtns" ng-controller="HeaderCtrl">
+					<a href="javascript:void(0);" class="user-btn" ui-sref="approvalflow.user"><i class="fa fa-user fa-lg"></i><span ng-bind="userInfo.userName"></span><i class="fa fa-chevron-down"></i></a>
+				</div>
+				<div class="user-tk">
+					<div>
+						<ul class="user-message">
+							<li><a ui-sref="approvalflow.userProduct">我的产品库</a></li>
+							<li><a ng-click="showMessage()" ng-class="{'notice-dot': message.toRead > 0}">消息中心<em></em></a></li>
+							<li><a ui-sref="approvalflow.flow">基础设置</a></li>
+							<li><a class="moblie-btn">手机二级维码</a></li>
+							<li ng-click="logout()">退出账户</li>
+						</ul>
+						<div class="cart"><img src="static/img/all/carts.png" alt=""/></div>
+					</div>
+				</div>
 				<div class="erweima-tk">
 					<div>
 						<p>扫描二维码<br/>下载手机客户端</p>
@@ -414,16 +424,25 @@
 		$('.dropdown-tab a.href').click(function(){
 			$(".dropdown-tab").hide();
 		});
-		$('#home-headerBtns .user-btn').hover(function(){
-			$(".user-tk").toggle();
-			$('.user-tk').mouseenter(function(){
+		$('#home-headerName a').hover(function(){
+			$(".name-tk").toggle();
+			$('.name-tk').mouseenter(function(){
 				$(this).show();
 			});
-			$('.user-tk').mouseleave(function(){
+			$('.name-tk').mouseleave(function(){
 				$(this).hide();
 			});
 		})
-		$('#home-headerBtns .moblie-btn ').hover(function(){
+        $('#home-headerBtns .user-btn').hover(function(){
+            $(".user-tk").toggle();
+            $('.user-tk').mouseenter(function(){
+                $(this).show();
+            });
+            $('.user-tk').mouseleave(function(){
+                $(this).hide();
+            });
+        })
+		$('.user-tk .moblie-btn ').hover(function(){
 			$(".erweima-tk").toggle();
 			$('.erweima-tk').mouseenter(function(){
 				$(this).show();

src/main/webapp/resources/css/index.css

@@ -710,11 +710,9 @@ ul>li.item-link>a {
 	color: #969696;
 }
 #header.navbar-inverse .navbar-nav>li{
-	margin-left: 70px;
-}
-#header.navbar-inverse .navbar-nav>li:last-child{
-	margin-left: 60px;
+	margin: 0 20px;
 }
+
 #header.navbar-inverse .navbar-nav>li>a {
 	font-size: 20px;
 	font-famliy: Microsoft Yahei;
@@ -726,7 +724,7 @@ ul>li.item-link>a {
 
 /** 顶部 start **/
 #home-search {
-	margin-left: 580px;
+	margin-left: 450px;
 	margin-top: 7px;
 	position: absolute;
 }
@@ -781,9 +779,35 @@ ul>li.item-link>a {
 	padding-left: 10px;
 }
 
+#home-headerName{
+	position: absolute;
+	right: 160px;
+	top: 3px;
+	width: 200px;
+	padding-right: 20px;
+	height: 50px;
+	line-height: 50px;
+	color: #333333;
+	font-size: 14px;
+}
+#home-headerName span{
+	display:inline-block;
+	width:100%;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+#home-headerName i{
+	position:absolute;
+	top:15px;
+	right:0;
+}
+
+
 #home-headerBtns {
 	position: absolute;
 	right: 0;
+	top:0;
     padding-right: 35px;
 	height: 50px;
 	line-height: 50px;
@@ -791,7 +815,7 @@ ul>li.item-link>a {
 	font-size: 16px;
 }
 #home-headerBtns i {
-	padding-left: 20px;
+	padding:0 10px;
 }
 #home-headerBtns a{
 	display: inline-block;
@@ -810,9 +834,7 @@ ul>li.item-link>a {
 #home-headerBtns a:hover i.fa-user{
 	color: #d32526;
 }
-#home-headerBtns a.user-btn i{
-	padding-left: 5px;
-}
+
 #home-headerBtns a span{
 	font-size: 13px;
 	color: #000;
@@ -2725,21 +2747,21 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 	color: #323232;
 }
 /*账号切换 begin*/
-.user-tk {
+.name-tk {
 	position: absolute;
 	text-align: left;
-	 display: none;
-	right: 93px;
+	display: none;
+	right: 155px;
 	top: 44px;
 	/* animation: slideDown .2s ease-in 1 normal both; */
 	width: 250px;
 
 }
-.user-tk div{
+.name-tk div{
 	margin-top: 10px;
 	position: relative ;
 }
-.user-tk .user-message{
+.name-tk .user-message{
 	padding-left: 0;
 	margin-bottom: 0;
 	width: 250px;
@@ -2750,7 +2772,7 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 	max-height: 550px;
 	overflow-y: auto;
 }
-.user-tk .user-message li{
+.name-tk .user-message li{
 	width: 250px;
 	overflow: hidden;
 	text-overflow: ellipsis;
@@ -2759,45 +2781,106 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 	line-height: 50px;
 	border-bottom: 1px solid #ccc;
 }
-.user-tk .user-message li:last-child {
+.name-tk .user-message li:last-child {
 	border-bottom: none;
 }
-.user-tk .user-message li a{
+.name-tk .user-message li a{
 	padding-left: 10px;
 	display: inline-block;
 	width: 250px;
 	height: 38px;
 	overflow: hidden;
 }
-.user-tk .user-message li.active a{
+.name-tk .user-message li.active a{
 	width: 250px;
 	margin-top: 12px;
 	line-height: 38px;
 	background: #e8e8e8;
 }
-.user-tk .user-message li.active a span{
+.name-tk .user-message li.active a span{
 	font-size: 13px;
 	color: #000;
 }
-.user-tk .user-message li.active a span:first-child{
+.name-tk .user-message li.active a span:first-child{
 	float: left;
 	font-size: 13px;
 	color: #d32526;
-    width: 155px;
+	width: 155px;
 	overflow: hidden;
 	text-overflow: ellipsis;
 	white-space: nowrap;
 }
-.user-tk .user-message li a span:last-child {
+.name-tk .user-message li a span:last-child {
 	float: left;
 	font-size: 13px;
 	color: #999;
 }
-.user-tk div .cart {
+.name-tk div .cart {
 	position: absolute;
 	top: -28px;
 	left: 85px;
 }
+.name-tk div .cart img{
+	width: 25px;
+	height: 15px;
+}
+/*操作类型切换 begin*/
+.user-tk {
+	position: absolute;
+	text-align: left;
+	 display: none;
+	right: 0;
+	top: 44px;
+	/* animation: slideDown .2s ease-in 1 normal both; */
+	width: 150px;
+
+}
+.user-tk div{
+	margin-top: 10px;
+	position: relative ;
+}
+.user-tk .user-message{
+	padding:0;
+	margin-bottom: 0;
+	list-style: none;
+	box-shadow: 3px 3px 5px #ccc;
+	overflow: hidden;
+	background: #fff;
+}
+.user-tk .user-message li{
+	width: 100%;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	height: 35px;
+	line-height: 35px;
+	padding-left:15px;
+}
+
+.user-tk .user-message li a{
+	display: inline-block;
+	height: 38px;
+	overflow: hidden;
+}
+.user-tk .user-message li a:hover{
+	display: inline-block;
+	height: 38px;
+	overflow: hidden;
+	color:#52a9fa;
+}
+
+.user-tk .user-message li:last-child{
+	padding:0;
+	text-align: center;
+	font-size: 14px;
+	color: #ea6c6d;
+	background: #f4f4f4;
+}
+.user-tk div .cart {
+	position: absolute;
+	top: -28px;
+	left: 45px;
+}
 .user-tk div .cart img{
 	width: 25px;
 	height: 15px;