Browse Source

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

administrator 11 years ago
parent
commit
5f3a72c743

+ 30 - 0
src/main/java/com/uas/platform/b2b/controller/AuthenticationController.java

@@ -0,0 +1,30 @@
+package com.uas.platform.b2b.controller;
+
+import javax.servlet.http.HttpSession;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.security.core.Authentication;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.uas.platform.b2b.model.User;
+import com.uas.platform.b2b.support.SystemSession;
+
+@RestController
+@RequestMapping("/authentication")
+public class AuthenticationController {
+	
+	@RequestMapping(method = RequestMethod.GET, headers = "Accept=application/json")
+	@ResponseBody
+	@ResponseStatus(value = HttpStatus.OK)
+	public User getAuthentication(Authentication authentication, HttpSession session) {
+		if (authentication == null) {
+			return null;
+		}
+		return SystemSession.getUser();
+	}
+	
+}

+ 1 - 1
src/main/java/com/uas/platform/b2b/dao/UserDao.java

@@ -14,7 +14,7 @@ import com.uas.platform.b2b.model.User;
 public interface UserDao extends JpaRepository<User, Long> {
 
 	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
-	public List<User> findUserByUserUU(String userUU);
+	public List<User> findUserByUserUU(Long userUU);
 
 	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
 	public List<User> findUserByUserEmail(String userEmail);

+ 1 - 1
src/main/java/com/uas/platform/b2b/service/UserService.java

@@ -26,7 +26,7 @@ public interface UserService {
 	 * @param userUU
 	 * @return
 	 */
-	User findUserByUserUU(String userUU);
+	User findUserByUserUU(Long userUU);
 
 	/**
 	 * 按email取用户信息

+ 1 - 1
src/main/java/com/uas/platform/b2b/service/impl/UserServiceImpl.java

@@ -31,7 +31,7 @@ public class UserServiceImpl implements UserService {
 	}
 
 	@Override
-	public User findUserByUserUU(String uu) {
+	public User findUserByUserUU(Long uu) {
 		List<User> users = userDao.findUserByUserUU(uu);
 		if (users.size() == 0)
 			throw new UsernameNotFoundException("没有找到您的账号 " + uu);

+ 1 - 1
src/main/java/com/uas/platform/b2b/support/CustomAuthenticationSuccessHandler.java

@@ -28,7 +28,7 @@ public class CustomAuthenticationSuccessHandler extends SimpleUrlAuthenticationS
 	@Override
 	public void onAuthenticationSuccess(final HttpServletRequest request, final HttpServletResponse response,
 			final Authentication authentication) throws ServletException, IOException {
-		User user = userService.findUserByUserUU(authentication.getName());
+		User user = userService.findUserByUserUU(Long.parseLong(authentication.getName()));
 		request.getSession().setAttribute("user", user);
 
 		final SavedRequest savedRequest = requestCache.getRequest(request, response);

+ 4 - 2
src/main/java/com/uas/platform/b2b/support/CustomUserDetailsService.java

@@ -31,6 +31,8 @@ public class CustomUserDetailsService implements UserDetailsService {
 	private UserService userService;
 
 	static final String TEL_REGEXP = "^((\\(\\d{3}\\))|(\\d{3}\\-))?(13|15|18)\\d{9}$";
+	
+	static final String UU_REGEXP = "^\\d{4,}$";
 
 	/**
 	 * @param username
@@ -45,8 +47,8 @@ public class CustomUserDetailsService implements UserDetailsService {
 				userinfo = userService.findUserByUserEmail(username);
 			} else if (username.matches(TEL_REGEXP)) {// 手机号登录
 				userinfo = userService.findUserByUserTel(username);
-			} else {
-				userinfo = userService.findUserByUserUU(username);
+			} else if(username.matches(UU_REGEXP)){
+				userinfo = userService.findUserByUserUU(Long.parseLong(username));
 			}
 			ArrayList<GrantedAuthority> array = new ArrayList<GrantedAuthority>();
 			array.add(new SimpleGrantedAuthority(ROLE_USER));

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

@@ -1,554 +1,290 @@
 <!DOCTYPE HTML>
 <html lang="zh-CN">
 <head>
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+<meta name="baidu-site-verification" content="S0kf5fz0uA" />
 <meta charset="utf-8">
-<title>卖家中心-UU电子市场</title>
-<link href="static/img/all/ico_1.jpg" rel="icon" type="image/x-icon" />
+<title>优软商务平台</title>
+<meta name="keywords"
+	content="优软商务平台,优软B2B平台,商务平台,B2B平台,B2B,电子商务,ERP,UAS,USOFTCHINA.COM,优软">
+<meta name="description" content="优软商务平台,企业供销信息交流平台。">
+<link href="static/img/icon/u.png" rel="icon" type="image/x-icon" />
 <link rel="stylesheet" href="static/lib/bootstrap/css/bootstrap.min.css" />
 <link rel="stylesheet"
 	href="static/lib/fontawesome/css/font-awesome.min.css" />
 <link rel="stylesheet" href="static/css/index.css" />
 </head>
 <body>
-	<!-- 顶层站点导航 Start -->
-	<div class="navbar navbar-static-top" id="top">
-		<div class="navbar-inner">
-			<div class="container">
-				<nav class="collapse navbar-collapse">
-					<ul class="nav navbar-nav">
-						<li><a href="#">手机端</a></li>
-						<li><a href="#">管理员</a></li>
-						<li><a href="#">消息</a></li>
-					</ul>
-					<ul class="nav navbar-nav navbar-right">
-						<li><a href="#">UU首页</a></li>
-						<li class="dropdown"><a href="#" class="dropdown-toggle">我的UU<span
-								class="caret"></span></a>
-							<ul class="dropdown-menu">
-								<li><a href="#">已买到的商品</a></li>
-								<li><a href="#">最新动态</a></li>
-							</ul></li>
-						<li class="dropdown"><a href="#" class="dropdown-toggle">卖家中心<span
-								class="caret"></span></a>
-							<ul class="dropdown-menu">
-								<li><a href="#">已卖出的商品</a></li>
-								<li><a href="#">出售中的商品</a></li>
-							</ul></li>
-						<li class="dropdown"><a href="#" class="dropdown-toggle">卖家服务<span
-								class="caret"></span></a>
-							<ul class="dropdown-menu">
-								<li><a href="#">我的服务</a></li>
-								<li><a href="#">我的课程</a></li>
-							</ul></li>
-						<li class="dropdown"><a href="#" class="dropdown-toggle">卖家地图<span
-								class="caret"></span></a>
-							<div class="dropdown-menu">
-								<div class="container" style="width: 280px;">
-									<ul class="list-unstyled">
-										<li>
-											<h4>工具</h4>
-											<ul class="nav nav-pills">
-												<li><a target="_blank" href="#">钻石展位</a></li>
-												<li><a target="_blank" href="#">商业圈</a></li>
-												<li><a target="_blank" href="#">SAAS直通车</a></li>
-											</ul>
-										</li>
-										<li>
-											<h4>资源</h4>
-											<ul class="nav nav-pills">
-												<li><a target="_blank" href="#">营销导航</a></li>
-												<li><a target="_blank" href="#">分销平台</a></li>
-												<li><a target="_blank" href="#">培训</a></li>
-												<li><a target="_blank" href="#">服务中心</a></li>
-												<li><a target="_blank" href="#">安全中心</a></li>
-												<li><a target="_blank" href="#">交易安全</a></li>
-												<li><a target="_blank" href="#">维权中心</a></li>
-											</ul>
-										</li>
+	<!-- top Start -->
+	<header class="navbar navbar-static-top" id="top">
+		<div class="container">
+			<nav class="hidden-xs">
+				<ul class="nav navbar-nav" ng-controller="AuthCtrl">
+					<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"></i> </a>
+						<div class="dropdown-menu" style="padding: 15px; width: 180px;">
+							<ul class="list-unstyled">
+								<li><a href="#"><h6 class="text-info">{{userInfo.enName}}</h6></a></li>
+								<li class="divider" ng-show="userInfo.enName"></li>
+								<li><a href="#"><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="#"><i class="fa fa-gear fa-fw"></i> 账号管理</a><a
+									href="#" class="muted pull-right" ng-click="logout()">退出</a></li>
+							</ul>
+						</div></li>
+					<li class="dropdown" ng-show="isAuthed"><a href="#"
+						role="button" class="dropdown-toggle">消息(0) <i
+							class="fa fa-angle-down"></i>
+					</a></li>
+				</ul>
+				<ul class="nav navbar-nav navbar-right">
+					<li class="dropdown"><a href="#" role="button"
+						class="dropdown-toggle"> 我的UU <i class="fa fa-angle-down"></i>
+					</a>
+						<div class="dropdown-menu"
+							style="width: 420px; padding: 10px 15px">
+							<div class="row pills">
+								<div class="col-xs-4">
+									<h4>采购</h4>
+									<ul class="nav nav-pills">
+										<li><a href="purc#orders" title="已采购商品">已采购商品</a></li>
+										<li><a href="purc#inquiry" title="发布询价单">发布询价单</a></li>
+										<li><a href="purc#inquiries" title="管理询价单">管理询价单</a></li>
+										<li><a href="purc#order" title="新增采购单">新增采购单</a></li>
 									</ul>
-									<div class="pull-right">
-										<a target="_blank" href="#">更多内容 &gt;&gt;</a>
-									</div>
 								</div>
-							</div></li>
-						<li><a href="#">帮助</a></li>
-					</ul>
-				</nav>
-			</div>
-		</div>
-	</div>
-	<!-- 顶层站点导航 End -->
-	<!-- 综合查找 Start -->
-	<div class="row" id="header">
-		<!-- logo begin -->
-		<div class="col-xs-4">
-			<h1 class="title">卖家中心</h1>
-		</div>
-		<!-- logo end -->
-		<!-- search begin -->
-		<div class="col-xs-8 search-container" ng-controller="SearchCtrl">
-			<!-- search input begin -->
-			<div class="btn-group">
-				<label class="btn" ng-model="searchType" btn-radio="'0'">综合</label>
-				<label class="btn" ng-model="searchType" btn-radio="'1'">经验</label>
-				<label class="btn" ng-model="searchType" btn-radio="'2'">货源</label>
-				<label class="btn" ng-model="searchType" btn-radio="'3'">服务</label>
-				<label class="btn" ng-model="searchType" btn-radio="'4'">帮助</label>
-				<label class="btn" ng-model="searchType" btn-radio="'5'">商品</label>
-				<label class="btn" ng-model="searchType" btn-radio="'6'">店铺</label>
-			</div>
-			<div class="input-group">
-				<input class="form-control input-inverse" type="search"
-					placeholder="输入关键字"> <span class="input-group-btn">
-					<button class="btn btn-inverse" type="button">搜索</button>
-				</span>
-			</div>
-			<!-- search input end -->
-			<!-- hot words begin -->
-			<ul class="list-inline hotword">
-				<li ng-repeat="hotword in hotwords"><a href="#">{{hotword}}</a></li>
-				<li><span class="text-muted">|</span></li>
-				<li><a href="#">搜索排行榜</a></li>
-			</ul>
-			<!-- hot words end -->
-		</div>
-		<!-- search end -->
-	</div>
-	<!-- 综合查找 End -->
-	<!-- 主功能bar Start -->
-	<div class="container" id="nav">
-		<div class="navbar navbar-inverse">
-			<nav class="collapse navbar-collapse">
-				<ul class="nav navbar-nav">
-					<li class="active categories"><a href="#">我是卖家</a>
-						<div class="nav-collapse">
-							<ul class="nav nav-stacked">
-								<li>
-									<h4>交易管理</h4>
+								<div class="col-xs-4">
+									<h4>销售</h4>
+									<ul class="nav nav-pills">
+										<li><a href="sale#orders" title="已卖出商品">已卖出商品</a></li>
+										<li><a href="prod#product" title="发布供应产品">发布供应产品</a></li>
+										<li><a href="prod#products" title="管理供应产品">管理供应产品</a></li>
+										<li><a href="sale#order" title="新增订单">新增订单</a></li>
+									</ul>
+								</div>
+								<div class="col-xs-4">
+									<h4>工具</h4>
 									<ul class="nav nav-pills">
-										<li><a target="_blank" href="#">已卖出商品</a></li>
-										<li><a target="_blank" href="#">评价管理</a></li>
+										<li><a href="#" title="个人空间">个人空间</a></li>
+										<li><a href="admin" title="企业空间">企业空间</a></li>
+										<li><a href="#" title="ERP">ERP</a></li>
+										<li><a href="#" title="行业信息">行业信息</a></li>
 									</ul>
-								</li>
-								<li>
-									<h4>商品管理</h4>
+								</div>
+							</div>
+						</div></li>
+					<li class="dropdown"><a href="#" role="button"
+						class="dropdown-toggle"> 待发货(<span class="text-warning">0</span>)
+							<i class="fa fa-angle-down"></i>
+					</a>
+						<div class="dropdown-menu" style="padding: 10px 15px;">
+							<div class="form-actions">
+								<div>
+									<button type="button" class="pull-right btn btn-warning btn-sm">添加销售订单</button>
+								</div>
+							</div>
+						</div></li>
+					<li><a href="#" role="button"><i
+							class="fa fa-star text-simple"></i> 收藏夹 </a></li>
+					<li class="dropdown"><a href="#" role="button"
+						class="dropdown-toggle"> 客服中心 <i class="fa fa-angle-down"></i>
+					</a>
+						<ul class="dropdown-menu pull-right" role="menu">
+							<li><a href="#">新手上路</a></li>
+							<li><a href="#">买家帮助</a></li>
+							<li><a href="#">卖家帮助</a></li>
+							<li><a href="#">在线咨询</a></li>
+						</ul></li>
+					<li class="dropdown"><a href="#" role="button"
+						class="dropdown-toggle text-inverse"><i class="fa fa-bars"></i>
+							网站导航 <i class="fa fa-angle-down"></i> </a>
+						<div class="dropdown-menu container" style="padding: 10px 15px">
+							<div class="row pills">
+								<div class="col-xs-2">
+									<h4>采购市场</h4>
 									<ul class="nav nav-pills">
-										<li><a target="_blank" href="product">发布商品<i
-												class="icon-hot"></i></a></li>
-										<li><a target="_blank" href="#">出售中商品</a></li>
-										<li><a target="_blank" href="#">橱窗推荐</a></li>
-										<li><a target="_blank" href="#">仓库中商品</a></li>
-										<li><a target="_blank" href="#">体检中心</a></li>
+										<li><a href="#" title="采购市场">采购市场</a></li>
+										<li><a href="#" title="采购市场">采购市场</a></li>
+										<li><a href="#" title="采购市场">采购市场</a></li>
+										<li><a href="#" title="采购市场">采购市场</a></li>
+										<li><a href="#" title="采购市场">采购市场</a></li>
+										<li><a href="#" title="采购市场">采购市场</a></li>
+										<li><a href="#" title="采购市场">采购市场</a></li>
+										<li><a href="#" title="采购市场">采购市场</a></li>
 									</ul>
-								</li>
-								<li>
-									<h4>店铺管理</h4>
+								</div>
+								<div class="col-xs-2">
+									<h4>销售市场</h4>
 									<ul class="nav nav-pills">
-										<li><a target="_blank" href="shop/view">查看店铺</a></li>
-										<li><a target="_blank" href="shop/design">店铺装修<i
-												class="icon-hot"></i></a></li>
-										<li><a target="_blank" href="images">图片空间</a></li>
-										<li><a target="_blank" href="#">商品分类管理</a></li>
-										<li><a target="_blank" href="#">店铺基本设置</a></li>
-										<li><a target="_blank" href="#">媒体中心</a></li>
-										<li><a target="_blank" href="#">商家保障</a></li>
+										<li><a href="#" title="销售市场">销售市场</a></li>
+										<li><a href="#" title="销售市场">销售市场</a></li>
+										<li><a href="#" title="销售市场">销售市场</a></li>
+										<li><a href="#" title="销售市场">销售市场</a></li>
+										<li><a href="#" title="销售市场">销售市场</a></li>
+										<li><a href="#" title="销售市场">销售市场</a></li>
+										<li><a href="#" title="销售市场">销售市场</a></li>
+										<li><a href="#" title="销售市场">销售市场</a></li>
 									</ul>
-								</li>
-								<li>
-									<h4>物流管理</h4>
+								</div>
+								<div class="col-xs-2">
+									<h4>分销管理</h4>
 									<ul class="nav nav-pills">
-										<li><a target="_blank" href="#">发货</a></li>
-										<li><a target="_blank" href="#">物流工具</a></li>
-										<li><a target="_blank" href="#">物流服务</a></li>
-										<li><a target="_blank" href="#">物流数据</a></li>
-										<li><a target="_blank" href="#">仓储管理</a></li>
+										<li><a href="#" title="分销管理">分销管理</a></li>
+										<li><a href="#" title="分销管理">分销管理</a></li>
+										<li><a href="#" title="分销管理">分销管理</a></li>
+										<li><a href="#" title="分销管理">分销管理</a></li>
+										<li><a href="#" title="分销管理">分销管理</a></li>
+										<li><a href="#" title="分销管理">分销管理</a></li>
+										<li><a href="#" title="分销管理">分销管理</a></li>
+										<li><a href="#" title="分销管理">分销管理</a></li>
 									</ul>
-								</li>
-								<li>
-									<h4>货源中心</h4>
+								</div>
+								<div class="col-xs-2">
+									<h4>行业动态</h4>
 									<ul class="nav nav-pills">
-										<li><a target="_blank" href="#">品牌货源</a></li>
-										<li><a target="_blank" href="#">批发进货</a></li>
-										<li><a target="_blank" href="#">分销管理</a></li>
+										<li><a href="#" title="行业动态">行业动态</a></li>
+										<li><a href="#" title="行业动态">行业动态</a></li>
+										<li><a href="#" title="行业动态">行业动态</a></li>
+										<li><a href="#" title="行业动态">行业动态</a></li>
+										<li><a href="#" title="行业动态">行业动态</a></li>
+										<li><a href="#" title="行业动态">行业动态</a></li>
+										<li><a href="#" title="行业动态">行业动态</a></li>
+										<li><a href="#" title="行业动态">行业动态</a></li>
 									</ul>
-								</li>
-								<li>
-									<h4>软件服务</h4>
+								</div>
+								<div class="col-xs-2">
+									<h4>商业资讯</h4>
 									<ul class="nav nav-pills">
-										<li><a target="_blank" href="#">我要订购</a></li>
-										<li><a target="_blank" href="#">定制服务</a></li>
+										<li><a href="#" title="商业资讯">商业资讯</a></li>
+										<li><a href="#" title="商业资讯">商业资讯</a></li>
+										<li><a href="#" title="商业资讯">商业资讯</a></li>
+										<li><a href="#" title="商业资讯">商业资讯</a></li>
+										<li><a href="#" title="商业资讯">商业资讯</a></li>
+										<li><a href="#" title="商业资讯">商业资讯</a></li>
+										<li><a href="#" title="商业资讯">商业资讯</a></li>
+										<li><a href="#" title="商业资讯">商业资讯</a></li>
 									</ul>
-								</li>
-								<li>
-									<h4>客户服务</h4>
+								</div>
+								<div class="col-xs-2">
+									<h4>常用工具</h4>
 									<ul class="nav nav-pills">
-										<li><a target="_blank" href="#">消费者保障</a></li>
-										<li><a target="_blank" href="#">UU认证</a></li>
-										<li><a target="_blank" href="#">退款管理</a></li>
-										<li><a target="_blank" href="#">售后管理</a></li>
-										<li><a target="_blank" href="#">举报管理</a></li>
-										<li><a target="_blank" href="#">投诉管理</a></li>
-										<li><a target="_blank" href="#">咨询回复</a></li>
-										<li><a target="_blank" href="#">违规记录</a></li>
-										<li><a target="_blank" href="#">维修进度</a></li>
-										<li><a target="_blank" href="#">店铺过户</a></li>
+										<li><a href="#" title="常用工具">常用工具</a></li>
+										<li><a href="#" title="常用工具">常用工具</a></li>
+										<li><a href="#" title="常用工具">常用工具</a></li>
+										<li><a href="#" title="常用工具">常用工具</a></li>
+										<li><a href="#" title="常用工具">常用工具</a></li>
+										<li><a href="#" title="常用工具">常用工具</a></li>
+										<li><a href="#" title="常用工具">常用工具</a></li>
+										<li><a href="#" title="常用工具">常用工具</a></li>
 									</ul>
-								</li>
-							</ul>
+								</div>
+							</div>
 						</div></li>
-					<li><a href="#">账号管理</a></li>
-					<li><a href="#">消息中心</a></li>
-					<li><a href="#">卖家地图</a></li>
-					<li><a href="#">采购批发</a></li>
-					<li><a href="#">卖往海外</a></li>
 				</ul>
-				<p class="navbar-text navbar-right">
-					<a href="#" class="navbar-link">我的UU&gt;&gt;</a>
-				</p>
 			</nav>
 		</div>
-
-	</div>
-	<!-- 主功能bar End -->
-	<!-- Start -->
-	<div class="main-panel">
+	</header>
+	<!-- top End -->
+	<!-- header Start -->
+	<div class="navbar navbar-inverse" id="header">
 		<div class="container">
-			<div class="workbench">
-				<!-- 卖家工作台 Start -->
-				<div class="row">
-					<!-- 中间大模块 Start -->
-					<div class="col-xs-8 app-left">
-						<div class="panel">
-							<div class="panel-absolute-title">
-								<i class="fa fa-wordpress fa-fw"></i>&nbsp;金牌卖家
-							</div>
-							<div class="panel-heading">
-								<div class="pull-right panel-tools">
-									<a href="#" title="评价"><span
-										class="glyphicon glyphicon-pencil"></span></a> <a href="#"
-										title="上移"><span class="glyphicon glyphicon-hand-up"></span></a>
-									<a href="#" title="下移"> <span
-										class="glyphicon glyphicon-hand-down"></span>
-									</a> <a href="#" title="置顶"><span
-										class="glyphicon glyphicon-circle-arrow-up"></span></a> <a
-										href="#" title="置底"><span
-										class="glyphicon glyphicon-circle-arrow-down"></span></a>
-								</div>
-							</div>
-							<div class="panel-body">
-								<h4>您的店铺当前不符合金牌卖家的基础准入条件,原因可能如下:</h4>
-								<ol>
-									<li>2014.08.01后新开店铺,不在本期考核范围内</li>
-									<li>本次数据考核期内店铺主营类目未开通金牌卖家,或主营类目符合,但店铺存在特殊类目商品,如:刮痧片/板、早孕试纸、佛像/神像等</li>
-									<li>您所在的行业需要持有政府许可证,如:书籍,音像,宠物活体等</li>
-								</ol>
-							</div>
-						</div>
-						<div class="panel">
-							<div class="panel-absolute-title">
-								<i class="fa fa-bell fa-fw"></i>&nbsp;店铺提醒
-							</div>
-							<div class="panel-heading">
-								<div class="pull-right panel-tools">
-									<a href="#" title="评价"><span
-										class="glyphicon glyphicon-pencil"></span></a> <a href="#"
-										title="上移"><span class="glyphicon glyphicon-hand-up"></span></a>
-									<a href="#" title="下移"> <span
-										class="glyphicon glyphicon-hand-down"></span>
-									</a> <a href="#" title="置顶"><span
-										class="glyphicon glyphicon-circle-arrow-up"></span></a> <a
-										href="#" title="置底"><span
-										class="glyphicon glyphicon-circle-arrow-down"></span></a>
-								</div>
-							</div>
-							<div class="panel-body"></div>
-						</div>
-						<div class="panel">
-							<div class="panel-absolute-title">
-								<i class="fa fa-briefcase fa-fw"></i>&nbsp;店铺运营助手
-							</div>
-							<div class="panel-heading">
-								<div class="pull-right panel-tools">
-									<a href="#" title="评价"><span
-										class="glyphicon glyphicon-pencil"></span></a> <a href="#"
-										title="上移"><span class="glyphicon glyphicon-hand-up"></span></a>
-									<a href="#" title="下移"> <span
-										class="glyphicon glyphicon-hand-down"></span>
-									</a> <a href="#" title="置顶"><span
-										class="glyphicon glyphicon-circle-arrow-up"></span></a> <a
-										href="#" title="置底"><span
-										class="glyphicon glyphicon-circle-arrow-down"></span></a> <a
-										href="#" title="隐藏"><span
-										class="glyphicon glyphicon-remove"></span></a>
-								</div>
-							</div>
-							<div class="panel-body">
-								<div class="arrow-panel" style="margin-top: 10px;">
-									<div class="arrow arrow-bottom">亲,您的店铺最近成交太少,请继续加油,就可以看到排名了哦。</div>
-								</div>
-							</div>
-						</div>
-						<div class="panel">
-							<div class="panel-absolute-title">
-								<i class="fa fa-gavel fa-fw"></i>&nbsp;消费者保障服务
-							</div>
-							<div class="panel-heading">
-								<div class="pull-right panel-tools">
-									<a href="#" title="评价"><span
-										class="glyphicon glyphicon-pencil"></span></a> <a href="#"
-										title="上移"><span class="glyphicon glyphicon-hand-up"></span></a>
-									<a href="#" title="下移"> <span
-										class="glyphicon glyphicon-hand-down"></span>
-									</a> <a href="#" title="置顶"><span
-										class="glyphicon glyphicon-circle-arrow-up"></span></a> <a
-										href="#" title="置底"><span
-										class="glyphicon glyphicon-circle-arrow-down"></span></a> <a
-										href="#" title="隐藏"><span
-										class="glyphicon glyphicon-remove"></span></a>
-								</div>
-							</div>
-							<div class="panel-body"></div>
-						</div>
-						<div class="panel">
-							<div class="panel-absolute-title">
-								<i class="fa fa-database fa-fw"></i>&nbsp;店铺数据
-							</div>
-							<div class="panel-heading">
-								<div class="pull-right panel-tools">
-									<a href="#" title="评价"><span
-										class="glyphicon glyphicon-pencil"></span></a> <a href="#"
-										title="上移"><span class="glyphicon glyphicon-hand-up"></span></a>
-									<a href="#" title="下移"> <span
-										class="glyphicon glyphicon-hand-down"></span>
-									</a> <a href="#" title="置顶"><span
-										class="glyphicon glyphicon-circle-arrow-up"></span></a> <a
-										href="#" title="置底"><span
-										class="glyphicon glyphicon-circle-arrow-down"></span></a> <a
-										href="#" title="隐藏"><span
-										class="glyphicon glyphicon-remove"></span></a>
-								</div>
-							</div>
-							<div class="panel-body"></div>
-						</div>
-						<div class="panel">
-							<div class="panel-absolute-title">
-								<i class="fa fa-share-alt fa-fw"></i>&nbsp;商家培训
-							</div>
-							<div class="panel-heading">
-								<div class="pull-right panel-tools">
-									<a href="#" title="评价"><span
-										class="glyphicon glyphicon-pencil"></span></a> <a href="#"
-										title="上移"><span class="glyphicon glyphicon-hand-up"></span></a>
-									<a href="#" title="下移"> <span
-										class="glyphicon glyphicon-hand-down"></span>
-									</a> <a href="#" title="置顶"><span
-										class="glyphicon glyphicon-circle-arrow-up"></span></a> <a
-										href="#" title="置底"><span
-										class="glyphicon glyphicon-circle-arrow-down"></span></a> <a
-										href="#" title="隐藏"><span
-										class="glyphicon glyphicon-remove"></span></a>
-								</div>
-							</div>
-							<div class="panel-body"></div>
-						</div>
-						<div class="panel">
-							<div class="panel-absolute-title">
-								<i class="fa fa-warning fa-fw"></i>&nbsp;店铺经营状态预警
-							</div>
-							<div class="panel-heading">
-								<div class="pull-right panel-tools">
-									<a href="#" title="评价"><span
-										class="glyphicon glyphicon-pencil"></span></a> <a href="#"
-										title="上移"><span class="glyphicon glyphicon-hand-up"></span></a>
-									<a href="#" title="下移"> <span
-										class="glyphicon glyphicon-hand-down"></span>
-									</a> <a href="#" title="置顶"><span
-										class="glyphicon glyphicon-circle-arrow-up"></span></a> <a
-										href="#" title="置底"><span
-										class="glyphicon glyphicon-circle-arrow-down"></span></a> <a
-										href="#" title="隐藏"><span
-										class="glyphicon glyphicon-remove"></span></a>
-								</div>
-							</div>
-							<div class="panel-body">
-								<div class="arrow-panel"
-									style="margin-top: 10px; max-width: 200px;">
-									<div class="arrow arrow-bottom">您的店铺暂无预警指标!</div>
-								</div>
-							</div>
-						</div>
+			<div class="navbar-header">
+				<a href="#" class="navbar-brand"></a>
+			</div>
+			<nav class="navbar-collapse">
+				<ul class="nav navbar-nav">
+					<li class="active"><a href="#">首页</a></li>
+					<li><a href="#">基础设置</a></li>
+					<li><a href="#">账户设置</a></li>
+					<li class="dropdown"><a href="#">销售管理</a>
+						<ul class="dropdown-menu">
+							<li><a href="#">设置水印</a></li>
+							<li><a href="#">网店秀</a></li>
+							<li><a href="#">美图秀秀</a></li>
+							<li><a href="#">图片拍摄</a></li>
+							<li><a href="#">图片搬家</a></li>
+							<li class="dropdown-submenu"><a href="#"
+								class="dropdown-toggle">系统日志</a>
+								<ul class="dropdown-menu">
+									<li><a href="#">图片操作日志</a></li>
+									<li><a href="#">分类操作日志</a></li>
+									<li><a href="#">授权操作日志</a></li>
+									<li><a href="#">容量变更日志</a></li>
+								</ul></li>
+						</ul></li>
+					<li><a href="#">委外管理</a></li>
+					<li><a href="#">品质管理</a></li>
+					<li><a href="#">财务对账</a></li>
+				</ul>
+			</nav>
+		</div>
+	</div>
+	<!-- header End -->
+	<!-- body Start -->
+	<div class="container body">
+		<div class="left pull-left">
+			<div class="user">
+				<div class="user-info">
+					<div class="user-image">
+						<img src="static/img/all/user_empty.png">
 					</div>
-					<!-- 中间大模块 End -->
-					<!-- 右边小模块 Start -->
-					<div class="col-xs-4 app-right">
-						<div class="panel">
-							<div class="panel-absolute-title">
-								<i class="fa fa-bullhorn fa-fw"></i>&nbsp;官方信息中心
-							</div>
-							<div class="panel-heading">
-								<div class="pull-right panel-tools">
-									<a href="#" title="评价"><span
-										class="glyphicon glyphicon-pencil"></span></a> <a href="#"
-										title="上移"><span class="glyphicon glyphicon-hand-up"></span></a>
-									<a href="#" title="下移"> <span
-										class="glyphicon glyphicon-hand-down"></span>
-									</a> <a href="#" title="置顶"><span
-										class="glyphicon glyphicon-circle-arrow-up"></span></a> <a
-										href="#" title="置底"><span
-										class="glyphicon glyphicon-circle-arrow-down"></span></a>
-								</div>
-							</div>
-							<div class="panel-body">
-								<ul class="list-unstyled">
-									<li><a href="#" title="【生意参谋】关于流量那些事" class="sub-left">【生意参谋】关于流量那些事</a><small
-										class="pull-right text-warning"><i class="fa fa-star"></i></small></li>
-									<li><a href="#" title="【已买到的商品】开放店铺活动入口" class="sub-left">【已买到的商品】开放店铺活动入口</a><small
-										class="pull-right text-warning"><i
-											class="fa fa-star-half-o"></i></small></li>
-									<li><a href="#" title="虚假交易规则解读" class="sub-left">虚假交易规则解读</a><small
-										class="pull-right text-warning"><i
-											class="fa fa-star-o"></i></small></li>
-									<li><a href="#" title="【营销中心】店铺活动攻略" class="sub-left">【营销中心】店铺活动攻略</a><span
-										class="pull-right text-muted">07-28</span></li>
-								</ul>
-								<button type="button" class="btn btn-default btn-sm btn-block">查看全部</button>
-							</div>
-						</div>
-						<div class="panel">
-							<div class="panel-absolute-title">
-								<i class="fa fa-cogs fa-fw"></i>&nbsp;软件服务
-							</div>
-							<div class="panel-heading">
-								<div class="pull-right panel-tools">
-									<a href="#" title="评价"><span
-										class="glyphicon glyphicon-pencil"></span></a> <a href="#"
-										title="上移"><span class="glyphicon glyphicon-hand-up"></span></a>
-									<a href="#" title="下移"> <span
-										class="glyphicon glyphicon-hand-down"></span>
-									</a> <a href="#" title="置顶"><span
-										class="glyphicon glyphicon-circle-arrow-up"></span></a> <a
-										href="#" title="置底"><span
-										class="glyphicon glyphicon-circle-arrow-down"></span></a> <a
-										href="#" title="隐藏"><span
-										class="glyphicon glyphicon-remove"></span></a>
-								</div>
-							</div>
-							<div class="panel-body">
-								<div class="arrow-panel"
-									style="margin-top: 10px; max-width: 200px;">
-									<div class="arrow arrow-bottom">您还没有订购任何的服务</div>
-								</div>
-								<div style="margin-top: 10px; border-top: 1px dashed #eee">
-									<h4>您可能感兴趣:</h4>
-									<ul class="list-unstyled list-inline">
-										<li><a href="#">标题优化</a></li>
-										<li><a href="#">店铺推广</a></li>
-									</ul>
-								</div>
-								<button type="button" class="btn btn-default btn-sm btn-block">订购服务</button>
-							</div>
-						</div>
-						<div class="panel">
-							<div class="panel-absolute-title">
-								<i class="fa fa-flag fa-fw"></i>&nbsp;卖家刊
-							</div>
-							<div class="panel-heading">
-								<div class="pull-right panel-tools">
-									<a href="#" title="评价"><span
-										class="glyphicon glyphicon-pencil"></span></a> <a href="#"
-										title="上移"><span class="glyphicon glyphicon-hand-up"></span></a>
-									<a href="#" title="下移"> <span
-										class="glyphicon glyphicon-hand-down"></span>
-									</a> <a href="#" title="置顶"><span
-										class="glyphicon glyphicon-circle-arrow-up"></span></a> <a
-										href="#" title="置底"><span
-										class="glyphicon glyphicon-circle-arrow-down"></span></a> <a
-										href="#" title="隐藏"><span
-										class="glyphicon glyphicon-remove"></span></a>
-								</div>
-							</div>
-							<div class="panel-body">
-								<ul class="list-unstyled">
-									<li><a href="#" title="【卖家分享】六招留住你的买家">【卖家分享】六招留住你的买家</a></li>
-									<li><a href="#" title="【卖家访谈】官方渠道有捷径">【卖家访谈】官方渠道有捷径</a></li>
-								</ul>
-							</div>
-						</div>
-						<div class="panel">
-							<div class="panel-absolute-title">
-								<i class="fa fa-image fa-fw"></i>&nbsp;图片空间
-							</div>
-							<div class="panel-heading">
-								<div class="pull-right panel-tools">
-									<a href="#" title="评价"><span
-										class="glyphicon glyphicon-pencil"></span></a> <a href="#"
-										title="上移"><span class="glyphicon glyphicon-hand-up"></span></a>
-									<a href="#" title="下移"> <span
-										class="glyphicon glyphicon-hand-down"></span>
-									</a> <a href="#" title="置顶"><span
-										class="glyphicon glyphicon-circle-arrow-up"></span></a> <a
-										href="#" title="置底"><span
-										class="glyphicon glyphicon-circle-arrow-down"></span></a> <a
-										href="#" title="隐藏"><span
-										class="glyphicon glyphicon-remove"></span></a>
-								</div>
-							</div>
-							<div class="panel-body">
-								<progressbar max="20" value="4.2" type="warning">
-								<span class="progressbar-text">4.20G / 20.00G</span> </progressbar>
-								<div class="arrow-panel"
-									style="margin-top: 15px; margin-bottom: 10px; max-width: 150px;">
-									<div class="arrow arrow-bottom">
-										使用情况:<span class="text-red"><h3>21</h3>%</span>
-									</div>
-								</div>
-								<div class="btn-group btn-group-justified">
-									<div class="btn-group">
-										<button type="button" class="btn btn-default btn-sm">立即使用</button>
-									</div>
-									<div class="btn-group">
-										<button type="button" class="btn btn-default btn-sm">立即搬家</button>
-									</div>
-								</div>
-
-							</div>
+					<div class="user-name">
+						应鹏<br>
+						<div class="work_user-username-info">
+							<a target="_blank" class="work_user-username-info-label"
+								href="#app/accountmanagement">账户信息 <span
+								class="work_user-arrow"></span></a>
 						</div>
 					</div>
-					<!-- 右边小模块 End -->
+					<div class="work_user-lv">
+						<ul class="work_user-lv-list">
+							采购等级:
+							<a class="work_user-lv-list-img"
+								href="http://vip.1688.com/club/buyer_growth_intr.htm?tracelog=work_buyers_rank&amp;tracelog=work2015_homepage_left_buyermedal"
+								target="_blank" title="您未获得采购等级"><img
+								src="http://i00.c.aliimg.com/cms/upload/member/club/b_s_0_star.png"></a>
+						</ul>
+						<ul class="work_user-lv-list">
+							供应等级:
+							<a class="work_user-lv-list-img"
+								href="http://vip.1688.com/club/seller_growth_intr.htm?tracelog=work_supplier_rank&amp;tracelog=work2015_homepage_left_sellermedal"
+								target="_blank" title="您未获得供应等级"><img
+								src="http://i00.c.aliimg.com/cms/upload/member/club/b_s_0_star.png"></a>
+						</ul>
+					</div>
+				</div>
+				<div class="count">
+					
 				</div>
-				<!-- 卖家工作台 End -->
 			</div>
 		</div>
+		<div class="right pull-right"></div>
 	</div>
-	<!-- End -->
+	<!-- body End -->
 	<!-- footer Start -->
-	<div class="navbar navbar-static-bottom" id="footer">
+	<div class="navbar navbar-fixed-bottom" id="footer">
 		<!-- footer inner -->
 		<div class="container">
-			<div class="link-group row">
-				<ul class="list-inline col-xs-10">
+			<div class="link-group">
+				<ul class="list-inline text-center">
 					<li><a href="#">关于优软</a></li>
 					<li><a href="#">联系我们</a></li>
-					<li><a href="#">诚征英才</a></li>
-					<li><a href="#">欢迎合作</a></li>
-					<li><a href="#">知识产权</a></li>
-					<li><a href="#">著作权与商标声明</a></li>
-					<li><a href="#">法律声明</a></li>
+					<li><a href="#">在线客服</a></li>
+					<li><a href="#">客服中心</a></li>
+					<li><a href="#">联系邮箱</a></li>
 					<li><a href="#">服务条款 </a></li>
-					<li><a href="#">隐私声明 </a></li>
-					<li><a href="#">网站地图 </a></li>
+					<li><a href="#">投诉反馈 </a></li>
+					<li>© 2014-2015 深圳市优软科技有限公司. 版权所有.</li>
 				</ul>
-				<div class="col-xs-2">
-					<a href="#" class="pull-right">对新版有话说</a>
-				</div>
-			</div>
-			<div style="width: 300px; margin: 0 auto;">
-				<p class="text-muted">深圳市优软科技有限公司版权所有 2014-2018</p>
 			</div>
 		</div>
 	</div>
 	<!-- footer End -->
-<!-- 	<script type="text/javascript" src="static/lib/require.js"
-		data-main="static/js/sale/admin/main.js"></script>
- --></body>
+	<script type="text/javascript" src="static/lib/require.js"
+		data-main="static/js/index/main.js"></script>
+</body>
 </html>

+ 8 - 3
src/main/webapp/WEB-INF/views/normal/signin.html

@@ -5,13 +5,14 @@
 <meta name="baidu-site-verification" content="S0kf5fz0uA" />
 <meta charset="utf-8">
 <title>优软商务平台</title>
-<meta name="keywords" content="优软商务平台,优软B2B平台,商务平台,B2B平台,B2B,电子商务,优软">
+<meta name="keywords" content="优软商务平台,优软B2B平台,商务平台,B2B平台,B2B,电子商务,ERP,UAS,USOFTCHINA.COM,优软">
 <meta name="description" content="优软商务平台,企业供销信息交流平台。">
 <link href="static/img/icon/u.png" rel="icon" type="image/x-icon" />
 <link rel="stylesheet" href="static/lib/bootstrap/css/bootstrap.min.css" />
-<link rel="stylesheet"
-	href="static/lib/fontawesome/css/font-awesome.min.css" />
+<link rel="stylesheet" href="static/lib/fontawesome/css/font-awesome.min.css" />
+<link rel="stylesheet" href="static/lib/angular/toaster.css" />
 <link rel="stylesheet" href="static/css/signin.css" />
+<base target="_blank" />
 </head>
 <body>
 	<!-- header Start -->
@@ -107,6 +108,10 @@
 			</div>
 		</div>
 	</div>
+	<!-- 消息提示框  Start-->
+	<toaster-container
+		toaster-options="{'position-class': 'toast-top-center'}"></toaster-container>
+	<!-- 消息提示框 End -->
 	<script type="text/javascript" src="static/lib/require.js"
 		data-main="static/js/signin/main.js"></script>
 </body>

+ 258 - 372
src/main/webapp/resources/css/index.css

@@ -1,46 +1,30 @@
 body {
-	font-size: 12px;
-}
-
-a:hover,a:focus {
-	color: #f60;
-	text-decoration: underline;
+	line-height: 1.6;
+	font-family: "Helvetica Neue", "Hiragino Sans GB", "Microsoft YaHei",
+		"\9ED1\4F53", Arial, sans-serif;
+	color: #222;
+	font-size: 14px;
+	background-color: #eff2f9;
 }
 
-.text-red {
-	color: #ea544a;
+h1,h2,h3 {
+	font-size: 20px;
+	font-weight: 400;
+	font-style: normal;
 }
-
+/*inverse*/
 .text-inverse {
-	color: #f60;
-}
-
-.btn-inverse {
-	color: #fff;
-	font-weight: bold;
-	background-color: #ff7300;
-	border-color: #ef5813;
-}
-
-.btn-inverse:hover,.btn-inverse:focus,.btn-inverse:active,.btn-inverse.active
-	{
-	color: #fff;
-	background-color: #ef5813;
-}
-
-.input-inverse {
-	border: 2px solid #ff7300;
+	color: #f40 !important
 }
 
-.navbar {
-	margin-bottom: 0;
-	border-radius: 0;
+.text-muted {
+	color: #888 !important;
 }
 
-.navbar-right {
-	margin-right: 0;
+.text-simple {
+	color: #aaa;
 }
-
+/*dropdown*/
 .dropdown>.dropdown-toggle {
 	border-style: solid;
 	border-width: 0 1px;
@@ -50,7 +34,7 @@ a:hover,a:focus {
 .dropdown:hover>.dropdown-toggle {
 	position: relative;
 	background-color: #ffffff;
-	border: 1px solid #ccc;
+	border: 1px solid #eee;
 	border-top: 0;
 	border-bottom: 0;
 	z-index: 1001;
@@ -59,59 +43,131 @@ a:hover,a:focus {
 .dropdown:hover>.dropdown-menu {
 	display: block;
 	position: absolute;
+	border-color: #eee;
+	webkit-box-shadow: none;
+	box-shadow: none;
+	margin-top: -1px;
+	min-width: 100%;
+	font-size: 12px;
 }
 
-.dropdown:hover .caret,.dropdown-toggle:hover .caret {
-	border-bottom: 4px solid !important;
-	border-top: none;
+.dropdown-submenu {
+	position: relative;
 }
 
-.icon-hot {
-	background: url("../img/icon/hot.gif") 0 0 no-repeat;
-	position: absolute;
+.dropdown-submenu>.dropdown-menu {
+	top: 0;
+	left: 100%;
 	margin-top: 0;
 	margin-left: -1px;
-	width: 9px;
-	height: 14px;
-	top: 0;
-	z-index: 1;
+	-webkit-border-radius: 0 6px 6px 6px;
+	-moz-border-radius: 0 6px 6px 6px;
+	border-radius: 0 6px 6px 6px;
+	left: 100%;
+}
+
+.dropdown-submenu:hover>.dropdown-toggle {
+	position: relative;
+	background-color: #ffffff;
+	border: 1px solid #ccc;
+	border-right: 0;
+	border-left: 0;
+	z-index: 1001;
+}
+
+.dropdown-submenu:hover>.dropdown-menu {
+	display: block;
+	min-width: 120px;
+	font-size: 12px;
+}
+
+.dropup .dropdown-submenu>.dropdown-menu {
+	top: auto;
+	bottom: 0;
+	margin-top: 0;
+	margin-bottom: -2px;
+	-webkit-border-radius: 5px 5px 5px 0;
+	-moz-border-radius: 5px 5px 5px 0;
+	border-radius: 5px 5px 5px 0;
+}
+
+.dropdown-submenu>a:after {
+	display: block;
+	content: " ";
+	float: right;
+	width: 0;
+	height: 0;
+	border-color: transparent;
+	border-style: solid;
+	border-width: 5px 0 5px 5px;
+	border-left-color: #cccccc;
+	margin-top: 5px;
+	margin-right: -10px;
+}
+
+.dropdown-submenu:hover>a:after {
+	border-left-color: #ffffff;
+}
+
+.dropdown-submenu.pull-left {
+	float: none;
 }
-/*top nav*/
+
+.dropdown-submenu.pull-left>.dropdown-menu {
+	left: -100%;
+	margin-left: 10px;
+	-webkit-border-radius: 6px 0 6px 6px;
+	-moz-border-radius: 6px 0 6px 6px;
+	border-radius: 6px 0 6px 6px;
+}
+
+.navbar {
+	margin-bottom: 0;
+	border-radius: 0;
+}
+/* top css stylesheet*/
 #top {
 	background-color: #f5f5f5;
-	height: 25px;
-	line-height: 25px;
+	height: 35px;
+	line-height: 35px;
 	z-index: 5;
-	font: 12px/1.5 tahoma, arial, \5b8b\4f53;
+	font: 12px/23px Tahoma, Arial, "\5B8B\4F53", sans-serif;
 }
 
 #top.navbar {
-	min-height: 25px;
-	border-bottom: 1px solid #e7e7e7;
+	min-height: 35px;
+	border-bottom: 1px solid #eee;
 }
 
-#top .navbar-inner {
-	-webkit-box-shadow: 0 1px 0px rgba(0, 0, 0, 0.175);
-	box-shadow: 0 1px 0px rgba(0, 0, 0, 0.175);
+#top ul>li>a {
+	color: #6c6c6c;
 }
 
-#top .navbar-nav>li>a {
+#top .navbar-nav>li>a,#top .navbar-nav>li.brand {
 	padding-top: 0;
 	padding-bottom: 0;
-	line-height: 25px;
+	line-height: 35px;
+}
+
+#top ul.navbar-nav>li>a:hover,#top ul.navbar-nav>li>a:focus,#top ul.navbar-nav>li>a:hover *,#top ul.navbar-nav>li>a:focus *
+	{
+	color: #f40;
 }
 
-#top a {
-	color: #666;
+#top .dropdown .fa-angle-down {
+	transition: transform .2s ease-in 0s;
+	-webkit-transition: -webkit-transform .2s ease-in 0s;
 }
 
-#top a:hover,#top a:focus {
-	color: #f60;
+#top .dropdown:hover .fa-angle-down {
+	transform: rotate(180deg);
+	-webkit-transform: rotate(180deg);
+	filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
 }
 
 #top .dropdown:hover>.dropdown-menu {
 	margin-top: -1px;
-	min-width: 120px;
+	min-width: 100%;
 	font-size: 12px;
 }
 
@@ -128,431 +184,261 @@ a:hover,a:focus {
 #top .dropdown-menu .nav-pills>li>a {
 	padding: 5px 10px;
 }
-/*header*/
-#header {
-	width: 1170px;
-	margin: 15px auto 0 auto;
-}
-
-#header .title {
-	min-width: 300px;
-	display: inline-block;
-	padding-left: 118px;
-	font-family: "\5FAE\8F6F\96C5\9ED1";
-	font-size: 22px;
-	font-weight: 600;
-	background: url("../img/all/logo.png") no-repeat;
-	height: 50px;
-	line-height: 50px;
-	text-transform: uppercase;
-	text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2);
-	color: #888;
-}
-
-#header .search-container .hotword {
-	margin-top: 5px;
+
+#top .dropdown-menu .pills>div {
+	border-right: 1px solid #eee;
+	padding: 5px 15px;
 }
 
