布局调整

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@6014 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/filter/SSOInterceptor.java

@@ -109,6 +109,7 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
 
 	@Override
 	protected boolean onAuthenticateFailed(HttpServletRequest request, HttpServletResponse response) {
+		SystemSession.clear();
 		User user = (User) request.getSession().getAttribute("user");
 		if (user == null) {
 			user = getUserByAccessToken(request);
@@ -184,8 +185,11 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
 
 	@Override
 	public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
-		super.afterCompletion(request, response, handler, ex);
-		SystemSession.clear();
+		try {
+			super.afterCompletion(request, response, handler, ex);
+		} finally {
+			SystemSession.clear();
+		}
 	}
 
 	/**

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

@@ -24,23 +24,27 @@
 					<li class="brand">您好，</li>
 					<li class="dropdown"><a href="#" role="button"
 						class="dropdown-toggle"><span ng-bind="userInfo.userName"
-							class="text-inverse"></span> <i class="fa fa-angle-down fa-fw"></i> </a>
+							class="text-inverse"></span> <i class="fa fa-angle-down fa-fw"></i>
+					</a>
 						<div class="dropdown-menu" style="padding: 15px; width: 180px;">
 							<ul class="list-unstyled">
-								<li class="dropdown-submenu">
-									<a href="#/account/enterprise" class="dropdown-toggle none"><strong class="text-info">{{userInfo.enterprise.enName}}</strong></a>
-									<ul class="dropdown-menu arrow left" ng-if="userInfo.enSelect" style="top: -16px;">
-										<li class="text-muted text-bold" style="padding: 5px 15px;"><i class="fa fa-cog fa-fw"></i>切换企业到：</li>
+								<li class="dropdown-submenu"><a href="#/account/enterprise"
+									class="dropdown-toggle none"><strong class="text-info">{{userInfo.enterprise.enName}}</strong></a>
+									<ul class="dropdown-menu arrow left" ng-if="userInfo.enSelect"
+										style="top: -16px;">
+										<li class="text-muted text-bold" style="padding: 5px 15px;"><i
+											class="fa fa-cog fa-fw"></i>切换企业到：</li>
 										<li class="divider"></li>
-										<li ng-repeat="e in userInfo.enSelect" class="item-link"><a ng-click="switchto(e.uu)">{{e.enName}}</a></li>
-									</ul>
-								</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="divider" ng-show="userInfo.enterprise"></li>
-								<li><a href="#/account/user"><i class="fa fa-user fa-fw"></i>
-										{{userInfo.userName}}(<strong class="text-warning">{{userInfo.userUU}}</strong>)
-								</a></li>
+								<li><a href="#/account/user"><i
+										class="fa fa-user fa-fw"></i> {{userInfo.userName}}(<strong
+										class="text-warning">{{userInfo.userUU}}</strong>) </a></li>
 								<li class="divider"></li>
-								<li><a href="#/account/user"><i class="fa fa-gear fa-fw"></i> 账号管理</a><a
+								<li><a href="#/account/user"><i
+										class="fa fa-gear fa-fw"></i> 账号管理</a><a
 									class="text-muted pull-right" ng-click="logout()">退出</a></li>
 							</ul>
 						</div></li>
@@ -49,14 +53,15 @@
 					</a></li>
 				</ul>
 				<ul class="nav navbar-nav navbar-right">
-					<li class="dropdown"><a href="#/sale/todo/notice" role="button"
-						class="dropdown-toggle"> 待发货 
-							<i class="fa fa-angle-down"></i>
+					<li class="dropdown"><a href="#/sale/todo/notice"
+						role="button" class="dropdown-toggle"> 待发货 <i
+							class="fa fa-angle-down"></i>
 					</a>
 						<div class="dropdown-menu" style="padding: 10px 15px;">
 							<div class="form-actions">
 								<div>
-									<a href="#/sale/todo/notice" class="pull-right btn btn-warning btn-sm">客户送货送货提醒</a>
+									<a href="#/sale/todo/notice"
+										class="pull-right btn btn-warning btn-sm">客户送货送货提醒</a>
 								</div>
 							</div>
 						</div></li>
@@ -71,12 +76,15 @@
 							<li><a href="serve#/contact" target="_blank">联系客服</a></li>
 							<li><a href="serve#/question/" target="_blank">在线咨询</a></li>
 						</ul></li>
+					<li><a href="http://www.ubtob.com" target="_blank" role="button"> 优软首页 </a></li>
 					<li class="dropdown"><a href="#" role="button"
-						class="dropdown-toggle text-inverse"><i class="fa fa-fw fa-bars"></i>
-							网站导航 <i class="fa fa-angle-down"></i> </a>
-						<div class="dropdown-menu text-right" style="padding: 10px 15px; width: 560px;">
+						class="dropdown-toggle text-inverse"><i
+							class="fa fa-fw fa-bars"></i> 网站导航 <i class="fa fa-angle-down"></i>
+					</a>
+						<div class="dropdown-menu text-right"
+							style="padding: 10px 15px; width: 720px;">
 							<div class="row pills text-right">
-								<div class="col-xs-3 ">
+								<div class="col-xs-2">
 									<h4>账号管理</h4>
 									<ul class="nav nav-pills">
 										<li><a href="#/account/enterprise" title="企业信息">企业信息</a></li>
@@ -87,15 +95,17 @@
 										<li><a href="#/account/role" title="角色管理">角色管理</a></li>
 									</ul>
 								</div>
-								<div class="col-xs-3">
+								<div class="col-xs-4">
 									<h4>销售管理</h4>
-									<ul class="nav nav-pills">
-										<li><a href="#" title="客户资料">客户资料</a></li>
+									<ul class="nav nav-pills" style="width: 120px;float: left">
+										<li><a href="#/sale/customer" title="客户资料">客户资料</a></li>
 										<li><a href="#/sale/order" title="客户采购订单">客户采购订单</a></li>
 										<li><a href="#/sale/change" title="客户采购变更">客户采购变更</a></li>
 										<li><a href="#/sale/forecast" title="客户采购预测">客户采购预测</a></li>
 										<li><a href="#/sale/notice" title="客户发货提醒">客户发货提醒</a></li>
 										<li><a href="#/sale/send" title="发货单">发货单</a></li>
+									</ul>
+									<ul class="nav nav-pills">
 										<li><a href="#/sale/accept" title="客户验收单">客户验收单</a></li>
 										<li><a href="#/sale/returns" title="客户验退单">客户验退单</a></li>
 										<li><a href="#/sale/sample" title="客户打样申请">客户打样申请</a></li>
@@ -138,11 +148,16 @@
 						ui-sref="account.home">账户设置</a></li>
 					<li ng-class="{'active': routeState == 'sale'}"><a
 						ui-sref="sale.home">销售管理</a></li>
-					<li ng-class="{'active': routeState == 'purc'}"><a ui-sref="purc.home">采购管理</a></li>
-					<li ng-class="{'active': routeState == 'make'}"><a ui-sref="make.home">委外制造</a></li>
-					<li ng-class="{'active': routeState == 'qc'}"><a ui-sref="qc.home">品质管理</a></li>
-					<li ng-class="{'active': routeState == 'fa'}"><a ui-sref="fa.home">财务对账</a></li>
-					<li ng-class="{'active': routeState == 'cs'}"><a ui-sref="cs.home">客户服务</a></li>
+					<li ng-class="{'active': routeState == 'purc'}"><a
+						ui-sref="purc.home">采购管理</a></li>
+					<li ng-class="{'active': routeState == 'make'}"><a
+						ui-sref="make.home">委外制造</a></li>
+					<li ng-class="{'active': routeState == 'qc'}"><a
+						ui-sref="qc.home">品质管理</a></li>
+					<li ng-class="{'active': routeState == 'fa'}"><a
+						ui-sref="fa.home">财务对账</a></li>
+					<li ng-class="{'active': routeState == 'cs'}"><a
+						ui-sref="cs.home">客户服务</a></li>
 				</ul>
 			</nav>
 		</div>
@@ -158,14 +173,13 @@
 			<div class="company">
 				<div class="inner block">
 					<div class="f14">
-						<i class="fa fa-map-marker fa-fw"></i><span ng-bind="::userInfo.enterprise.enName"></span>
+						<i class="fa fa-map-marker fa-fw"></i><span
+							ng-bind="::userInfo.enterprise.enName"></span>
 					</div>
 					<div class="text-small">
 						<span class="text-border-success">优软认证</span>
 					</div>
-					<div class="text-muted">
-						优软商务平台普通会员
-					</div>
+					<div class="text-muted">优软商务平台普通会员</div>
 				</div>
 			</div>
 			<!-- 公司信息 End -->

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

@@ -573,11 +573,13 @@ ul>li.item-link>a {
 }
 
 #top .dropdown-menu .pills ul>li {
-	padding: 2px;
+	
 }
 
 #top .dropdown-menu .pills ul>li>a {
 	color: #3c3c3c;
+	text-align: left;
+	padding: 5px 8px;
 }
 
 #top .dropdown-menu .pills ul>li:hover a {
@@ -589,6 +591,7 @@ ul>li.item-link>a {
 	font-family: "Microsoft YaHei", "Hiragino Sans GB";
 	font-weight: 700;
 	font-size: 17px;
+	text-align: left;
 }
 
 #top .dropdown-menu .pills>div:nth-child(1) h4 {