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

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

@@ -36,9 +36,8 @@
 									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>
+					<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">
@@ -197,11 +196,12 @@
 			</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 == 'base'}"><a ui-sref="base">基础设置</a></li>
-					<li ng-class="{'active': routeState == 'user'}"><a ui-sref="user">账户设置</a></li>
-					<li class="dropdown"  ng-class="{'active': routeState == 'sale'}"><a ui-sref="sale">销售管理</a>
-						<ul class="dropdown-menu">
+					<li ng-class="{'active': routeState == 'home'}"><a
+						ui-sref="home">首页</a></li>
+					<li ng-class="{'active': routeState == 'user'}"><a
+						ui-sref="user">账户设置</a></li>
+					<li class="dropdown" ng-class="{'active': routeState == 'sale'}"><a
+						ui-sref="sale">销售管理</a> <!-- <ul class="dropdown-menu">
 							<li><a href="#">设置水印</a></li>
 							<li><a href="#">网店秀</a></li>
 							<li><a href="#">美图秀秀</a></li>
@@ -215,7 +215,7 @@
 									<li><a href="#">授权操作日志</a></li>
 									<li><a href="#">容量变更日志</a></li>
 								</ul></li>
-						</ul></li>
+						</ul> --></li>
 					<li ng-class="{'active': routeState == 'qc'}"><a ui-sref="qc">品质管理</a></li>
 					<li ng-class="{'active': routeState == 'fa'}"><a ui-sref="fa">财务对账</a></li>
 				</ul>

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

@@ -803,6 +803,50 @@ a {
 	height: 28px;
 	line-height: 28px;
 }
+
+.condition {
+	border-bottom: 1px solid #e8e8e8;
+}
+
+.state-wrap {
+	position: relative;
+	height: 40px;
+	line-height: 40px;
+	padding: 0 20px;
+	margin-bottom: 22px;
+	font-size: 14px;
+}
+
+.state-wrap a:hover {
+	text-decoration: none;
+}
+
+.state-wrap li {
+	width: 100px;
+	text-align: center;
+	position: relative;
+}
+
+.state-wrap li.active {
+	border-bottom: 2px solid #f40;
+}
+
+.state-wrap li.active a {
+	color: #f40;
+}
+
+.state-wrap li em {
+	font-style: normal;
+	margin-left: 5px;
+	color: #f40;
+}
+
+.state-wrap li:after {
+	position: absolute;
+	content: "|";
+	margin-left: 20px;
+	color: #eee
+}
 /*footer*/
 #footer {
 	color: #f1f1f1;

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

