Explorar o código

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

ouxianqin %!s(int64=9) %!d(string=hai) anos
pai
achega
9ce39a8342

+ 17 - 16
pom.xml

@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>platform-b2b</artifactId>
 	<packaging>war</packaging>
@@ -29,6 +29,10 @@
 				<!-- static plugin -->
 				<static-path>static</static-path>
 			</properties>
+			<!-- 默认 -->
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
 		</profile>
 		<profile>
 			<!-- 生产环境 -->
@@ -38,10 +42,7 @@
 				<!-- static plugin -->
 				<static-path>http://static.ubtob.com</static-path>
 			</properties>
-			<!-- 默认 -->
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
+
 		</profile>
 	</profiles>
 	<dependencies>
@@ -324,7 +325,7 @@
 		</resources>
 		<!-- 在maven生命周期validate阶段生成timestamp -->
 		<plugins>
-			<plugin>
+			<!-- <plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>buildnumber-maven-plugin</artifactId>
 				<version>1.3</version>
@@ -344,20 +345,20 @@
 						</items>
 					</configuration>
 				</configuration>
-			</plugin>
-			<plugin>
+			</plugin> -->
+			<!-- <plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
 					<source>1.7</source>
 					<target>1.7</target>
 				</configuration>
-			</plugin>
-			<plugin>
+			</plugin> -->
+			<!-- <plugin>
 				<groupId>com.samaxes.maven</groupId>
 				<artifactId>minify-maven-plugin</artifactId>
 				<version>1.7.4</version>
-				<!-- 静态文件压缩 -->
+				静态文件压缩
 				<executions>
 					<execution>
 						<id>default-minify</id>
@@ -418,7 +419,7 @@
 				<groupId>com.uas.plugins</groupId>
 				<artifactId>static-maven-plugin</artifactId>
 				<version>0.0.2-SNAPSHOT</version>
-				<!-- 静态资源分离 -->
+				静态资源分离
 				<executions>
 					<execution>
 						<id>default-static</id>
@@ -436,7 +437,7 @@
 								<sourceInclude>resources/tpl/**/*.html</sourceInclude>
 								<sourceInclude>WEB-INF/views/**/*.html</sourceInclude>
 							</sourceIncludes>
-							<!-- http://static.ubtob.com/css/index.css?_v=1450321871828 -->
+							http://static.ubtob.com/css/index.css?_v=1450321871828
 							<versionSuffix>
 								<suffix>?_v=${timestamp}</suffix>
 								<exclude>*/require.js,*.min.js,*.min.css</exclude>
@@ -462,9 +463,9 @@
 						</resource>
 					</webResources>
 				</configuration>
-			</plugin>
+			</plugin> -->
 		</plugins>
-		<pluginManagement>
+		<!-- <pluginManagement>
 			<plugins>
 				<plugin>
 					<groupId>org.eclipse.m2e</groupId>
@@ -499,7 +500,7 @@
 					</configuration>
 				</plugin>
 			</plugins>
-		</pluginManagement>
+		</pluginManagement> -->
 	</build>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

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

@@ -15,6 +15,7 @@
 	href="static/lib/fontawesome/css/font-awesome.min.css" />
 <link rel="stylesheet" href="static/lib/angular/toaster.css" />
 <link rel="stylesheet" href="static/css/index.css" />
+	<script src="../../../resources/lib/jquery/jquery.min.js"></script>
 </head>
 <body ng-controller="AuthCtrl">
 	<!-- top Start -->
@@ -40,68 +41,7 @@
 					<li ng-class="{'active': routeState == 'home'}"><a
 						ui-sref="home">首页</a></li>
 					<li class="dropdown" id="home-dropdown"><a href="#" role="button" class="dropdown-toggle"> 服务 <i class="fa fa-angle-down"></i></a>