-#header .search-container .hotword>li>a {
-	color: #6c6c6c;
+#top .dropdown-menu .pills>div:last-child {
+	border-right: none;
 }
 
-#header .search-container .hotword>li>a:hover {
-	color: #f60;
+#top .dropdown-menu .pills ul>li {
+	padding: 2px;
 }
 
-#header .search-container .hotword>li:nth-child(1) a,#header .search-container .hotword>li:nth-child(2) a
-	{
-	color: #f60;
+#top .dropdown-menu .pills ul>li>a {
+	color: #3c3c3c;
 }
 
-#header .search-container .btn-inverse {
-	padding-left: 25px;
-	padding-right: 25px;
-	letter-spacing: 2px;
+#top .dropdown-menu .pills ul>li:hover a {
+	color: white;
+	text-decoration: none;
+}
+
+#top .dropdown-menu .pills>div>h4 {
+	font-family: "Microsoft YaHei", "Hiragino Sans GB";
 	font-weight: 700;
+	font-size: 17px;
 }
 
-#header .search-container .input-inverse {
-	border-radius: 0;
+#top .dropdown-menu .pills>div:nth-child(1) h4 {
+	color: #f50;
 }
 
-#header .search-container input[type="search"]:focus {
-	border-color: #ff7300;
-	outline: 0;
-	-webkit-box-shadow: none;
-	-moz-box-shadow: none;
-	box-shadow: none;
+#top .dropdown-menu .pills>div:nth-child(2) h4 {
+	color: #a0b959;
 }
 