@@ -40,21 +40,15 @@ define([ 'toaster', 'charts', 'services', 'ui.router' ], function() {
 		}).state('sale.order', {
 			url : "/order",
 			views : {
-				"left-view" : {
-					templateUrl : "static/tpl/index/sale/left.html"
-				},
 				"right-view" : {
 					templateUrl : "static/tpl/index/sale/order.html"
 				}
 			}
-		}).state('base', {
-			url : "/base",
+		}).state('sale.order.reply', {
+			url : "/reply",
 			views : {
-				"left-view" : {
-					templateUrl : "static/tpl/index/base/left.html"
-				},
 				"right-view" : {
-					templateUrl : "static/tpl/index/base/right.html"
+					templateUrl : "static/tpl/index/sale/order.html"
 				}
 			}
 		}).state('user', {

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

@@ -0,0 +1,31 @@
+<div class="left-nav left-home">
+	<div class="nav-home">
+		<a ui-sref="sale" class="text-default"><span
+			class="glyphicon glyphicon-home icon-left"></span>对账</a>
+	</div>
+</div>
+<div class="left-nav">
+	<div class="nav-label">
+		<i></i>增值服务
+	</div>
+	<ul class="list-unstyled">
+		<li><a href="#">SAAS服务</a></li>
+		<li><a href="#">电子元器件市场</a></li>
+		<li><a href="#">商机库</a></li>
+		<li><a href="#">我的物流</a></li>
+	</ul>
+</div>
+<div class="left-nav">
+	<div class="nav-label">
+		<i></i>自定义菜单
+	</div>
+	<ul class="list-unstyled">
+		<li><a href="#">添加自定义菜单</a><i class="fa fa-plus icon-right"></i></li>
+	</ul>
+</div>
+<div class="left-nav">
+	<ul class="list-unstyled">
+		<li><a href="#">问题反馈</a><i class="fa fa-bell-o icon-right"></i></li>
+		<li><a href="#">客服中心</a><i class="fa fa-headphones icon-right"></i></li>
+	</ul>
+</div>

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

@@ -34,7 +34,7 @@
 				<li class="start">
 					<ul class="list-unstyled">
 						<li><a href="#">待报价(0)</a></li>
-						<li><a href="#">待回复(0)</a></li>
+						<li><a ui-sref="sale.order.reply"">待回复(6)</a></li>
 					</ul>
 				</li>
 				<li class="doing">

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

@@ -0,0 +1,31 @@
+<div class="left-nav left-home">
+	<div class="nav-home">
+		<a ui-sref="sale" class="text-default"><span
+			class="glyphicon glyphicon-home icon-left"></span>品质</a>
+	</div>
+</div>
+<div class="left-nav">
+	<div class="nav-label">
+		<i></i>增值服务
+	</div>
+	<ul class="list-unstyled">
+		<li><a href="#">SAAS服务</a></li>
+		<li><a href="#">电子元器件市场</a></li>
+		<li><a href="#">商机库</a></li>
+		<li><a href="#">我的物流</a></li>
+	</ul>
+</div>
+<div class="left-nav">
+	<div class="nav-label">
+		<i></i>自定义菜单
+	</div>
+	<ul class="list-unstyled">
+		<li><a href="#">添加自定义菜单</a><i class="fa fa-plus icon-right"></i></li>
+	</ul>
+</div>
+<div class="left-nav">
+	<ul class="list-unstyled">
+		<li><a href="#">问题反馈</a><i class="fa fa-bell-o icon-right"></i></li>
+		<li><a href="#">客服中心</a><i class="fa fa-headphones icon-right"></i></li>
+	</ul>
+</div>

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

@@ -1,8 +1,18 @@
 <div class="left-nav left-home">
-	<div class="nav-home text-default">
-		<span class="glyphicon glyphicon-home icon-left"></span>销售
+	<div class="nav-home">
+		<a ui-sref="sale" class="text-default"><span
+			class="glyphicon glyphicon-home icon-left"></span>销售</a>
 	</div>
 </div>
+<div class="left-nav">
+	<div class="nav-label">
+		<i></i>客户管理
+	</div>
+	<ul class="list-unstyled">
+		<li><a href="#">客户资料管理</a></li>
+		<li><a href="#">客户分配管理</a></li>
+	</ul>
+</div>
 <div class="left-nav">
 	<div class="nav-label">
 		<i></i>产品管理
@@ -10,6 +20,7 @@
 	<ul class="list-unstyled">
 		<li><a href="#">发布供应产品</a></li>
 		<li><a href="#">销售中的产品</a></li>
+		<li><a href="#">客户物料对照关系</a></li>
 	</ul>
 </div>
 <div class="left-nav">

src/main/webapp/resources/tpl/index/sale/order.html

@@ -0,0 +1,11 @@
+<div class="condition block">
+	<div class="state-wrap">
+		<ul class="list-unstyled list-inline">
+			<li class=" first"><a href="#"><span>所有订单</span></a></li>
+			<li class="active"><a href="#"><span>待回复</span><em
+					class="tm-h">6</em></a></li>
+			<li><a href="#"><span>待发货</span><em class="tm-h">0</em></a></li>
+			<li><a href="#"><span>退货中</span><em class="tm-h">0</em></a></li>
+		</ul>
+	</div>
+</div>

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

@@ -0,0 +1 @@
+<div ui-view="right-view"></div>

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

@@ -0,0 +1,31 @@
+<div class="left-nav left-home">
+	<div class="nav-home">
+		<a ui-sref="sale" class="text-default"><span
+			class="glyphicon glyphicon-home icon-left"></span>账户</a>
+	</div>
+</div>
+<div class="left-nav">
+	<div class="nav-label">
+		<i></i>增值服务
+	</div>
+	<ul class="list-unstyled">
+		<li><a href="#">SAAS服务</a></li>
+		<li><a href="#">电子元器件市场</a></li>
+		<li><a href="#">商机库</a></li>
+		<li><a href="#">我的物流</a></li>
+	</ul>
+</div>
+<div class="left-nav">
+	<div class="nav-label">
+		<i></i>自定义菜单
+	</div>
+	<ul class="list-unstyled">
+		<li><a href="#">添加自定义菜单</a><i class="fa fa-plus icon-right"></i></li>
+	</ul>
+</div>
+<div class="left-nav">
+	<ul class="list-unstyled">
+		<li><a href="#">问题反馈</a><i class="fa fa-bell-o icon-right"></i></li>
+		<li><a href="#">客服中心</a><i class="fa fa-headphones icon-right"></i></li>
+	</ul>
+</div>