-						<div class="dropdown-menu " style="padding: 10px 15px; width: 930px; margin-left: -147px;">
-							<div class="row pills text-center" id="dropdown-menu-sale">
-								<div class="col-xs-2" >
-									<img src="resources/img/home/sale-sm.png"><br>
-									销 售
-								</div>
-								<div class="col-xs-10">
-								 	<ul class="nav nav-pills">
-										<li><a href="#/sale/customer" title="客户资料">客户资料</a></li>
-										<li><a href="#/sale/order" title="客户采购订单">客户采购订单</a></li>
-										<li><a href="#/sale/change" title="客户采购变更">客户采购变更</a></li>
-										<li><a href="#/sale/forecast" title="客户采购预测">客户采购预测</a></li>
-										<li><a href="#/sale/notice" title="客户发货提醒">客户发货提醒</a></li>
-										<li><a href="#/sale/send" title="发货单">发货单</a></li>
-										<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>
-										<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>
-							<div class="row pills text-center" id="dropdown-menu-purc">
-								<div class="col-xs-2">
-									<img alt="" src="resources/img/home/purc-sm.png"><br>采购
-								</div>
-								<div class="col-xs-10">
-									<ul class="nav nav-pills" >
-										<li><a href="#/purc/tender" title="采购招标">采购招标</a></li>
-										<li><a href="#/purc/order" title="采购订单">采购订单</a></li>
-										<li><a href="" title="采购询价">采购询价</a></li>
-										<li><a href="#/purc/deputy" title="采购询价">代采订单</a></li>
-									</ul>
-								</div>
-							</div>
-							<div class="row pills text-center" id="dropdown-menu-finance">
-								<div class="col-xs-2">
-									<img src="resources/img/home/finance-sm.png"><br>财务
-								</div>
-								<div class="col-xs-10">
-									<ul class="nav nav-pills">
-										<li><a href="#/fa/apBill" title="客户应付发票">客户应付发票</a></li>
-										<li><a href="#/fa/apCheck" title="应收对账单">应收对账单</a></li>
-										<li><a href="#/fa/arCheck" title="应付对账单">应付对账单</a></li>
-									</ul>
-								</div>
-							</div>
-							<div class="row pills text-center" id="dropdown-menu-report">
-								<div class="col-xs-2">
-									<img src="resources/img/home/report-sm.png"><br>统计报表
-								</div>
-								<div class="col-xs-10">
-									<ul class="nav nav-pills" >
-										<li><a href="" title="销售出货统计">销售出货统计</a></li>
-										<li><a href="" title="采购订单统计">采购订单统计</a></li>
-										<li><a href="" title="考勤统计">考勤统计</a></li>
-									</ul>
-								</div>
-							</div>
-						</div>
+
 					</li>
 				</ul>
 				<ul id="home-search">
@@ -117,6 +57,73 @@
 				</div>
 			</nav>
 		</div>