-#header .search-container .btn-group .btn {
-	border-radius: 0;
-	padding: 4px 12px;
-	font-size: 12px;
+#top .dropdown-menu .pills>div:nth-child(3) h4 {
+	color: #df61ab;
 }
 
-#header .search-container .btn-group .btn.active {
-	color: #fff;
-	font-weight: bold;
-	background-color: #ff7300;
+#top .dropdown-menu .pills>div:nth-child(4) h4 {
+	color: #52a0e5;
 }
-/*nav*/
-#nav {
-	color: #ffffff;
-	margin: 5px auto;
+
+#top .dropdown-menu .pills>div:nth-child(5) h4 {
+	color: #52a015;
 }
 
-#nav .navbar-nav>li>a,#nav .navbar-text>a {
-	font: 700 15px/40px "microsoft yahei";
+#top .dropdown-menu .pills>div:nth-child(6) h4 {
+	color: #b68571;
 }
 
-#nav .navbar {
-	min-height: 40px;
+#top .dropdown-menu .pills ul>li>a:hover {
+	color: #fff;
 }
 
-#nav .navbar-nav>li>a {
-	color: #ffffff;
-	font-size: 15px;
-	padding-top: 0;
-	padding-bottom: 0;
-	padding-left: 25px;
-	padding-right: 25px;
+#top .dropdown-menu .pills>div:nth-child(1) ul>li>a:hover {
+	background-color: #f50
 }
 
