b2b首页的调整

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

@@ -54,11 +54,23 @@
 					</div>
 				</ul>
 				<div id="home-headerBtns" ng-controller="HeaderCtrl">
+					<a href="javascript:void(0);" class="user-btn"><span>李剑辉</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>
+				<div class="user-tk">
+					<div>
+						<ul class="user-message">
+							<li class="active"><a href=""><span>{{userInfo.enterprise.enName}}</span><span>({{userInfo.enterprise.uu}})</span></a></li>
+							<li><a href=""><span>深圳市优软科技有限公司</span><span></span></a></li>
+							<li><a href=""><span>深圳市优软科技有限公司</span><span></span></a></li>
+							<li><a href=""><span>深圳市优软科技有限公司</span><span></span></a></li>
+						</ul>
+						<div class="cart"><img src="static/img/all/carts.png" alt=""/></div>
+					</div>
+				</div>
 				<div class="erweima-tk">
 					<div>
 						<p>扫描二维码<br/>下载手机客户端</p>
@@ -371,6 +383,15 @@
 		$('.dropdown-tab a.href').click(function(){
 			$(".dropdown-tab").hide();
 		});
+		$('#home-headerBtns .user-btn').hover(function(){
+			$(".user-tk").toggle();
+			$('.user-tk').mouseenter(function(){
+				$(this).show();
+			});
+			$('.user-tk').mouseleave(function(){
+				$(this).hide();
+			});
+		})
 		$('#home-headerBtns .moblie-btn ').hover(function(){
 			$(".erweima-tk").toggle();
 			$('.erweima-tk').mouseenter(function(){

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

@@ -772,16 +772,31 @@ ul>li.item-link>a {
 }
 
 #home-headerBtns {
-	width: 200px;
-	margin-top: 15px;
-	color: #333333;
 	position: absolute;
 	right: 0;
+    padding-right: 35px;
+	height: 50px;
+	line-height: 50px;
+	color: #333333;
 	font-size: 16px;
 }
 #home-headerBtns i {
 	padding-left: 20px;
 }
+#home-headerBtns a{
+	display: inline-block;
+}
+#home-headerBtns a:first-child i{
+	padding-left: 5px;
+}
+#home-headerBtns a span{
+	font-size: 13px;
+	color: #000;
+}
+#home-headerBtns a:hover,#home-headerBtns a.active{
+	text-decoration: none;
+}
+
 /** 顶部 end **/
 
 /**dropdown-menu 样式 start **/
@@ -1303,7 +1318,9 @@ ul>li.item-link>a {
 	float: right;
 	width: 218px;
 }