+		<div class="dropdown-tab">
+			<div class="dropdown-tab01">
+				<div class="dropdown-menu01">
+					<div class="row pills text-center" id="dropdown-menu-sale">
+						<div class="col-xs-2" >
+							<img src="resources/img/home/sale-sm.png"><br>
+							销 售
+						</div>
+						<div class="col-xs-10">
+							<ul class="nav nav-pills">
+								<li><a href="#/sale/customer" title="客户资料">客户资料</a></li>
+								<li><a href="#/sale/order" title="客户采购订单">客户采购订单</a></li>
+								<li><a href="#/sale/change" title="客户采购变更">客户采购变更</a></li>
+								<li><a href="#/sale/forecast" title="客户采购预测">客户采购预测</a></li>
+								<li><a href="#/sale/notice" title="客户发货提醒">客户发货提醒</a></li>
+								<li><a href="#/sale/send" title="发货单">发货单</a></li>
+								<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>
+								<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>
+					<div class="row pills text-center" id="dropdown-menu-purc">
+						<div class="col-xs-2">
+							<img alt="" src="resources/img/home/purc-sm.png"><br>采购
+						</div>
+						<div class="col-xs-10">
+							<ul class="nav nav-pills" >
+								<li><a href="#/purc/tender" title="采购招标">采购招标</a></li>
+								<li><a href="#/purc/order" title="采购订单">采购订单</a></li>
+								<li><a href="" title="采购询价">采购询价</a></li>
+								<li><a href="#/purc/deputy" title="采购询价">代采订单</a></li>
+							</ul>
+						</div>
+					</div>
+					<div class="row pills text-center" id="dropdown-menu-finance">
+						<div class="col-xs-2">
+							<img src="resources/img/home/finance-sm.png"><br>财务
+						</div>
+						<div class="col-xs-10">
+							<ul class="nav nav-pills">
+								<li><a href="#/fa/apBill" title="客户应付发票">客户应付发票</a></li>
+								<li><a href="#/fa/apCheck" title="应收对账单">应收对账单</a></li>
+								<li><a href="#/fa/arCheck" title="应付对账单">应付对账单</a></li>
+							</ul>
+						</div>
+					</div>
+					<div class="row pills text-center" id="dropdown-menu-report">
+						<div class="col-xs-2">
+							<img src="resources/img/home/report-sm.png"><br>统计报表
+						</div>
+						<div class="col-xs-10">
+							<ul class="nav nav-pills" >
+								<li><a href="" title="销售出货统计">销售出货统计</a></li>
+								<li><a href="" title="采购订单统计">采购订单统计</a></li>
+								<li><a href="" title="考勤统计">考勤统计</a></li>
+							</ul>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+
 	</div>
 	<!-- header End -->
 	<!-- body Start -->
@@ -204,5 +211,24 @@
 		  s.parentNode.insertBefore(hm, s);
 		})();
 	</script> -->
+	<script src="static/lib/jquery/jquery.min.js"></script>
+	<script src="static/lib/bootstrap/js/bootstrap.js"></script>
+<script type="text/javascript">
+	$(function(){
+		$('#home-dropdown').hover(function (e){
+			$(".dropdown-tab").toggle();
+			e.stopPropagation();
+			$('.dropdown-tab01').mouseenter(function(){
+				$(".dropdown-tab").show();
+			});
+			$('.dropdown-tab01').mouseleave(function(){
+				$(".dropdown-tab").hide();
+			});
+		})
+		$('.dropdown-tab a').click(function(){
+			$(".dropdown-tab").hide();
+		});
+	})
+</script>
 </body>
 </html>

+ 178 - 31
src/main/webapp/resources/css/index.css

@@ -680,6 +680,7 @@ ul>li.item-link>a {
 	border: none;
 	border-top: 10px solid #d32526;
 	box-shadow: 0 0 10px #6f6f6f;
+	position: relative;
 }
 
 #header.navbar-inverse .navbar-brand {
@@ -715,23 +716,28 @@ ul>li.item-link>a {
 
 #home-search a {
 	border-radius: 0;
-	width: 100px;
+	width: 85px;
 	height: 36px;
 	color: #ffffff;
 	background-color: #d32526;
 	border: 1px solid #d32526;
+	font-size: 16px;
 }
 
 #home-search input {
 	border-radius: 0;
 	border: 1px solid #d32526;
-	width: 250px;
+	width: 365px;
 	height: 36px;
 	color: #000000;
-	text-algin: center;
-	padding-left: 10px;
+	text-align: center;
+	font-size: 16px;
+}
+@media screen and (max-width: 1366px) {
+	#home-search input{
+		width: 250px;
+	}
 }
-
 #home-search input:focus {
 	outline: none;
 }
@@ -752,7 +758,8 @@ ul>li.item-link>a {
 	width: 200px;
 	margin-top: 15px;
 	color: #333333;
-	margin-left: 96%;
+	position: absolute;
+	right: 0;
 }
 #home-headerBtns i {
 	padding-left: 20px;
@@ -890,7 +897,7 @@ ul>li.item-link>a {
 }
 
 #header .navbar-header .navbar-brand {
