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

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

@@ -134,7 +134,7 @@ public class SecurityInterceptor extends AbstractSecurityInterceptor implements
 			SystemSession.setUser((User) user);
 		else {
 			Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-			if (authentication != null) {
+			if (authentication != null && authentication.isAuthenticated()) {
 				User authedUser = userService.findUserByUserUU(Long.parseLong(authentication.getName()));
 				authedUser.setCurrentEnterprise();
 				Set<Role> roles = authedUser.getRoles();

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

@@ -200,9 +200,9 @@
 					<li ng-class="{'active': routeState == 'home'}"><a
 						ui-sref="home">首页</a></li>
 					<li ng-class="{'active': routeState == 'account'}"><a
-						ui-sref="account">账户设置</a></li>
+						ui-sref="account.home">账户设置</a></li>
 					<li class="dropdown" ng-class="{'active': routeState == 'sale'}"><a
-						ui-sref="sale.index">销售管理</a></li>
+						ui-sref="sale.home">销售管理</a></li>
 					<li ng-class="{'active': routeState == 'qc'}"><a ui-sref="qc">品质管理</a></li>
 					<li ng-class="{'active': routeState == 'fa'}"><a ui-sref="fa">财务对账</a></li>
 				</ul>

src/main/webapp/resources/js/index/app.js

@@ -119,6 +119,38 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ui.
 					templateUrl : "static/tpl/index/account/right.html"
 				}
 			}
+		}).state('account.index', {
+			url : "",
+			templateUrl : "static/tpl/index/account/index.html",
+			controller: function($rootScope) {
+				$rootScope.active = null;
+			}
+		}).state('account.home', {
+			url : "/",
+			templateUrl : "static/tpl/index/account/index.html",
+			controller: function($rootScope) {
+				$rootScope.active = null;
+			}
+		}).state('account.enterprise', {
+			url : "/enterprise",
+			templateUrl : "static/tpl/index/account/enterprise.html",
+			controller: 'EnterpriseCtrl'
+		}).state('account.user', {
+			url : "/user",
+			templateUrl : "static/tpl/index/account/user.html",
+			controller: 'UserCtrl'
+		}).state('account.resource', {
+			url : "/resource",
+			templateUrl : "static/tpl/index/account/resource.html",
+			controller: 'ResourceCtrl'
+		}).state('account.authority', {
+			url : "/authority",
+			templateUrl : "static/tpl/index/account/authority.html",
+			controller: 'AuthorityCtrl'
+		}).state('account.role', {
+			url : "/role",
+			templateUrl : "static/tpl/index/account/role.html",
+			controller: 'RoleCtrl'
 		}).state('qc', {
 			url : "/qc",
 			views : {
@@ -1245,6 +1277,26 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ui.
 		
 	});
 	
+	app.controller('EnterpriseCtrl', function($scope, $rootScope){
+		$rootScope.active = 'enterprise';
+	});
+	
+	app.controller('UserCtrl', function($scope, $rootScope){
+		$rootScope.active = 'user';
+	});
+	
+	app.controller('ResourceCtrl', function($scope, $rootScope){
+		$rootScope.active = 'resource';
+	});
+	
+	app.controller('AuthorityCtrl', function($scope, $rootScope){
+		$rootScope.active = 'authority';
+	});
+	
+	app.controller('RoleCtrl', function($scope, $rootScope){
+		$rootScope.active = 'role';
+	});
+	
 	/**
 	 * 计算时间差
 	 */

src/main/webapp/resources/tpl/index/account/authority.html

@@ -0,0 +1 @@
+权限分配

src/main/webapp/resources/tpl/index/account/enterprise.html

@@ -0,0 +1,9 @@
+<div class="pane">
+	<div class="pane-header">
+		注册信息<a href="#" class="pull-right text-simple"><i
+			class="fa fa-pencil fa-fw"></i>编辑</a>
+	</div>
+	<div class="pane-body">
+		
+	</div>
+</div>

src/main/webapp/resources/tpl/index/account/index.html

@@ -0,0 +1,47 @@
+<!-- 交易信息 Start -->
+<div class="data-wrap" ng-controller="DataCtrl">
+	<!-- 交易额统计 Start -->
+	<div class="data-charts block">
+		<ul class="list-unstyled list-inline">
+			<li id="chart-sale-amount" class="chart"
+				ac-chart="charts.sale.chartType" ac-data="charts.sale.datas"
+				ac-config="charts.sale.config"></li>
+			<li id="chart-seller-amount" class="chart"
+				ac-chart="charts.seller.chartType" ac-data="charts.seller.datas"
+				ac-config="charts.seller.config"></li>
+		</ul>
+	</div>
+	<!-- 交易额统计 End -->
+</div>
+<!-- 交易信息 End -->
+<!-- 动态信息 Start -->
+<div class="feed-wrap">
+	<div class="pane service">
+		<div class="pane-header">
+			客服中心<a href="#" class="pull-right text-muted"><i
+				class="fa fa-list-ul"></i></a>
+		</div>
+		<div class="pane-body">
+			<div class="search">
+				<div class="form-group has-feedback">
+					<input type="search" class="form-control" placeholder="输入您要咨询的问题" /><span
+						class="form-control-feedback text-simple"><i
+						class="fa fa-search"></i></span>
+				</div>
+			</div>
+			<ul class="list-unstyled list-inline" style="margin-bottom: 20px;">
+				<li><a href="#" class="text-muted">安全保障</a></li>
+				<li><a href="#" class="text-muted">开通SAAS服务</a></li>
+			</ul>
+			<ul class="list-unstyled f14 detail">
+				<li><a href="#" class="text-light"><i
+						class="fa fa-tty fa-fw icon-left"></i>自助服务</a></li>
+				<li><a href="#" class="text-light"><i
+						class="fa fa-hand-o-right fa-fw icon-left"></i>投诉举报</a></li>
+				<li><a href="#" class="text-light"><i
+						class="fa fa-headphones fa-fw icon-left"></i>我的问题反馈</a></li>
+			</ul>
+		</div>
+	</div>
+</div>
+<!-- 动态信息 End -->

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

@@ -1,6 +1,6 @@
 <div class="left-nav left-home">
 	<div class="nav-home">
-		<a ui-sref="sale.home" class="text-default"><span
+		<a ui-sref="account.home" class="text-default"><span
 			class="glyphicon glyphicon-home icon-left"></span>账户</a>
 	</div>
 </div>
@@ -9,8 +9,8 @@
 		<i></i>企业空间
 	</div>
 	<ul class="list-unstyled">
-		<li><a href="#">企业信息</a></li>
-		<li><a href="#">用户信息</a></li>
+		<li ng-class="{'active': active=='enterprise'}"><a ui-sref="account.enterprise">企业信息</a></li>
+		<li ng-class="{'active': active=='user'}"><a ui-sref="account.user">用户信息</a></li>
 	</ul>
 </div>
 <div class="left-nav">
@@ -18,9 +18,9 @@
 		<i></i>权限系统
 	</div>
 	<ul class="list-unstyled">
-		<li><a href="#">系统资源</a></li>
-		<li><a href="#">权限管理</a></li>
-		<li><a href="#">角色管理</a></li>
+		<li ng-class="{'active': active=='resource'}"><a ui-sref="account.resource">系统资源</a></li>
+		<li ng-class="{'active': active=='authority'}"><a ui-sref="account.authority">权限管理</a></li>
+		<li ng-class="{'active': active=='role'}"><a ui-sref="account.role">角色管理</a></li>
 	</ul>
 </div>
 <div class="left-nav">
@@ -39,12 +39,15 @@
 		<i></i>自定义菜单
 	</div>
 	<ul class="list-unstyled">
-		<li><a href="#">添加自定义菜单<span class="pull-right"><i class="fa fa-plus icon-right"></i></span></a></li>
+		<li><a href="#">添加自定义菜单<span class="pull-right"><i
+					class="fa fa-plus icon-right"></i></span></a></li>
 	</ul>
 </div>
 <div class="left-nav">
 	<ul class="list-unstyled">
-		<li><a href="#">问题反馈<span class="pull-right"><i class="fa fa-bell-o icon-right"></i></span></a></li>
-		<li><a href="#">客服中心<span class="pull-right"><i class="fa fa-headphones icon-right"></i></span></a></li>
+		<li><a href="#">问题反馈<span class="pull-right"><i
+					class="fa fa-bell-o icon-right"></i></span></a></li>
+		<li><a href="#">客服中心<span class="pull-right"><i
+					class="fa fa-headphones icon-right"></i></span></a></li>
 	</ul>
 </div>

src/main/webapp/resources/tpl/index/account/resource.html

@@ -0,0 +1 @@
+资源

src/main/webapp/resources/tpl/index/account/right.html

@@ -1 +1 @@
-<div ui-view class="user-view"></div>
+<div ui-view class="account-view"></div>

src/main/webapp/resources/tpl/index/account/role.html

@@ -0,0 +1 @@
+角色分配

src/main/webapp/resources/tpl/index/account/user.html

@@ -0,0 +1 @@
+用户信息