Browse Source

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

administrator 11 years ago
parent
commit
17c6b487c6

+ 3 - 1
src/main/webapp/WEB-INF/spring/webmvc.xml

@@ -9,7 +9,7 @@
 	<mvc:default-servlet-handler />
 	<mvc:default-servlet-handler />
 
 
 	<mvc:resources mapping="/static/**" location="/resources/" />
 	<mvc:resources mapping="/static/**" location="/resources/" />
-
+	
 	<context:component-scan base-package="com.uas.platform" />
 	<context:component-scan base-package="com.uas.platform" />
 
 
 	<bean
 	<bean
@@ -30,4 +30,6 @@
 	<mvc:view-controller path="/" view-name="index" />
 	<mvc:view-controller path="/" view-name="index" />
 	<mvc:view-controller path="/signin" view-name="signin" />
 	<mvc:view-controller path="/signin" view-name="signin" />
 	<mvc:view-controller path="/storage" view-name="storage" />
 	<mvc:view-controller path="/storage" view-name="storage" />
+	<mvc:view-controller path="/public" view-name="public" />
+	<mvc:view-controller path="/serve" view-name="serve" />
 </beans>
 </beans>

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

@@ -94,10 +94,10 @@
 						class="dropdown-toggle"> 客服中心 <i class="fa fa-angle-down"></i>
 						class="dropdown-toggle"> 客服中心 <i class="fa fa-angle-down"></i>
 					</a>
 					</a>
 						<ul class="dropdown-menu pull-right" role="menu">
 						<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>
+							<li><a href="serve#/new" target="_blank">新手上路</a></li>
+							<li><a href="serve#/common" target="_blank">买家帮助</a></li>
+							<li><a href="serve#/common" target="_blank">卖家帮助</a></li>
+							<li><a href="serve#/ask" target="_blank">在线咨询</a></li>
 						</ul></li>
 						</ul></li>
 					<li class="dropdown"><a href="#" role="button"
 					<li class="dropdown"><a href="#" role="button"
 						class="dropdown-toggle text-inverse"><i class="fa fa-bars"></i>
 						class="dropdown-toggle text-inverse"><i class="fa fa-bars"></i>

+ 2 - 1
src/main/webapp/WEB-INF/views/normal/public.html

@@ -13,6 +13,7 @@
 <link rel="stylesheet"
 <link rel="stylesheet"
 	href="static/lib/fontawesome/css/font-awesome.min.css" />
 	href="static/lib/fontawesome/css/font-awesome.min.css" />
 <link rel="stylesheet" href="static/lib/angular/toaster.css" />
 <link rel="stylesheet" href="static/lib/angular/toaster.css" />
+<link rel="stylesheet" href="static/css/public.css" />
 <base target="_blank" />
 <base target="_blank" />
 </head>
 </head>
 <body>
 <body>
@@ -31,7 +32,7 @@
 	</nav>
 	</nav>
 	<!-- header End -->
 	<!-- header End -->
 	<!-- main Start -->
 	<!-- main Start -->
-	<div id="banner"></div>
+	<div ui-view></div>
 	<!-- main End -->
 	<!-- main End -->
 	<div class="navbar navbar-fixed-bottom" id="footer">
 	<div class="navbar navbar-fixed-bottom" id="footer">
 		<!-- footer inner -->
 		<!-- footer inner -->

+ 172 - 0
src/main/webapp/WEB-INF/views/normal/serve.html