-	background: url("../img/logo/logo.png") no-repeat;
+	background: url("../img/logo/logo.png") no-repeat bottom;
 	width: 218px;
 	margin: 0
 }
@@ -1134,19 +1141,17 @@ ul>li.item-link>a {
 }
 
 .data-wrap .todo {
-	height: 244px;
 	margin-bottom: 15px;
 }
 
 .todo .todo-label {
-	height: 30px;
-	line-height: 40px;
-	margin-top: 20px;
-	background-color: #e8e8e8;
-	border-radius: 0px 20px 0px 0px;
-	width: 650px;
-	margin-left: 5px;
-	box-shadow: 0 0 5px #6f6f6f;
+	margin-top: 19px;
+	width: 100%;
+	height: 40px;
+	line-height: 45px;
+	background: url("../img/approvalFlow/comm_bg02.png") no-repeat bottom;
+	background-color: #f5f5f5;
+	background-size: 660px 100%;
 }
 .todo .todo-label i {
 	margin-left: 20px;
@@ -1171,19 +1176,18 @@ ul>li.item-link>a {
 
 .todo .todo-content {
 	clear: both;
-	height: 85px;
 	background-color: #ffffff;
 	width: 660px;
-	height: 258px;
 	margin-left: 0px;
-	border: 1px solid #e8e8e8;
+	border-bottom: 1px solid #e8e8e8;
+	display: inline-block;
 }
 
 .todo .todo-content #tips {
-	margin-left: 20px;
 	margin-top: 40px;
 	font-family: Microsoft YaHei, SimHei, Verdana; 
 	font-size: 16px;
+	width: 100%;
 }
 
 .todo .todo-content a {
@@ -1204,38 +1208,42 @@ ul>li.item-link>a {
 	float: left;
 	width: 52px;
 	height: 52px;
-	line-height: 50px;
+	line-height: 40px;
 	text-align: center;
-	margin-top: 40px;
+	margin-top: 55px;
 	font-size: 16px;
 	list-style-type: none;
 	/* border: 1px solid #56a022; */
+	font-weight: bold;
+}
+.todo #operateTips a{
+	padding: 0;
+	margin-bottom: 15px;
 }
-
 .todo-content .start {
 	float: left;
-	height: 50px;
-	padding-top: 20px;
+	padding-top: 5px;
 	font-size: 14px;
+	width: 100%;
 }
 
 .todo-content #operateTips {
-	margin-left: 5px;
-	margin-top: 100px;
+	margin-top: 10px;
 	padding-top: 20px;
 	margin-bottom: 20px;
 	font-family: Microsoft YaHei, SimHei, Verdana; 
 	font-size: 14px;
 	cursor: pointer;
 	border-top: 1px dashed #919090;
+	display: inline-block;
+	width: 100%;
 }
 
 .todo-content .start li,.todo-content .doing li,.todo-content .end li {
 	float: left;
-	margin-left: 20px;
-	margin-bottom: 10px;
+	line-height: 28px;
+	width: 33.33333333%;
 }