-#nav .navbar-collapse {
-	padding-left: 0;
+#top .dropdown-menu .pills>div:nth-child(2) ul>li>a:hover {
+	background-color: #a0b959
 }
 
-#nav .navbar-text {
-	margin-bottom: 0;
-	margin-top: 0;
+#top .dropdown-menu .pills>div:nth-child(3) ul>li>a:hover {
+	background-color: #df61ab
 }
 
-#nav .navbar-inverse {
-	background-color: #ff7300;
-	border: none;
+#top .dropdown-menu .pills>div:nth-child(4) ul>li>a:hover {
+	background-color: #52a0e5
 }
 
-#nav .navbar-inverse .navbar-brand {
-	color: #ffffff;
+#top .dropdown-menu .pills>div:nth-child(5) ul>li>a:hover {
+	background-color: #52a015
 }
 
-#nav .navbar-inverse .navbar-brand:hover,#nav .navbar-inverse .navbar-brand:focus
-	{
+#top .dropdown-menu .pills>div:nth-child(6) ul>li>a:hover {
+	background-color: #b68571
+}
+/* header css stylesheet*/
+#header {
 	color: #ffffff;
-	background-color: transparent;
+	z-index: 4;
 }
 
-#nav .navbar-inverse .navbar-text {
-	color: #969696;
+#header a {
+	font-family: "\5fae\8f6f\96c5\9ed1", sans-serif;
 }
 