@@ -0,0 +1,172 @@
+<!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>优软商务平台</title>
+<meta name="keywords"
+	content="优软商务平台,优软B2B平台,商务平台,B2B平台,B2B,电子商务,ERP,UAS,UBTOB.COM,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/angular/toaster.css" />
+<link rel="stylesheet" href="static/css/serve.css" />
+</head>
+<body ng-controller="AuthCtrl">
+	<!-- top Start -->
+	<header class="navbar navbar-static-top" id="top">
+		<div class="container">
+			<nav class="hidden-xs">
+				<ul class="nav navbar-nav">
+					<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="#/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>
+					<li class="dropdown"><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="#/sale/todo/notice"
+						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>
+									<a href="#/sale/todo/notice"
+										class="pull-right btn btn-warning btn-sm">客户送货送货提醒</a>
+								</div>
+							</div>
+						</div></li>
+					<li><a href="" ng-click="addFavorite()" 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 text-right"
+							style="padding: 10px 15px; width: 560px;">
+							<div class="row pills text-right">
+								<div class="col-xs-3 ">
+									<h4>账号管理</h4>
+									<ul class="nav nav-pills">
+										<li><a href="#/account/enterprise" title="企业信息">企业信息</a></li>
+										<li><a href="#/account/user" title="用户信息">用户信息</a></li>
+										<li><a href="#/account/log" title="日志记录">日志记录</a></li>
+										<li><a href="#/account/resource" title="系统资源">系统资源</a></li>
+										<li><a href="#/account/authority" title="权限管理">权限管理</a></li>
+										<li><a href="#/account/role" title="角色管理">角色管理</a></li>
+									</ul>
+								</div>
+								<div class="col-xs-3">
+									<h4>销售管理</h4>
+									<ul class="nav nav-pills">
+										<li><a href="#" 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/accept" title="客户验收单">客户验收单</a></li>
+										<li><a href="#/sale/returns" title="客户验退单">客户验退单</a></li>
+										<li><a href="#/sale/sample" title="客户打样申请">客户打样申请</a></li>
+										<li><a href="#/sale/approval" title="客户认定单">客户认定单</a></li>
+									</ul>
+								</div>
+								<div class="col-xs-3">
+									<h4>品质管理</h4>
+									<ul class="nav nav-pills">
+										<li><a href="#/qc/badIn" title="客户不良品入库">客户不良品入库</a></li>
+										<li><a href="#/qc/badOut" title="客户不良品出库">客户不良品出库</a></li>
+										<li><a href="#/qc/MRB" title="客户MRB单">客户MRB单</a></li>
+									</ul>
+								</div>
+								<div class="col-xs-3">
+									<h4>财务对账</h4>
+									<ul class="nav nav-pills">
+										<li><a href="#/fa/apBill" title="客户应付发票">客户应付发票</a></li>
+									</ul>
+								</div>
+							</div>
+						</div></li>
+				</ul>
+			</nav>
+		</div>
+	</header>
+	<!-- top End -->
+	<!-- header Start -->
+	<div class="navbar navbar-inverse" id="header" ng-controller="MyCtrl">
+		<div class="container">
+			<div class="navbar-header">
+				<a href="#" class="navbar-brand"></a>
+			</div>
+			<nav class="navbar-collapse">
+				<ul class="nav navbar-nav">
+					<li ng-class="{'active': routeState == 'home'}"><a
+						ui-sref="home">自助首页</a></li>
+					<li ng-class="{'active': routeState == 'question'}"><a
+						ui-sref="question">常见问题</a></li>
+					<li class="dropdown" ng-class="{'active': routeState == 'ask'}"><a
+						ui-sref="ask">联系客服</a></li>
+					<li ng-class="{'active': routeState == 'sale'}"><a ui-sref="sale">卖家专区</a></li>
+					<li ng-class="{'active': routeState == 'new'}"><a ui-sref="new">新手入门</a></li>
+				</ul>
+			</nav>
+		</div>
+	</div>
+	<!-- header End -->
+	<!-- body Start -->
+	<div class="body">
+		<div ui-view></div>
+	</div>
+	<!-- body End -->
+	<!-- footer Start -->
+	<div class="navbar navbar-fixed-bottom" id="footer">
+		<!-- footer inner -->
+		<div class="container">
+			<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>© 2014-2015 深圳市优软科技有限公司. 版权所有.</li>
+				</ul>
+			</div>
+		</div>
+	</div>
+	<!-- footer End -->
+	<!-- 消息提示框  Start-->
+	<toaster-container
+		toaster-options="{'position-class': 'toast-top-center'}"></toaster-container>
+	<script type="text/javascript" src="static/lib/require.js"
+		data-main="static/js/serve/main.js"></script>
+</body>
+</html>

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

@@ -83,8 +83,8 @@
 		<div class="container" ng-controller="NoticeCtrl">
 		<div class="container" ng-controller="NoticeCtrl">
 			<ul id="note" class="list-unstyled list-inline">
 			<ul id="note" class="list-unstyled list-inline">
 				<li>系统公告</li>
 				<li>系统公告</li>
-				<li ng-repeat="notice in notices"><i>●</i><a href="info/notice/{{notice.id}}" ng-bind="notice.title"></a><span class="new" ng-show="$index==0"></span></li>
-				<li class="extra"><a href="info/notice">查看更多<i
+				<li ng-repeat="notice in notices"><i>●</i><a href="public#/notice/{{notice.id}}" ng-bind="notice.title"></a><span class="new" ng-show="$index==0"></span></li>
+				<li class="extra"><a href="public#/notice">查看更多<i
 						class="fa fa-angle-right" style="margin-left: 3px;"></i></a></li>
 						class="fa fa-angle-right" style="margin-left: 3px;"></i></a></li>
 			</ul>
 			</ul>
 		</div>
 		</div>
@@ -95,12 +95,12 @@
 		<div class="container">
 		<div class="container">
 			<div class="link-group">
 			<div class="link-group">
 				<ul class="list-inline text-center">
 				<ul class="list-inline text-center">
-					<li><a href="#">关于优软</a></li>
-					<li><a href="#">联系我们</a></li>
+					<li><a href="http://www.usoftchina.com">关于优软</a></li>
+					<li><a href="http://www.usoftchina.com">联系我们</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="serve">客服中心</a></li>
+					<li><a href="http://www.usoftchina.com">联系邮箱</a></li>
+					<li><a href="http://www.usoftchina.com">服务条款 </a></li>
 					<li><a href="#">投诉反馈 </a></li>
 					<li><a href="#">投诉反馈 </a></li>
 					<li>© 2014-2015 深圳市优软科技有限公司. 版权所有.</li>
 					<li>© 2014-2015 深圳市优软科技有限公司. 版权所有.</li>
 				</ul>
 				</ul>

+ 188 - 0
src/main/webapp/resources/css/public.css