-
 .todo-content .doing {
 	float: left;
 	height: 50px;
@@ -1386,7 +1394,7 @@ ul>li.item-link>a {
 .pane .pane-header {
 	height: 30px;
 	background: #e8e8e8;
-	line-height: 39px;
+	line-height: 30px;
 	font-size: 14px;
 	padding: 0 15px;
 	border-bottom: 1px solid #e8e8e8;
@@ -1399,6 +1407,9 @@ ul>li.item-link>a {
 
 .pane .pane-body {
 	padding: 10px;
+	height: 110px;
+	overflow-y: auto;
+	overflow-x: hidden;
 }
 
 .pane.addon {
@@ -1425,6 +1436,10 @@ ul>li.item-link>a {
 	display: block;
 	padding: 0 10px 8px 15px;
 	position: relative;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+
 }
 
 .notice .detail>li:before {
@@ -2366,4 +2381,136 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 	font-weight: 700;
 	font-size: 17px;
 	color:red;
+}
+.dropdown-tab{
+	width: 100%;
+	height: 100%;
+	position: fixed;
+	z-index: 1;
+	background: rgba(0, 0, 0, 0.2);
+	top: 95px;
+	left: 0;
+	display: none;
+	transition: display .2s ease-in;
+}
+.dropdown-tab01{
+	width: 100%;
+	position: absolute;
+	background: #fff;
+	box-shadow: 0 0 30px #888;
+	font-family: "Microsoft YaHei", "微软雅黑";
+	transition: all .2s ease-in;
+}
+.dropdown-menu01{
+	width: 1100px;
+	margin: 0 auto;
+	padding-top: 10px;
+	padding-bottom: 10px;
+}
+.dropdown-tab .nav-pills>li{
+	width: 16.66666%;
+	text-align: left;
+	line-height: 40px;
+}
+.dropdown-tab .nav-pills>li a{
+	padding: 0;
+	font-size: 16px;
+	color: #000;
+ }
+.dropdown-tab .nav-pills>li a:hover{
+	color: #d32526;
+}
+.dropdown-tab .col-xs-2{
+	font-size: 14px;
+	font-weight: bold;
+	float: left;
+}
+.dropdown-tab .col-xs-2 img{
+	margin-bottom: 5px;
+}
+.dropdown-tab #dropdown-menu-sale img{
+	margin-top: 25%;
+}
+.dropdown-tab #dropdown-menu-purc img,.dropdown-tab #dropdown-menu-finance img,.dropdown-tab #dropdown-menu-report img{
+	margin-top: 0;
+	vertical-align: middle;
+}
+.dropdown-tab #dropdown-menu-purc li,.dropdown-tab #dropdown-menu-finance li,.dropdown-tab #dropdown-menu-report li{
+	line-height: 60px;
+}
+.todo .todo-label em{
+	margin-right: 20px;
+}
+.todo .todo-content .col-xs-10{
+	margin-top:42px;
+}
+#change-company{
+	min-width: inherit;
+	width: 222px;
+	border: #ccc 1px solid;
+	padding: 0;
+	margin: 0;
+	top: -200%;
+}
+#change-company:before{
+	width: 18px;
+	height: 18px;
+	border-top: #ccc 1px solid;
+	border-left: #ccc 1px solid;
+	background: #fff;
+	content: "";
+	display: inline-block;
+	position: absolute;
+	top: 85px;
+	left: -9px;
+	transform: rotate(-45deg);
+	box-shadow: -1px -1px 2px #ccc;
+	z-index: -100;
+}
+#change-company	.text-muted {
+	line-height: 40px;
+	padding: 0;
+	margin: 0;
+	padding-left: 10px;
+	font-weight: inherit;
+}
+#change-company li{
+	padding-top: 0;
+}
+#change-company li a{
+	padding: 0;
+	margin: 0;
+	padding-left: 10px;
+	line-height: 50px;
+	border-bottom: #ccc 1px solid;
+}
+.todo .list-unstyled{
+	display: inline-block;
+	width: 100%;
+}
+.todo .todo-content:last-child{
+	border-bottom: none;
+}
+.feed-wrap .carousel-inner{
+	width: 246px;
+	height: 625px;
+}
+.feed-wrap .carousel-inner .item img{
+	width: 246px;
+	height: 590px;
+}
+.feed-wrap .carousel-indicators .active{
+	background: #050505;
+	border: none;
+}
+.feed-wrap .carousel-indicators{
+	bottom: -10px;
+}
+.feed-wrap .carousel-indicators li{
+	background: #c2c2c2;
+	width: 11px;
+	height: 11px;
+	margin: 3px;
+	border-radius: 100%;
+	border: none;
 }

BIN=BIN
src/main/webapp/resources/img/home/UU.png


+ 2 - 4
src/main/webapp/resources/tpl/index/home/left.html