-#nav .navbar-inverse .navbar-nav>li>a {
+#header .navbar-nav>li>a {
 	color: #ffffff;
+	font-size: 16px;
+	font-weight: 500;
 }
 
-#nav .navbar-inverse .navbar-nav>li>a:hover,#nav .navbar-inverse .navbar-nav>li>a:focus
-	{
-	color: #ffffff;
-	background-color: #ef5813;
+#header.navbar-inverse {
+	background-color: #56a022;
+	border: none;
 }
 
-#nav .navbar-inverse .navbar-nav>.active>a,#nav .navbar-inverse .navbar-nav>.active>a:hover,#nav .navbar-inverse .navbar-nav>.active>a:focus
-	{
+#header.navbar-inverse .navbar-brand {
 	color: #ffffff;
-	background-color: #f50;
 }
 
-#nav .navbar-inverse .navbar-nav>.disabled>a,#nav .navbar-inverse .navbar-nav>.disabled>a:hover,#nav .navbar-inverse .navbar-nav>.disabled>a:focus
+#header.navbar-inverse .navbar-brand:hover,#header.navbar-inverse .navbar-brand:focus
 	{
-	color: #444444;
+	color: #ffffff;
 	background-color: transparent;
 }
 
-#nav .navbar-inverse .navbar-link {
-	color: #ffffff;
+#header.navbar-inverse .navbar-text {
+	color: #969696;
 }
 