@@ -0,0 +1,188 @@
+body {
+	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;
+}
+
+h1,h2,h3 {
+	font-size: 20px;
+	font-weight: 400;
+	font-style: normal;
+}
+
+.has-feedback-left {
+	position: relative;
+}
+
+.form-control-feedback-left {
+	position: absolute;
+	top: 0;
+	left: 0;
+	z-index: 2;
+	display: block;
+	width: 30px;
+	height: 34px;
+	line-height: 2.3;
+	text-align: center;
+	pointer-events: none;
+	color: #bbb;
+	font-size: 16px;
+}
+
+.has-feedback-left>.form-control {
+	padding-left: 30px;
+}
+
+.btn-inverse {
+	color: #fff;
+	background-color: #44b549;
+	background-image: -moz-linear-gradient(top, #44b549 0, #44b549 100%);
+	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#44b549),
+		to(#44b549));
+	background-image: -webkit-linear-gradient(top, #44b549 0, #44b549 100%);
+	background-image: -o-linear-gradient(top, #44b549 0, #44b549 100%);
+	background-image: linear-gradient(to bottom, #44b549 0, #44b549 100%);
+	border-color: #44b549;
+	width: 120px;
+}
+
+.btn-inverse:hover,.btn-inverse:focus,.btn-inverse:active {
+	background-color: #2f9833;
+	background-image: -moz-linear-gradient(top, #2f9833 0, #2f9833 100%);
+	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#2f9833),
+		to(#2f9833));
+	background-image: -webkit-linear-gradient(top, #2f9833 0, #2f9833 100%);
+	background-image: -o-linear-gradient(top, #2f9833 0, #2f9833 100%);
+	background-image: linear-gradient(to bottom, #2f9833 0, #2f9833 100%);
+	border-color: #2f9833;
+	color: #fff;
+}
+
+.form-control {
+	border-color: #e0e0e0;
+}
+
+.loading {
+	display: none;
+	position: absolute;
+	width: 100%;
+	height: 100%;
+	bottom: 0;
+	left: 0;
+}
+
+.loading.in {
+	display: block;
+}
+
+.loading.in>i {
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	margin: -33px 0 0 -33px;
+	background: url("../img/all/loading.gif") no-repeat center center;
+	width: 66px;
+	height: 66px;
+}
+/*header*/
+#top {
+	background: #fff;
+	border-top: 4px solid #44b549;
+	border-bottom: 1px solid #d9dadc;
+}
+
+#top .navbar-header .navbar-brand {
+	height: 50px;
+	line-height: 50px;
+}
+
+#top .navbar-header .title {
+	background: url("../img/logo/uas_gray.png") no-repeat center center;
+	width: 87px;
+	height: 50px;
+}
+
+#top .navbar-header b {
+	display: block;
+	width: 1px;
+	height: 18px;
+	margin: 18px 10px 0 11px;
+	z-index: 100;
+	float: left;
+	background: #ccc;
+}
+
+.navbar-header span {
+	float: left;
+	height: 50px;
+	line-height: 50px;
+	font-size: 20px;
+	color: #666;
+}
+/*body*/
+.block {
+	background-color: #fff;
+	width: 100%;
+	position: relative;
+}
+
+.body {
+	width: 1170px;
+	margin: 0 auto;
+	padding: 0 15px;
+}
+
+.body:before,.body:after {
+	content: " ";
+  	display: table;
+  	clear: both;
+}
+
+.notice-container {
+	padding: 36px 0 88px;
+}
+
+.notice-container .table a {
+	color: #222;
+}
+
+.notice-container .table a:hover {
+	text-decoration: none;
+	color: #459ae9;
+}
+
+.notice-container .doc {
+	padding: 90px 75px;
+}
+
+.notice-container .doc .title {
+	padding-bottom: 42px;
+  	text-align: center;
+  	font-size: 18px;
+}
+
+.notice-container .doc .sign {
+	padding-top: 28px;
+  	text-align: right;
+}
+
+/*footer*/
+#footer {
+	color: #f1f1f1;
+	background-color: #b8b9b9;
+	padding: 20px 0;
+	font-size: 12px;
+}
+#footer a {
+	color: #f1f1f1;
+}
+#footer ul {
+	margin: 0;
+}
+#footer .list-inline>li:not(:last-child):after {
+	margin-left: 15px;
+	content: "|"
+}

+ 661 - 0
src/main/webapp/resources/css/serve.css

@@ -0,0 +1,661 @@
+body {
+	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;
+}
+
+h1,h2,h3 {
+	font-size: 20px;
+	font-weight: 400;
+	font-style: normal;
+}
+
+a {
+	color: #333;
+	text-decoration: none;
+}
+
+.block {
+	background-color: #fff;
+	width: 100%;
+	position: relative;
+}
+
+.f12 {
+	font-size: 12px !important;
+}
+
+.f14 {
+	font-size: 14px !important;
+}
+
+.f16 {
+	font-size: 16px !important;
+}
+
+[ng-click] {
+	cursor: pointer;
+}
+
+.br-r {
+	border-right: 1px solid #e6e6e6;
+}
+
+.br-l {
+	border-left: 1px solid #e6e6e6;
+}
+
+.br-b {
+	border-bottom: 1px solid #e6e6e6;
+}
+/*inverse*/
+.text-default {
+	color: #56a022;
+}
+
+.text-inverse {
+	color: #f40 !important
+}
+
+.text-muted {
+	color: #888 !important;
+}
+
+.text-light {
+	color: #666;
+}
+
+.text-simple {
+	color: #aaa;
+}
+
+.text-num {
+	font-style: normal;
+	font-family: verdana;
+}
+
+.text-small {
+	font-size: 10px;
+	font-family: "microsoft yahei";
+	-webkit-transform: scale(0.83);
+	-o-transform: scale(0.83);
+	transform: scale(0.83);
+}
+
+.text-bold {
+	font-weight: 700;
+}
+
+.text-border-success {
+	border: 1px solid #f40;
+	color: #f40;
+	background-color: #fff;
+	padding: 2px 4px;
+}
+
+.text-trans {
+	position: absolute;
+	top: 5px;
+	right: 5px;
+	background-color: #fff;
+	border: 1px solid;
+	padding: 3px 14px;
+	font-size: 16px;
+	font-family: "LiShu";
+	border-radius: 10px;
+	-moz-transform: rotate(-10deg);
+	-webkit-transform: rotate(-10deg);
+	-o-transform: rotate(-10deg);
+	transform: rotate(-10deg);
+	border-radius: 10px;
+	opacity: 0.7;
+	white-space: nowrap;
+}
+
+.text-trans.success {
+	color: #ffb433;
+	border-color: #ffb433;
+}
+
+.text-trans.error {
+	color: #d44950;
+	border-color: #d44950;
+}
+
+.text-trans.warning {
+	color: #7f64b5;
+	border-color: #7f64b5;
+}
+
+.form-control {
+	border-color: #e1e1e1;
+}
+
+.btn-default {
+	border-color: #dcdcdc;
+}
+
+.btn-info.btn-line {
+	background-color: #fff;
+	color: #56a022;
+	border-color: #56a022;
+}
+
+.btn-info.btn-line:hover{
+	background-color: #56a022;
+  	color: #fff;
+  	border-color: #56a022;
+}
+
+/*dropdown*/
+.dropdown-menu {
+	min-width: 100%;
+}
+
+.dropdown>.dropdown-toggle {
+	border-style: solid;
+	border-width: 0 1px;
+	border-color: transparent;
+}
+
+.dropdown:hover>.dropdown-toggle {
+	position: relative;
+	background-color: #ffffff;
+	border: 1px solid #eee;
+	border-top: 0;
+	border-bottom: 0;
+	z-index: 1001;
+}
+
+.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-submenu {
+	position: relative;
+}
+
+.dropdown-submenu>.dropdown-menu {
+	top: 0;
+	left: 100%;
+	margin-top: 0;
+	-webkit-border-radius: 0 6px 6px 6px;
+	-moz-border-radius: 0 6px 6px 6px;
+	border-radius: 0 6px 6px 6px;
+}
+
+.dropdown-submenu:hover>.dropdown-toggle {
+	position: relative;
+	background-color: #ffffff;
+	border-color: transparent;
+	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.pull-left {
+	float: none;
+}
+
+.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;
+}
+
+.icon-left {
+	margin-right: 5px;
+}
+/* top css stylesheet*/
+#top {
+	background-color: #f5f5f5;
+	height: 35px;
+	line-height: 35px;
+	z-index: 5;
+	font: 12px/23px Tahoma, Arial, "\5B8B\4F53", sans-serif;
+	color: #6c6c6c;
+}
+
+#top.navbar {
+	min-height: 35px;
+	border-bottom: 1px solid #eee;
+}
+
+#top ul>li>a {
+	color: #6c6c6c;
+}
+
+#top .navbar-nav>li>a,#top .navbar-nav>li.brand {
+	padding-top: 0;
+	padding-bottom: 0;
+	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 .dropdown .fa-angle-down {
+	transition: transform .2s ease-in 0s;
+	-webkit-transition: -webkit-transform .2s ease-in 0s;
+}
+
+#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: 100%;
+	font-size: 12px;
+}
+
+#top .dropdown-menu ul>li>h4 {
+	font-size: 100%;
+	font-weight: 700;
+	color: #404040;
+}
+
+#top .dropdown-menu .nav-pills>li+li {
+	margin-left: 0;
+}
+
+#top .dropdown-menu .nav-pills>li>a {
+	padding: 5px 10px;
+}
+
+#top .dropdown-menu .pills>div {
+	border-right: 1px solid #eee;
+	padding: 5px 15px;
+}
+
+#top .dropdown-menu .pills>div:last-child {
+	border-right: none;
+}
+
+#top .dropdown-menu .pills ul>li {
+	padding: 2px;
+}
+
+#top .dropdown-menu .pills ul>li>a {
+	color: #3c3c3c;
+}
+
+#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;
+}
+
+#top .dropdown-menu .pills>div:nth-child(1) h4 {
+	color: #f50;
+}
+
+#top .dropdown-menu .pills>div:nth-child(2) h4 {
+	color: #a0b959;
+}
+
+#top .dropdown-menu .pills>div:nth-child(3) h4 {
+	color: #df61ab;
+}
+
+#top .dropdown-menu .pills>div:nth-child(4) h4 {
+	color: #52a0e5;
+}
+
+#top .dropdown-menu .pills>div:nth-child(5) h4 {
+	color: #52a015;
+}
+
+#top .dropdown-menu .pills>div:nth-child(6) h4 {
+	color: #b68571;
+}
+
+#top .dropdown-menu .pills ul>li>a:hover {
+	color: #fff;
+}
+
+#top .dropdown-menu .pills>div:nth-child(1) ul>li>a:hover {
+	background-color: #f50
+}
+
+#top .dropdown-menu .pills>div:nth-child(2) ul>li>a:hover {
+	background-color: #a0b959
+}
+
+#top .dropdown-menu .pills>div:nth-child(3) ul>li>a:hover {
+	background-color: #df61ab
+}
+
+#top .dropdown-menu .pills>div:nth-child(4) ul>li>a:hover {
+	background-color: #52a0e5
+}
+
+#top .dropdown-menu .pills>div:nth-child(5) ul>li>a:hover {
+	background-color: #52a015
+}
+
+#top .dropdown-menu .pills>div:nth-child(6) ul>li>a:hover {
+	background-color: #b68571
+}
+/* header css stylesheet*/
+#header {
+	color: #ffffff;
+	z-index: 4;
+}
+
+#header a {
+	font-family: "\5fae\8f6f\96c5\9ed1", sans-serif;
+}
+
+#header .navbar-nav>li>a {
+	color: #ffffff;
+	font-size: 16px;
+	font-weight: 500;
+}
+
+#header.navbar-inverse {
+	background-color: #56a022;
+	border: none;
+}
+
+#header.navbar-inverse .navbar-brand {
+	color: #ffffff;
+}
+
+#header.navbar-inverse .navbar-brand:hover,#header.navbar-inverse .navbar-brand:focus
+	{
+	color: #ffffff;
+	background-color: transparent;
+}
+
+#header.navbar-inverse .navbar-text {
+	color: #969696;
+}
+
+#header.navbar-inverse .navbar-nav>li>a {
+	color: #ffffff;
+	padding: 15px 20px;
+}
+
+#header.navbar-inverse .navbar-nav>li>a:hover,#header.navbar-inverse .navbar-nav>li>a:focus
+	{
+	color: #ffffff;
+	background-color: #4b8b1e;
+}
+
+#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;
+}
+
+#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;
+}
+
+#header.navbar-inverse .navbar-toggle {
+	border-color: #333333;
+}
+
+#header.navbar-inverse .navbar-toggle:hover,#header.navbar-inverse .navbar-toggle:focus
+	{
+	background-color: #333333;
+}
+
+#header.navbar-inverse .navbar-toggle .icon-bar {
+	background-color: #ffffff;
+}
+
+#header.navbar-inverse .navbar-collapse,#header.navbar-inverse .navbar-form
+	{
+	border-color: #101010;
+}
+
+#header.navbar-inverse .navbar-nav>.open>a,#header.navbar-inverse .navbar-nav>.open>a:hover,#header.navbar-inverse .navbar-nav>.open>a:focus
+	{
+	background-color: #56a022;
+	color: #ffffff;
+}
+
+#header.navbar-inverse .navbar-link {
+	color: #777777;
+}
+
+#header.navbar-inverse .navbar-link:hover {
+	color: #ffffff;
+}
+
+#header.navbar-inverse .btn-link {
+	color: #777777;
+}
+
+#header.navbar-inverse .btn-link:hover,#header.navbar-inverse .btn-link:focus
+	{
+	color: #ffffff;
+}
+
+#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;
+}
+
+#header.navbar-inverse .dropdown-menu>li>a {
+	font-size: 14px;
+}
+
+#header.navbar-inverse .dropdown-menu>li>a:hover {
+	background-color: #56a022;
+	color: #ffffff;
+}
+
+#header .navbar-header .navbar-brand {
+	background: url("../img/logo/ubtob.png") no-repeat;
+	width: 195px;
+	margin: 0
+}
+
+#header .dropdown:hover>.dropdown-menu {
+	margin-top: 0;
+}
+/*body*/
+.block {
+	background-color: #fff;
+	width: 100%;
+	position: relative;
+}
+
+.body {
+	width: 1170px;
+	margin: 0 auto;
+	padding: 0 15px;
+	font-size: 12px;
+}
+
+.body:before,.body:after {
+	content: " ";
+  	display: table;
+  	clear: both;
+}
+
+.help-container {
+	padding: 15px 10px;
+	margin-top: 15px;
+}
+
+.icon-circle {
+	width: 60px;
+	height: 60px;
+	line-height: 60px;
+	text-align: center;
+	margin-top: 5px auto;
+	color: #56a022;
+	font-size: 32px;
+	border-radius: 50%;
+	background-color: #f3f3f4;
+	display: block;
+}
+
+.icon-circle:hover {
+	color: #fff;
+	background-color: #56a022;
+	cursor: pointer;
+}
+
+.headerline {
+  	font-size: 24px;
+  	font-family: Microsoft YaHei,SimHei,Verdana;
+  	font-weight: 500;
+  	line-height: 22px;
+  	margin: 25px 0;
+  	clear: both;
+  	zoom: 1;
+  	border-top: 1px solid #eee;
+  	position: relative;
+  	font-size: 18px;
+}
+
+.headerline .content {
+	position: absolute;
+	top: -12px;
+	left: 0;
+	line-height: 24px;
+  	padding: 0 15px 0 10px;
+  	background: #fff;
+  	z-index: 2;
+}
+
+.headerline .end {
+	position: absolute;
+	top: -12px;
+	right: 0;
+	line-height: 24px;
+  	padding-left: 15px;
+  	background: #fff;
+  	z-index: 2;
+}
+
+.question-list>li {
+	clear: both;
+	display: block;
+	height: 28px;
+	line-height: 28px;
+	padding: 8px 10px 8px 15px;
+	position: relative;
+}
+
+.self-list {
+	margin: 0 auto;
+}
+
+.self-list>li {
+	float: left;
+  	margin-right: 47px;
+  	padding-bottom: 10px;
+  	padding-top: 31px;
+  	text-align: center;
+}
+
+.self-list>li .title {
+	display: block;
+	padding-top: 10px;
+}
+
+.self-list>li a {
+	text-decoration: none;
+	display: block;
+	text-align: center;
+}
+
+.question-list>li:before {
+	position: absolute;
+	left: 0;
+	top: 5px;
+	content: "."
+}
+/*footer*/
+#footer {
+	color: #f1f1f1;
+	background-color: #b8b9b9;
+	margin-top: 20px;
+	padding: 20px 0;
+	font-size: 12px;
+}
+
+#footer a {
+	color: #f1f1f1;
+}
+
+#footer ul {
+	margin: 0;
+}
+
+#footer .list-inline>li:not(:last-child):after {
+	margin-left: 15px;
+	content: "|"
+}
+/*loading*/
+.loading {
+	display: none;
+	position: absolute;
+	width: 100%;
+	height: 300px;
+	top: 0;
+	left: 0;
+}
+
+.loading.in {
+	display: block;
+	z-index: 99999;
+}
+
+.loading.in>i {
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	margin: -33px 0 0 -33px;
+	background: url("../img/all/loading.gif") no-repeat center center;
+	width: 66px;
+	height: 66px;
+}