@@ -28,10 +28,8 @@
 					<li class="dropdown-submenu">
 					<a style="font-size: 14px; font-family: 'Microsoft YaHei', 'Hiragino Sans GB'; text-decoration: none;" href="#/account/enterprise">{{userInfo.enterprise.enName}}
 						<i class="fa fa-angle-double-right" ng-if="userInfo.enSelect"></i></a>
-						<ul class="dropdown-menu arrow left" ng-if="userInfo.enSelect" style="top: -16px;">
-							<li class="text-muted text-bold" style="padding: 5px 15px;"><i
-								class="fa fa-exchange fa-fw"></i> 切换企业到:</li>
-							<li class="divider"></li>
+						<ul class="dropdown-menu" ng-if="userInfo.enSelect" id="change-company">
+							<li class="text-muted text-bold">切换企业</li>
 							<li ng-repeat="e in userInfo.enSelect" class="item-link"><a
 								ng-click="switchto(e.uu)">{{e.enName}}</a></li>
 						</ul>

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

@@ -1,6 +1,5 @@
 <style>
 .data-wrap .todo {
-	height: 140px;
 	margin-bottom: 15px;
 }
 </style>
@@ -11,7 +10,7 @@
 	<!-- 待处理统计 Start -->
 	<div class="todo">
 		<div class="todo-label list-unstyled">
-			<i class="fa fa-tasks fa-lg"></i><label>工作任务</label>
+			<em></em><label>工作任务</label>
 		</div>
 		<div class="todo-content" ng-controller="TodoCtrl">
 			<div class="todo-content" id="saleTodo">
@@ -19,8 +18,7 @@
 					<li class="icon"><img  src="resources/img/home/sale.png" >销售</li>
 				</div>
 				<div class="col-xs-10">