-#nav .navbar-inverse .navbar-link:hover {
+#header.navbar-inverse .navbar-nav>li>a {
 	color: #ffffff;
+	padding: 15px 20px;
 }
 
-#nav .navbar-inverse .btn-link {
-	color: #777777;
+#header.navbar-inverse .navbar-nav>li>a:hover,#header.navbar-inverse .navbar-nav>li>a:focus
+	{
+	color: #ffffff;
+	background-color: #4b8b1e;
 }
 
-#nav .navbar-inverse .btn-link:hover,#nav .navbar-inverse .btn-link:focus
+#header.navbar-inverse .navbar-nav>.active>a,#header.navbar-inverse .navbar-nav>.active>a:hover,#header.navbar-inverse .navbar-nav>.active>a:focus
 	{
 	color: #ffffff;
+	background-color: #4b8b1e;
 }
 
-#nav .navbar-inverse .btn-link[disabled]:hover,#nav fieldset[disabled] .navbar-inverse .btn-link:hover,#nav .navbar-inverse .btn-link[disabled]:focus,#nav fieldset[disabled] .navbar-inverse .btn-link:focus
+#header.navbar-inverse .navbar-nav>.disabled>a,#header.navbar-inverse .navbar-nav>.disabled>a:hover,#header.navbar-inverse .navbar-nav>.disabled>a:focus
 	{
 	color: #444444;
+	background-color: transparent;
 }
 
