公告加搜索、客户资料加搜素结果、代采订单文字左对齐。

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

src/main/webapp/resources/css/serve.css

@@ -14,7 +14,8 @@ body {
 #top>.container, #header>.container, #footer>.container {
 	width: 1170px;
 	margin: 0 auto;
-	padding: 0 15px;
+	/*padding: 0 15px;*/
+	padding: 0;
 }
 
 h1,h2,h3 {
@@ -442,20 +443,19 @@ a.none:hover {
 }
 
 #header.navbar-inverse .navbar-nav>li>a {
-	color: #ffffff;
-	padding: 15px 20px;
+	color: #323232;
+	padding: 15px 40px;
 }
-
 #header.navbar-inverse .navbar-nav>li>a:hover,#header.navbar-inverse .navbar-nav>li>a:focus
 	{
-	color: #ffffff;
-	background-color: #4b8b1e;
+	color: #d82128;
+	/*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;
+	color: #d82128;
+	background: none;
 }
 
 #header.navbar-inverse .navbar-nav>.disabled>a,#header.navbar-inverse .navbar-nav>.disabled>a:hover,#header.navbar-inverse .navbar-nav>.disabled>a:focus
@@ -549,7 +549,8 @@ a.none:hover {
 .body {
 	width: 1170px;
 	margin: 0 auto;
-	padding: 15px;
+	/*padding: 15px;*/
+	margin-top: 20px;
 }
 
 .body:before,.body:after {
@@ -559,7 +560,7 @@ a.none:hover {
 }
 
 .body .left-wrap {
-	width: 196px;
+	width: 218px;
 	float: left;
 	margin-right: 14px;
 	background-color: #fff;
@@ -606,11 +607,11 @@ a.none:hover {
 }
 
 .left-nav>ul>li:hover,.left-nav>ul>li.active {
-	background-color: #56a022;
+	background-color: #999;
 }
 
 .left-nav>ul>li.active {
-	background-color: #4b8b1e;
+	background-color: #6f6f6f;
 }
 
 .left-nav>ul>li:hover *,.left-nav>ul>li.active * {
@@ -792,7 +793,7 @@ a.none:hover {
 }
 
 .contact-container .tab-content {
-	border: 1px solid #44b549;
+	border: 1px solid #d32526;
 	border-top: none;
 }
 
@@ -1028,7 +1029,7 @@ a.none:hover {
 
 .nav-tabs>li {
 	background: #f9f9f9;
-	border-bottom: 1px solid #44b549;
+	border-bottom: 1px solid #d32526;
 	border-right: 1px solid #e2e2e2;
 }
 
@@ -1049,9 +1050,9 @@ a.none:hover {
 
 .nav-tabs>li.active {
 	border-bottom-color: #fff;
-	border-top: 4px solid #44b549;
-	border-left: 1px solid #44b549;
-	border-right: 1px solid #44b549;
+	border-top: 4px solid #d32526;
+	border-left: 1px solid #d32526;
+	border-right: 1px solid #d32526;
 }
 
 .nav-tabs>li.active>a {
@@ -1060,7 +1061,7 @@ a.none:hover {
 }
 
 .nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus {
-	color: #56a022;
+	color: #d32526;
 }
 
 .nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus,.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus

src/main/webapp/resources/tpl/index/purc/deputyOrder.html

@@ -147,6 +147,12 @@
     .main-content  .btn-group button{
         font-weight: inherit;
     }
+    .main-content .text-left{
+        text-align: left;
+    }
+    .main-content .text-left div{
+        margin-left: 20px;
+    }
 </style>
 <link rel="stylesheet" href="static/css/public.css">
 <div id="public">
@@ -276,17 +282,17 @@
 			</tbody>
 			<tbody ng-repeat="order in $data">
                 <tr>
-                	<td >
+                	<td class="text-left">
                 		<div>流水号：<a ng-bind="order.code" ui-sref="purc.deputydetail({id:order.id})"></a></div>
                 		<div>下单日期：<span ng-bind="order.entrydate| date: 'yyyy-MM-dd'"></span></div>
                 		<div>终端供应商：<span ng-bind="order.tervendor"></span></div>
                 		<div>订单金额:<span ng-bind="order.totalamount"></span></div>
                 	</td>
-                	<td>
+                	<td class="text-left">
                 		<div>最新付款日期：<span ng-bind="order.paydate| date: 'yyyy-MM-dd'"></span></div>
                 		<div>累计付款金额：<span ng-bind="order.totalamount"></span></div>
                 	</td>
-                	<td>
+                	<td class="text-left">
                 		<div>最新付款日期：<span ng-bind="order.deliverydate| date: 'yyyy-MM-dd'"></span></div>
                 		<div>累计付款金额：<span ng-bind="order.usdpayment"></span></div>
                 	</td>

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

@@ -73,20 +73,35 @@
 #customer-tab table tr td a{
 	color: #5078cb;
 }
+.form-horizontal #topSearch{
+	font-size: 16px;
+	line-height: 55px;
+}
 </style>
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>
 <div class="pane base-info" style="max-height: 900px;overflow-y: auto; overflow-x: hidden;" id="customer-tab">
-	<div class="pane-header">
+	<!--<div class="pane-header">
 		客户资料 （共{{::totalCount}}个）
 		<div class="pull-right">
 			<a href="vendor/customer/xls" target="_self" class="text-simple bule"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
 		</div>
+	</div>-->
+	<div class="pub-com_head">
+		<span>客户资料</span>
+		<div class="p-right">
+			<a href="vendor/customer/xls" target="_self" class="text-simple bule"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+		</div>
 	</div>
 	<form class="form-horizontal">
 		<div class="form-group">
-			<div class="col-md-6 col-sm-6"></div>
+			<div class="col-md-6 col-sm-6">
+				<div id="topSearch" style="float: left">
+					<span class="text-muted"><i class="fa fa-search fa-lg"></i> 搜索"{{tip}}",为您找到结果:</span>
+					单据{{::totalCount}}条
+				</div>
+			</div>
 			<div class="col-md-6 col-sm-6">
 				<div class="form-group form-group-sm has-feedback">
 					<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入企业名称、简称或申请人搜索" />

src/main/webapp/resources/tpl/public/info/notice_detail.html

@@ -65,9 +65,6 @@
 		padding: 0;
 		margin-top: 20px;
 	}
-	.body .right{
-		padding-top: 15px;
-	}
 	.body .sign{
 		height: 80px;
 		line-height: 80px;
@@ -89,6 +86,46 @@
 	.body .row .footer{
 		line-height: 50px;
 	}
+	.body .right .time{
+		height: 40px;
+		line-height: 40px;
+		border-bottom: 1px solid #e8e8e8;
+	}
+	.body .head{
+		height: 40px;
+		line-height: 40px;
+		border-bottom: 1px solid #e8e8e8;
+	}
+	.body .head h4{
+		margin: 0;
+		line-height: 40px;
+	}
+	.body .left .search{
+		width: 100%;
+		height: 40px;
+		position: relative;
+		margin: 10px 0 5px 0;
+	}
+	.body .left .search input{
+		width: 280px;
+		height: 32px;
+		line-height: 32px;
+		border: #ccc 1px solid;
+		border-radius: 20px;
+		margin-left: 20px;
+		text-align: center;
+	}
+	.body .left .search input:focus{
+		border-radius: 20px;
+		border: none;
+	}
+	.body .left .search a{
+		position: absolute;
+		right: 20px;
+		top: 0;
+		color: #ccc;
+		width: 40px;
+	}
 </style>
 <div class="body notice-container">
 	<div class="block doc">
@@ -100,6 +137,10 @@
 				<div class=" head ">
 					<h4 class="text-center">最新公告</h4>
 				</div>
+				<div class="search">
+					<input type="text" placeholder="输入供应商名称" class=""/>
+					<a class="btn"><i class="fa fa-search"></i></a>
+				</div>
 				<div class="content">
 					<ul class="list-unstyled">
 						<li ng-repeat="notice in notices">
@@ -117,7 +158,7 @@
 			</div>
 			<!--<div class="col-lg-1 col-md-1 col-sm-1 col-xs-1"></div>-->
 			<div class="col-lg-8 col-md-8 col-sm-8 col-xs-8 right" style="width: 840px;">
-				<div class="col-sm-12">
+				<div class="col-sm-12 time">
 					<div class="pull-right text-muted"  ng-bind="::noticeBody.notice.date | date:'yyyy-MM-dd HH:mm'"></div><br>
 				</div>
 				<div class="col-sm-12 sign text-center">