-					<ul class="list-unstyled list-inline">
-						<li id="tips"><strong>| 待办提醒</strong></li>
+					<ul class="list-unstyled list-inline" >
 						<li class="start">
 							<ul class="list-unstyled">
 								<li><a ui-sref="sale.todo.inquiry">询价单(<span
@@ -44,14 +42,15 @@
 								<li><a ui-sref="sale.accept">买家验收</a></li>
 								<li><a ui-sref="sale.returns">买家退货</a></li>
 								<li><a ui-sref="baseInfo.prodList">物料列表</a></li>
+								<li><a ui-sref="sale.accept">买家验收</a></li>
 							</ul>
 						</li>
 					</ul>
 					<div id="operateTips" ng-controller="VendCountCtrl">
-						<a class="col-xs-6" href="#/sale/customer"> 我的客户(<span ng-class="{'text-inverse': count.customer>0}">{{count.customer || 0}}</span>)</a>		
-						<a class="col-xs-6" style="color: #327ebe" href="#/baseInfo/myRquest"><i class="fa fa-plus"></i> 添加客户</a>	
-						<a class="col-xs-6" style="color: #327ebe" ui-sref="baseInfo.newProdInfo"><i class="fa fa-plus"></i> 新增物料</a>
-						<a class="col-xs-6" style="color: #327ebe" ui-sref="baseInfo.uploadByBatch"><i class="fa fa-plus"></i> 导入物料</a>	
+						<a class="col-xs-4" href="#/sale/customer"> 我的客户(<span ng-class="{'text-inverse': count.customer>0}">{{count.customer || 0}}</span>)</a>
+						<a class="col-xs-4" style="color: #327ebe" href="#/baseInfo/myRquest"><i class="fa fa-plus"></i> 添加客户</a>
+						<a class="col-xs-4" style="color: #327ebe" ui-sref="baseInfo.newProdInfo"><i class="fa fa-plus"></i> 新增物料</a>
+						<a class="col-xs-4" style="color: #327ebe" ui-sref="baseInfo.uploadByBatch"><i class="fa fa-plus"></i> 导入物料</a>
 					</div>
 				</div>
 			</div>
@@ -61,7 +60,6 @@
 				</div>
 				<div class="col-xs-10">
 					<ul class="list-unstyled list-inline">
-						<li id="tips"><strong>| 待办提醒</strong></li>
 						<li class="start">
 							<ul class="list-unstyled">
 								<li><a ui-sref="purc.order">采购单(<span
@@ -80,11 +78,11 @@
 						</li>
 					</ul>
 					<div id="operateTips" ng-controller="VendCountCtrl">
-						<a class="col-xs-6" href="">我的供应商(<span ng-class="{'text-inverse': count.vendor>0}">{{count.vendor || 0}}</span>)</a>		
-						<a class="col-xs-6" style="color: #327ebe" href="#/baseInfo/myRquest"><i class="fa fa-plus"></i> 添加供应商</a>	
-						<a class="col-xs-6" style="color: #327ebe" href="#/purc/addOrder"><i class="fa fa-plus"></i> 新增采购单</a>	
-						<a class="col-xs-6" style="color: #327ebe" href="#/sale/quotation/new"><i class="fa fa-plus"></i> 新增报价单</a>	
-						<a class="col-xs-6" style="color: #327ebe" href="#/purc/deputy/add"><i class="fa fa-plus"></i> 新增代采订单</a>			
+						<a class="col-xs-4" href="">我的供应商(<span ng-class="{'text-inverse': count.vendor>0}">{{count.vendor || 0}}</span>)</a>
+						<a class="col-xs-4" style="color: #327ebe" href="#/baseInfo/myRquest"><i class="fa fa-plus"></i> 添加供应商</a>
+						<a class="col-xs-4" style="color: #327ebe" href="#/purc/addOrder"><i class="fa fa-plus"></i> 新增采购单</a>
+						<a class="col-xs-4" style="color: #327ebe" href="#/sale/quotation/new"><i class="fa fa-plus"></i> 新增报价单</a>
+						<a class="col-xs-4" style="color: #327ebe" href="#/purc/deputy/add"><i class="fa fa-plus"></i> 新增代采订单</a>
 					</div>
 				</div>
 			</div>
@@ -94,7 +92,6 @@
 				</div>
 				<div class="col-xs-10">
 					<ul class="list-unstyled list-inline">
-						<li id="tips"><strong>| 待办提醒</strong></li>
 						<li class="start">
 							<ul class="list-unstyled">
 								<li><a ui-sref="fa.apBill">客户应付发票(<span
@@ -112,7 +109,7 @@
 						</li>
 					</ul>
 					<div id="operateTips">
-						<a class="col-xs-6" style="color: #327ebe" href="#/fa/apCheckList"><i class="fa fa-plus"></i> 新增对账单</a>		
+						<a class="col-xs-4" style="color: #327ebe" href="#/fa/apCheckList"><i class="fa fa-plus"></i> 新增对账单</a>
 					</div>
 				</div>
 			</div>
@@ -124,7 +121,26 @@
 <div class="feed-wrap">
 	<div class="side-image">
 		<a href="#/baseInfo/enterpriseList"><img src="resources/img/home/entLib.png" ></a>
-		<a href="serve#/self/client" target="_blank"><img src="resources/img/home/UU.png"></a>
+		<div id="myCarousel" class="carousel slide">
+			<!-- 轮播(Carousel)项目 -->
+			<div class="carousel-inner">
+				<div class="item active">
+					<img src="resources/img/home/UU.png" alt="First slide">
+				</div>
+				<div class="item">
+					<img src="resources/img/home/UU.png" alt="Second slide">
+				</div>
+				<div class="item">
+					<img src="resources/img/home/UU.png" alt="Third slide">
+				</div>
+			</div>
+			<!-- 轮播(Carousel)指标 -->
+			<ol class="carousel-indicators">
+				<li data-target="#myCarousel" data-slide-to="0" class="active"></li>
+				<li data-target="#myCarousel" data-slide-to="1"></li>
+				<li data-target="#myCarousel" data-slide-to="2"></li>
+			</ol>
+		</div>
 	</div>
 </div>
 <!-- 第三列图片 End -->