-#nav .categories {
-	width: 200px;
-}
-
-#nav .categories .nav-collapse {
-	position: absolute;
-	width: 200px;
-	border: 1px solid #f50;
-	border-top: 0;
-}
-
-#nav .nav-collapse>ul>li {
-	padding: 0 10px 7px;
-	border-bottom: 1px dashed #eee;
-}
-
-#nav .nav-collapse>ul>li:last-child {
-	border-bottom: 0;
-}
-
-#nav .nav-collapse>ul>li>a {
-	padding: 5px 15px;
-	color: #999;
-}
-
-#nav .nav-collapse>ul>li>h4 {
-	font-size: 100%;
-	font-weight: 700;
-	color: #404040;
-}
-
-#nav .nav-collapse .nav-pills>li+li {
-	margin-left: 0;
-}
-
-#nav .nav-collapse .nav-pills>li>a {
-	padding: 5px 5px;
-	color: #999;
-}
-
-#nav .nav-collapse .nav-pills>li>a:hover {
-	background: #fff1d0;
-	color: #780c00;
-}
-/*main-panel*/
-.main-panel {
-	min-height: 700px;
-}
-
-.main-panel .workbench>.row {
-	margin: 0;
-}
-
-.main-panel [class^="col-xs-"] {
-	padding-left: 0;
-	padding-right: 0;
-}
-
-.main-panel .panel {
-	position: relative;
-	margin-bottom: 0;
-	border-radius: 0;
-	webkit-box-shadow: 0;
-	box-shadow: 0;
-	margin-bottom: 0;
-}
-
-.main-panel .panel .panel-absolute-title {
-	position: absolute;
-	top: 0;
-	left: 0;
-	padding: 0 40px 0 24px;
-	height: 32px;
-	line-height: 32px;
-	border-right: 1px solid #e1e1e1;
-	border-bottom: 1px solid #e1e1e1;
-	background-color: #f5f5f5;
-	color: #3c3c3c;
-	font-size: 14px;
-	font-weight: 700;
+#header.navbar-inverse .navbar-toggle {
+	border-color: #333333;
 }
 
-.main-panel .panel .panel-absolute-title:before,.main-panel .panel .panel-absolute-title:after
+#header.navbar-inverse .navbar-toggle:hover,#header.navbar-inverse .navbar-toggle:focus
 	{
-	content: '';
-	position: absolute;
-	width: 0;
-	height: 0;
-	border: 16px solid transparent;
+	background-color: #333333;
 }
 
-.main-panel .panel .panel-absolute-title:before {
-	top: 0;
-	right: 0;
-	border-right-color: #e1e1e1;
-}
-
-.main-panel .panel .panel-absolute-title:after {
-	top: 0;
-	right: -1px;
-	border-right-color: #fff;
-}
-
-.main-panel .app-left .panel {
-	border-top: 1px solid #e1e1e1;
-	border-left: 1px solid #e1e1e1;
-	border-right: 1px solid #e1e1e1;
-}
-
-.main-panel .app-right .panel {
-	border-top: 1px solid #e1e1e1;
-	border-right: 1px solid #e1e1e1;
+#header.navbar-inverse .navbar-toggle .icon-bar {
+	background-color: #ffffff;
 }
 