+ 1 - 1
src/main/webapp/resources/js/common/services.js

@@ -144,7 +144,7 @@ define([ 'angular', 'toaster' ], function(angular) {
 			getNotice : function(count, success) {
 			getNotice : function(count, success) {
 				var request = $http.get(rootPath + '/public/notice?page=1&count='+count);
 				var request = $http.get(rootPath + '/public/notice?page=1&count='+count);
 				request.success(function(data){
 				request.success(function(data){
-					success.call(null, data);
+					success.call(null, data.content);
 				});
 				});
 			}
 			}
 		};
 		};

+ 45 - 2
src/main/webapp/resources/js/public/app.js

@@ -1,8 +1,51 @@
-define([ 'toaster', 'ngTable', 'common/services', 'ui.router', 'ui.bootstrap'], function() {
+define([ 'toaster', 'ngTable', 'common/services', 'service/Info', 'ui.router', 'ui.bootstrap', 'ngSanitize'], function() {
 	'use strict';
 	'use strict';
-	var app = angular.module('myApp', [ 'toaster', 'ngTable', 'ui.router', 'common.services', 'ui.bootstrap']);
+	var app = angular.module('myApp', [ 'toaster', 'ngTable', 'ui.router', 'common.services', 'ui.bootstrap', 'InfoServices', 'ngSanitize']);
 	app.init = function() {
 	app.init = function() {
 		angular.bootstrap(document, [ 'myApp' ]);
 		angular.bootstrap(document, [ 'myApp' ]);
 	};
 	};
+	app.config(function($stateProvider, $urlRouterProvider) {
+		$urlRouterProvider.otherwise('/notice');
+		$stateProvider.state('notice', {
+			url : "/notice",
+			templateUrl : "static/tpl/public/info/notice.html",
+			controller: 'NoticeCtrl'
+		}).state('notice_detail', {
+			url : "/notice/:id",
+			templateUrl : "static/tpl/public/info/notice_detail.html",
+			controller: 'NoticeDetailCtrl'
+		}).state('serve', {
+			url : "/serve",
+			templateUrl : "static/tpl/public/info/serve.html",
+			controller: 'ServeCtrl'
+		});
+	});
+	app.controller('NoticeCtrl', function($scope, ngTableParams, Notice, BaseService){
+		$scope.tableParams = new ngTableParams({
+			page : 1,
+			count : 20,
+			sorting: {
+                date: 'desc'
+            }
+		}, {
+			total : 0, 
+			counts: [20, 30, 50, 100],
+			getData : function($defer, params) {
+				$scope.loading = true;
+				Notice.get(BaseService.parseParams(params.url()), function(page){
+					$scope.loading = false;
+					if(page) {
+						params.total(page.totalElements);
+						$defer.resolve(page.content);
+					}
+				});
+			}
+		});
+	});
+	app.controller('NoticeDetailCtrl', function($scope, Notice, $stateParams){
+		Notice.get({id: $stateParams.id}, function(data){
+			$scope.noticeBody = data;
+		});
+	});
 	return app;
 	return app;
 });
 });