-
+.left .feed-wrap .notice:first-child {
+	margin-top: 3px;
+}
 .pane {
 	/*margin-top: 20px;*/
 	margin-bottom: 15px;
@@ -1311,13 +1328,13 @@ ul>li.item-link>a {
 }
 
 .pane .pane-header {
-	height: 30px;
+	height: 40px;
 	background: #e8e8e8;
-	line-height: 39px;
+	line-height: 40px;
 	font-size: 14px;
 	padding: 0 15px;
 	border-bottom: 1px solid #e8e8e8;
-	color: #333
+	color: #333;
 }
 
 .pane .pane-header .pull-right>a {
@@ -1431,20 +1448,12 @@ ul>li.item-link>a {
 	background-color: #fff;
 }
 
-.pane .pane-header {
-	height: 30px;
-	background: #e8e8e8;
-	line-height: 30px;
-	font-size: 14px;
-	padding: 0 15px;
-	border-bottom: 1px solid #e8e8e8;
-	color: #333
-}
-
 .pane .pane-header .pull-right>a {
 	margin-left: 3px;
 }
-
+.feed-wrap .pane:first-child ,.feed-wrap .pane:last-child{
+	height: 272px;
+}
 .pane .pane-body {
 	padding: 10px;
 }
@@ -2688,6 +2697,78 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 	padding-top: 10px;
 	color: #323232;
 }
+/*账号切换 begin*/
+.user-tk {
+	position: absolute;
+	text-align: left;
+	display: none;
+	right: 125px;
+	top: 45px;
+	/*animation: slideDown .2s ease-in 1 normal both;*/
+	width: 220px;
+}
+.user-tk div{
+	margin-top: 10px;
+	position: relative ;
+}
+.user-tk .user-message{
+	padding-left: 0;
+	margin-bottom: 0;
+	width: 220px;
+	list-style: none;
+	border: 1px solid #ccc;
+	overflow: hidden;
+	background: #fff;
+}
+.user-tk .user-message li{
+	width: 220px;
+	height: 50px;
+	line-height: 50px;
+	border-bottom: 1px solid #ccc;
+}
+.user-tk .user-message li:last-child {
+	border-bottom: none;
+}
+.user-tk .user-message li a{
+	padding-left: 10px;
+	display: inline-block;
+	width: 220px;
+	height: 38px;
+	overflow: hidden;
+}
+.user-tk .user-message li.active a{
+	margin-top: 12px;
+	line-height: 38px;
+	background: #e8e8e8;
+}
+.user-tk .user-message li.active a span{
+	font-size: 13px;
+	color: #000;
+}
+.user-tk .user-message li.active a span:first-child{
+	float: left;
+	font-size: 13px;
+	color: #d32526;
+	width: 135px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+.user-tk .user-message li a span:last-child {
+	float: left;
+	font-size: 13px;
+	color: #999;
+}
+.user-tk div .cart {
+	position: absolute;
+	top: -28px;
+	left: 85px;
+}
+.user-tk div .cart img{
+	width: 25px;
+	height: 15px;
+}
+/*账号切换 end*/
 @-webkit-keyframes slideDown {
 	from {
 		-webkit-opacity:0;
@@ -2729,7 +2810,8 @@ input:-webkit-autofill { box-shadow: 0 0 0 1000px white inset !important;}
 	display: inline-block;
 	background: #d32526;
 	position: absolute;
-	right: -5px;
+	right: 0;
+	top: 15px;
 	border-radius: 100%;
 }
 

src/main/webapp/resources/tpl/index/home/left.html

@@ -93,30 +93,30 @@
 	}
 
 </style>
-<div class="user">
-	<div class="user-info">
-		<div class="user-image">
-			<!--<img src="static/img/all/user_empty.png">-->
-			<ul class="change-ul ">
-				<li class="dropdown-submenu">
-					<a style="font-size: 14px; font-family: 'Microsoft YaHei', 'Hiragino Sans GB'; text-decoration: none;" ui-sref="approvalflow.enterprise"><span class="textMore">{{userInfo.enterprise.enName}}</span>
-						<i class="fa fa-angle-double-right" ng-if="userInfo.enSelect"></i></a>
-					<ul class="dropdown-menu" ng-if="userInfo.enSelect" id="change-company">
-						<li class="text-muted text-bold">切换企业</li>
-						<li ng-repeat="e in userInfo.enSelect" class="item-link"><a
-							ng-click="switchto(e.uu)">{{e.enName}}</a></li>
-					</ul>
-				</li>
-				<li class="grey">
-					UU号: {{userInfo.enterprise.uu}}
-				</li>
-				<li>
-					业务员：<a ui-sref="approvalflow.user" style="text-decoration: none;">{{userInfo.userName}}</a>
-				</li>
-			</ul>
-		</div>
-	</div>
-</div>
+<!--<div class="user">-->
+	<!--<div class="user-info">-->
+		<!--<div class="user-image">-->
+			<!--&lt;!&ndash;<img src="static/img/all/user_empty.png">&ndash;&gt;-->
+			<!--<ul class="change-ul ">-->
+				<!--<li class="dropdown-submenu">-->
+					<!--<a style="font-size: 14px; font-family: 'Microsoft YaHei', 'Hiragino Sans GB'; text-decoration: none;" ui-sref="approvalflow.enterprise"><span class="textMore">{{userInfo.enterprise.enName}}</span>-->
+						<!--<i class="fa fa-angle-double-right" ng-if="userInfo.enSelect"></i></a>-->
+					<!--<ul class="dropdown-menu" ng-if="userInfo.enSelect" id="change-company">-->
+						<!--<li class="text-muted text-bold">切换企业</li>-->
+						<!--<li ng-repeat="e in userInfo.enSelect" class="item-link"><a-->
+							<!--ng-click="switchto(e.uu)">{{e.enName}}</a></li>-->
+					<!--</ul>-->
+				<!--</li>-->
+				<!--<li class="grey">-->
+					<!--UU号: {{userInfo.enterprise.uu}}-->
+				<!--</li>-->
+				<!--<li>-->
+					<!--业务员：<a ui-sref="approvalflow.user" style="text-decoration: none;">{{userInfo.userName}}</a>-->
+				<!--</li>-->
+			<!--</ul>-->
+		<!--</div>-->
+	<!--</div>-->
+<!--</div>-->
 <!-- 用户信息 End -->
 <!-- 常用操作 Start -->
 <div class="feed-wrap">
@@ -136,7 +136,7 @@
 	</div>
  	<div class="pane service" ng-controller="TenderCtrl">
 		<div class="pane-header">
-			<img src="static/img/home/target.png"> 招标信息<a href="serve" class="pull-right text-muted"></a>
+			<img src="static/img/home/target.png"> 公共招标<a href="serve" class="pull-right text-muted"></a>
 			<span class="pull-right"><a href="#/baseInfo/openTenderList" class="text-light">更多>></a></span>
 		</div>
 		<div class="pane-body">
@@ -152,7 +152,7 @@
 	</div>
 	<div class="pane service" ng-controller="SaleInquiryCtrl">
 		<div class="pane-header">
-			<img src="static/img/home/xunjia.png"> 询价信息<a class="pull-right text-muted"></a>
+			<img src="static/img/home/xunjia.png"> 公共询价<a class="pull-right text-muted"></a>
 			<span class="pull-right"><a ui-sref="baseInfo.inquiryList" class="text-light">更多>></a></span>
 		</div>
 		<div class="pane-body">