Explorar el Código

b2b首页的调整

hangb hace 8 años
padre
commit
0796eabc69

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

@@ -54,7 +54,7 @@
 					</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="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>
@@ -64,9 +64,9 @@
 					<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>
+							<li ng-repeat="e in userInfo.enSelect">
+								<a ng-click="switchto(e.uu)">{{e.enName}}</a>
+							</li>
 						</ul>
 						<div class="cart"><img src="static/img/all/carts.png" alt=""/></div>
 					</div>

+ 5 - 2
src/main/webapp/resources/css/index.css

@@ -786,7 +786,7 @@ ul>li.item-link>a {
 #home-headerBtns a{
 	display: inline-block;
 }
-#home-headerBtns a:first-child i{
+#home-headerBtns a.user-btn i{
 	padding-left: 5px;
 }
 #home-headerBtns a span{
@@ -2721,7 +2721,10 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 	background: #fff;
 }
 .user-tk .user-message li{
-	width: 220px;
+	width: 218px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
 	height: 50px;
 	line-height: 50px;
 	border-bottom: 1px solid #ccc;