+ 4 - 2
src/main/webapp/resources/js/public/main.js

@@ -1,7 +1,7 @@
 require.config({
 require.config({
 	baseUrl : 'static',
 	baseUrl : 'static',
 	paths : {
 	paths : {
-		'app' : 'js/index',
+		'app' : 'js/public',
 		'angular' : 'lib/angular/angular',
 		'angular' : 'lib/angular/angular',
 		'ngAnimate': 'lib/angular/angular-animate.min',
 		'ngAnimate': 'lib/angular/angular-animate.min',
 		'toaster' : 'lib/angular/angular-toaster.min',
 		'toaster' : 'lib/angular/angular-toaster.min',
@@ -10,7 +10,8 @@ require.config({
 		'ui.router' : 'lib/angular/angular-ui-router.min',
 		'ui.router' : 'lib/angular/angular-ui-router.min',
 		'ui.bootstrap' : 'lib/angular/ui-bootstrap-tpls',
 		'ui.bootstrap' : 'lib/angular/ui-bootstrap-tpls',
 		'ngTable' : 'lib/angular/ng-table',
 		'ngTable' : 'lib/angular/ng-table',
-		'ngResource' : 'lib/angular/angular-resource.min'
+		'ngResource' : 'lib/angular/angular-resource.min',
+		'ngSanitize': 'lib/angular/angular-sanitize.min'
 	},
 	},
 	shim : {
 	shim : {
 		'angular' : {
 		'angular' : {
@@ -18,6 +19,7 @@ require.config({
 		},
 		},
 		'ngAnimate' : ['angular'],
 		'ngAnimate' : ['angular'],
 		'ngResource' : ['angular'],
 		'ngResource' : ['angular'],
+		'ngSanitize' : ['angular'],
 		'toaster' : ['angular', 'ngAnimate'],
 		'toaster' : ['angular', 'ngAnimate'],
 		'ui.router' : ['angular'],
 		'ui.router' : ['angular'],
 		'ui.bootstrap' : [ 'angular' ],
 		'ui.bootstrap' : [ 'angular' ],

+ 6 - 0
src/main/webapp/resources/js/public/services/Info.js

@@ -0,0 +1,6 @@
+define([ 'ngResource' ], function() {
+	angular.module('InfoServices', [ 'ngResource' ]).factory('Notice',
+			function($resource) {
+				return $resource('public/notice/:id', {});
+			});
+});

+ 63 - 0
src/main/webapp/resources/js/serve/app.js

@@ -0,0 +1,63 @@
+define([ 'toaster', 'ngTable', 'common/services', 'ui.router', 'ui.bootstrap',], function() {
+	'use strict';
+	var app = angular.module('myApp', [ 'toaster', 'ngTable', 'ui.router', 'common.services', 'ui.bootstrap']);
+	app.init = function() {
+		angular.bootstrap(document, [ 'myApp' ]);
+	};
+	app.config(function($stateProvider, $urlRouterProvider) {
+		$urlRouterProvider.otherwise('/index');
+		$stateProvider.state('index', {
+			url : "",
+			templateUrl : "static/tpl/serve/home.html",
+			controller: 'IndexCtrl'
+		}).state('home', {
+			url : "/",
+			templateUrl : "static/tpl/serve/home.html",
+			controller: 'IndexCtrl'
+		}).state('question', {
+			url : "/question",
+			templateUrl : "static/tpl/serve/question.html",
+			controller: 'CommonCtrl'
+		}).state('ask', {
+			url : "/ask",
+			templateUrl : "static/tpl/serve/ask.html",
+			controller: 'AskCtrl'
+		}).state('sale', {
+			url : "/sale",
+			templateUrl : "static/tpl/serve/sale.html",
+			controller: 'SaleCtrl'
+		}).state('new', {
+			url : "/new",
+			templateUrl : "static/tpl/serve/new.html",
+			controller: 'NewCtrl'
+		});
+	});
+	app.controller('MyCtrl', function($scope, $rootScope) {
+		$rootScope.$on('$locationChangeSuccess', function(evt, newUrl) {
+			var routeState = newUrl.substr(newUrl.indexOf('#/') + 2);
+			if (routeState.indexOf('/') > -1)
+				routeState = routeState.substring(0, routeState.indexOf('/'));
+			if (routeState.indexOf('.') > -1)
+				routeState = routeState.substring(0, routeState.indexOf('.'));
+			$scope.routeState = routeState || 'home';
+		});
+	});
+	app.controller('AuthCtrl', function($scope, $window, AuthenticationService) {
+		$scope.isAuthed = AuthenticationService.isAuthed();
+		$scope.userInfo = {};
+		AuthenticationService.getAuthentication().success(function(data) {
+			$scope.userInfo = data;
+			if (data == null || !data.uu)
+				$scope.isAuthed = false;
+		});
+		$scope.logout = function() {
+			AuthenticationService.logout().success(function() {
+				$window.location.reload();
+			});
+		};
+	});
+	app.controller('IndexCtrl', function($scope){
+		
+	});
+	return app;
+});

+ 32 - 0
src/main/webapp/resources/js/serve/main.js

@@ -0,0 +1,32 @@
+require.config({
+	baseUrl : 'static',
+	paths : {
+		'app' : 'js/serve',
+		'angular' : 'lib/angular/angular',
+		'ngAnimate': 'lib/angular/angular-animate.min',
+		'toaster' : 'lib/angular/angular-toaster.min',
+		'common' : 'js/common',
+		'service' : 'js/serve/services',
+		'ui.router' : 'lib/angular/angular-ui-router.min',
+		'ui.bootstrap' : 'lib/angular/ui-bootstrap-tpls',
+		'ngTable' : 'lib/angular/ng-table',
+		'ngResource' : 'lib/angular/angular-resource.min'
+	},
+	shim : {
+		'angular' : {
+			'exports' : 'angular'
+		},
+		'ngAnimate' : ['angular'],
+		'ngResource' : ['angular'],
+		'toaster' : ['angular', 'ngAnimate'],
+		'ui.router' : ['angular'],
+		'ui.bootstrap' : [ 'angular' ],
+		'ngTable' : {
+			'exports' : 'ngTable',
+			'deps' : [ 'angular' ]
+		}
+	}
+});
+require([ 'app/app' ], function(app) {
+	app.init();
+});

+ 4 - 0
src/main/webapp/resources/lib/angular/angular-sanitize.min.js.map

@@ -0,0 +1,4 @@
+{
+"version":3,
+"file":"angular-sanitize.min.js"
+}

+ 5 - 5
src/main/webapp/resources/tpl/index/home/right.html

@@ -73,7 +73,7 @@
 		</div>
 		</div>
 		<div class="pane-body">
 		<div class="pane-body">
 			<ul class="list-unstyled detail">
 			<ul class="list-unstyled detail">
-				<li ng-repeat="notice in notices"><a href="info/notice/{{notice.id}}" class="text-light" ng-bind="notice.title"></a></li>
+				<li ng-repeat="notice in notices"><a href="public#/notice/{{notice.id}}" class="text-light" ng-bind="::notice.title" target="_blank"></a></li>
 			</ul>
 			</ul>
 		</div>
 		</div>
 	</div>
 	</div>
@@ -91,15 +91,15 @@
 				</div>
 				</div>
 			</div>
 			</div>
 			<ul class="list-unstyled list-inline" style="margin-bottom: 20px;">
 			<ul class="list-unstyled list-inline" style="margin-bottom: 20px;">
-				<li><a href="#" class="text-muted">安全保障</a></li>
+				<li><a href="serve" class="text-muted">安全保障</a></li>
 				<li><a href="#" class="text-muted">开通SAAS服务</a></li>
 				<li><a href="#" class="text-muted">开通SAAS服务</a></li>
 			</ul>
 			</ul>
 			<ul class="list-unstyled f14 detail">
 			<ul class="list-unstyled f14 detail">
-				<li><a href="#" class="text-light"><i
+				<li><a href="serve#/new" class="text-light"><i
 						class="fa fa-star fa-fw icon-left"></i>新手入门</a></li>
 						class="fa fa-star fa-fw icon-left"></i>新手入门</a></li>
-				<li><a href="#" class="text-light"><i
+				<li><a href="serve#new" class="text-light"><i
 						class="fa fa-hand-o-right fa-fw icon-left"></i>投诉举报</a></li>
 						class="fa fa-hand-o-right fa-fw icon-left"></i>投诉举报</a></li>
-				<li><a href="#" class="text-light"><i
+				<li><a href="serve" class="text-light"><i
 						class="fa fa-headphones fa-fw icon-left"></i>我的问题反馈</a></li>
 						class="fa fa-headphones fa-fw icon-left"></i>我的问题反馈</a></li>
 			</ul>
 			</ul>
 		</div>
 		</div>

+ 16 - 0
src/main/webapp/resources/tpl/public/info/notice.html

@@ -0,0 +1,16 @@
+<div class="body notice-container">
+	<div class="panel panel-default">
+		<div class="panel-heading">
+			<h3 class="panel-title">系统公告</h3>
+		</div>
+		<div class="panel-body">
+			<table class="table table-default table-striped table-hover"
+				ng-table="tableParams">
+				<tr ng-repeat="notice in $data track by notice.id">
+					<td><a ui-sref="notice_detail({id:notice.id})" ng-bind="::notice.title" target="_blank"></a></td>
+					<td class="text-center text-muted" ng-bind="::notice.date | date:'yyyy-MM-dd'" width="100"></td>
+				</tr>
+			</table>
+		</div>
+	</div>
+</div>

+ 7 - 0
src/main/webapp/resources/tpl/public/info/notice_detail.html

@@ -0,0 +1,7 @@
+<div class="body notice-container">
+	<div class="block doc">
+		<div class="title" ng-bind="::noticeBody.notice.title"></div>
+		<div class="content" ng-bind-html="::noticeBody.text"></div>
+		<div class="sign">商务平台团队<br><span ng-bind="::noticeBody.notice.date | date:'yyyy年MM月dd'"></span></div>
+	</div>
+</div>

+ 44 - 0
src/main/webapp/resources/tpl/serve/home.html

@@ -0,0 +1,44 @@
+<div class="block help-container">
+	<div class="row">
+		<div class="col-xs-8">
+			<div class="headerline">
+				<div class="content">热门自助服务</div>
+				<div class="end">
+					<a class="btn btn-sm btn-default" ng-click="">更多</a>
+				</div>
+			</div>
+			<ul class="list-unstyled list-inline self-list">
+				<li><a href=""> <span class="icon-circle"> <i
+							class="fa fa-search"></i>
+					</span> <span class="title"> 注册进度查询 </span>
+				</a></li>
+				<li><a href=""> <span class="icon-circle"> <i
+							class="fa fa-key"></i>
+					</span> <span class="title"> 找回密码 </span></a></li>
+				<li><a href=""> <span class="icon-circle"> <i
+							class="fa fa-user"></i>
+					</span> <span class="title"> 找回登录账号 </span></a></li>
+				<li><a href=""> <span class="icon-circle"> <i
+							class="fa fa-user-times"></i>
+					</span> <span class="title"> 账号无法登录 </span></a></li>
+			</ul>
+		</div>
+		<div class="col-xs-4">
+			<div class="headerline">
+				<div class="content">常见问题</div>
+				<div class="end">
+					<a class="btn btn-sm btn-default" ng-click="">更多</a>
+				</div>
+			</div>
+			<ul class="list-unstyled question-list">
+				<li><a class="text-light" href="">如何注册成为平台用户?</a></li>
+				<li><a class="text-light" href="">手机验证时提示号码已被占用,怎么办?</a></li>
+				<li><a class="text-light" href="">邮箱地址已被绑定,怎么办?</a></li>
+				<li><a class="text-light" href="">如何查询注册进度?</a></li>
+				<li><a class="text-light" href="">注册成功后,如何添加企业用户?</a></li>
+				<li><a class="text-light" href="">注册成功后,如何修改企业名称?</a></li>
+				<li><a class="text-light" href="">如何开通SAAS服务?</a></li>
+			</ul>
+		</div>
+	</div>
+</div>

+ 0 - 0
src/main/webapp/resources/tpl/public/serve/help.html → src/main/webapp/resources/tpl/serve/new.html


+ 0 - 0
src/main/webapp/resources/tpl/public/serve/question.html → src/main/webapp/resources/tpl/serve/question.html


+ 0 - 0
src/main/webapp/resources/tpl/serve/sale.html