-.main-panel .app-left>.panel:last-child,.main-panel .app-right>.panel:last-child
+#header.navbar-inverse .navbar-collapse,#header.navbar-inverse .navbar-form
 	{
-	border-bottom: 1px solid #e1e1e1;
+	border-color: #101010;
 }
 
-.main-panel .panel:hover,.main-panel .app-left>.panel:last-child:hover,.main-panel .app-right>.panel:last-child:hover
+#header.navbar-inverse .navbar-nav>.open>a,#header.navbar-inverse .navbar-nav>.open>a:hover,#header.navbar-inverse .navbar-nav>.open>a:focus
 	{
-	border-color: #f50;
-}
-
-.main-panel .panel .panel-heading .panel-tools {
-	display: none;
-	font-size: 13px;
+	background-color: #56a022;
+	color: #ffffff;
 }
 
-.main-panel .panel:hover .panel-heading .panel-tools {
-	display: block;
+#header.navbar-inverse .navbar-link {
+	color: #777777;
 }
 
-.arrow:before,.arrow:after {
-	content: '';
-	position: absolute;
-	width: 0;
-	height: 0;
-	border: 12px solid transparent;
+#header.navbar-inverse .navbar-link:hover {
+	color: #ffffff;
 }
 
-.arrow-panel {
-	position: relative;
-	padding: 10px 15px;
-	background-color: #f9f9f9;
-	color: #b68571;
-	border: 1px solid #eee2d7;
-	border-radius: 6px;
+#header.navbar-inverse .btn-link {
+	color: #777777;
 }
 
-.arrow-panel h3 {
-	display: inline-block;
-	margin: 0;
+#header.navbar-inverse .btn-link:hover,#header.navbar-inverse .btn-link:focus
+	{
+	color: #ffffff;
 }
 
-.arrow-bottom:before {
-	top: -24px;
-	left: 36px;
-	border-bottom-color: #eee2d7;
+#header.navbar-inverse .btn-link[disabled]:hover,#header fieldset[disabled] .navbar-inverse .btn-link:hover,#header.navbar-inverse .btn-link[disabled]:focus,#header fieldset[disabled] .navbar-inverse .btn-link:focus
+	{
+	color: #444444;
 }
 
-.arrow-bottom:after {
-	top: -23px;
-	left: 36px;
-	border-bottom-color: #f9f9f9;
+#header.navbar-inverse .dropdown-menu>li>a {
+	font-size: 14px;
 }
 
-.main-panel .panel ul>li>a {
-	height: 23px;
-	line-height: 23px;
-	color: #5e5e5e;
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-	padding-left: 5px;
-	color: #5e5e5e;
+#header.navbar-inverse .dropdown-menu>li>a:hover {
+	background-color: #56a022;
+	color: #ffffff;
 }
 
-.main-panel .panel ul>li>a.sub-left {
-	float: left;
+#header .navbar-header .navbar-brand {
+	background: url("../img/logo/ubtob.png") no-repeat;
 	width: 195px;
+	margin: 0
 }
 
-.main-panel .panel ul>li>a:hover {
-	text-decoration: none;
-	color: #f60;
-	padding-left: 3px;
-	border-left: 2px solid #f60;
-}
-
-.main-panel .btn-block {
-	letter-spacing: 2px;
-}
-
-.main-panel .progress {
-	position: relative;
-	margin-bottom: 0;
-	height: 15px;
-	line-height: 15px;
-	top: 3px;
-	min-width: 200px;
-	background-color: #f1e05a;
+#header .dropdown:hover>.dropdown-menu {
+	margin-top: 0;
 }
-
-.main-panel .progress-bar {
-	color: #fff;
-	line-height: 15px;
+/*body*/
+.body>.left {
+	width: 194px;
+	margin-right: 15px;
 }
 
-.main-panel .progress-bar-warning {
-	background-color: #563d7c;
+.body>.right {
+	width: 960px;
 }
 
-.main-panel .progressbar-text {
-	position: absolute;
-	left: 30%;
-	top: 0;
+.user {
+	background-color: #fff;
 }
 
-.main-panel .workbench {
+.user .user-image {
 	float: left;
-	margin-left: 205px;
-}
-
-.main-panel .workbench .panel .btn-default:hover {
-	color: #ff7300;
-	background-color: #fff;
+	margin-top: 20px;
+	margin-bottom: 20px;
+	margin-left: 20px;
+	height: 76px;
+	cursor: pointer;
 }
 
-/* footer css stylesheet */
-#footer {
-	margin-top: 15px;
-	text-align: center;
-	font-family: serif;
-	font-size: 11px;
-	text-align: center;
+.user-image img {
+	border-radius: 50%;
+	border: 1px solid #ccc;
+	width: 70px;
+	height: 70px;
 }
 
-#footer li:before {
-	content: "|";
-	padding-right: 1em;
-	color: #f0f0f0;
+.user .user-name {
+	float: right;
+	width: 90px;
+	margin-top: 35px;
+	color: #333;
 }
-
-#footer li:nth-child(1):before {
-	content: "";
-	padding: 0;
+/*footer*/
+#footer {
+	color: #f1f1f1;
+	background-color: #b8b9b9;
+	padding: 20px 0;
+	font-size: 12px;
 }
 
-#footer .link-group {
-	height: 46px;
-	line-height: 46px;
-	border-top: 1px solid #c2c2c2;
-	border-bottom: 1px solid #e1e1e1;
+#footer a {
+	color: #f1f1f1;
 }
 
-#footer .link-group ul>li>a {
-	color: #666;
-	font-size: 12px;
+#footer ul {
+	margin: 0;
 }
 
-#footer .link-group ul>li>a:hover {
-	color: #f60;
+#footer .list-inline>li:not (:last-child ):after {
+	margin-left: 15px;
+	content: "|"
 }

BIN
src/main/webapp/resources/img/all/user_empty.png


BIN
src/main/webapp/resources/img/logo/ubtob.png


+ 17 - 0
src/main/webapp/resources/js/index/app.js

@@ -0,0 +1,17 @@
+define([ 'toaster', 'services' ], function() {
+	'use strict';
+	var app = angular.module('myApp', [ 'toaster', 'common.services' ]);
+	app.init = function() {
+		angular.bootstrap(document, [ 'myApp' ]);
+	};
+	app.controller('AuthCtrl', function($scope, AuthenticationService) {
+		$scope.isAuthed = AuthenticationService.isAuthed();
+		$scope.userInfo = {};
+		AuthenticationService.getAuthentication().success(function(data) {
+			$scope.userInfo = data;
+			if (data == null || !data.uu)
+				$scope.isAuthed = false;
+		});
+	});
+	return app;
+});

+ 21 - 0
src/main/webapp/resources/js/index/main.js

@@ -0,0 +1,21 @@
+require.config({
+	baseUrl : 'static',
+	paths : {
+		'app' : 'js/index',
+		'angular' : 'lib/angular/angular',
+		'ngAnimate': 'lib/angular/angular-animate.min',
+		'toaster' : 'lib/angular/angular-toaster.min',
+		'services' : 'js/common/services'
+	},
+	shim : {
+		'angular' : {
+			'exports' : 'angular'
+		},
+		'ngAnimate' : ['angular'],
+		'toaster' : ['angular', 'ngAnimate'],
+		'services': ['angular']
+	}
+});
+require([ 'app/app' ], function(app) {
+	app.init();
+});

+ 6 - 2
src/main/webapp/resources/js/signin/app.js

@@ -13,8 +13,12 @@ define([ 'toaster', 'services' ], function() {
 		$scope.login = function(user) {
 			$scope.loading = true;
 			AuthenticationService.login(user).success(function(responseText, status) {
-				if (status == 200)
-					$window.location.href = responseText;
+				if (status == 200) {
+					var url = responseText;
+					if(!url || url == '' || url.indexOf('/signin') > 0)
+						url = './';
+					$window.location.href = url;
+				}
 			}).error(function() {
 				$scope.loading = false;
 				toaster.pop('error', '登录失败', '用户名或密码错误');

+ 0 - 1
src/main/webapp/resources/js/signin/main.js

@@ -2,7 +2,6 @@ require.config({
 	baseUrl : 'static',
 	paths : {
 		'app' : 'js/signin',
-		'lib' : 'lib',
 		'angular' : 'lib/angular/angular',
 		'ngAnimate': 'lib/angular/angular-animate.min',
 		'toaster' : 'lib/angular/angular-toaster.min',