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

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

@@ -144,6 +144,12 @@ a.none:hover {
     white-space: nowrap;	
 }
 
+.text-link {
+	color: #5e696e;
+  	cursor: pointer;
+  	text-decoration: underline;
+}
+
 .form-control {
 	border-color: #e1e1e1;
 }
@@ -152,6 +158,12 @@ a.none:hover {
 	border-color: #3399CC;
 }
 
+.form-group-sm .form-control-feedback {
+  	width: 30px;
+  	height: 30px;
+  	line-height: 30px;
+}
+
 .btn-default {
 	border-color: #dcdcdc;
 }
@@ -194,7 +206,7 @@ a.none:hover {
 	border-color: #eee;
 	webkit-box-shadow: none;
 	box-shadow: none;
-	margin-top: -1px;
+	margin-top: -2px;
 	min-width: 100%;
 	font-size: 12px;
 }
@@ -1963,4 +1975,22 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
   	top: 0;
   	left: 0;
   	opacity: 0;
+}
+/*search*/
+.search-advance {
+	position: absolute;
+	right: 35px;
+	top: 5px;
+  	line-height: 20px;
+  	visibility: hidden;
+  	white-space: nowrap;
+  	cursor: pointer;
+}
+
+.search-advance.active,input[type="search"]:focus + .search-advance{
+	visibility: visible;
+}
+
+.has-feedback input[type="search"] {
+  	padding-right: 80px;
 }

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

@@ -125,10 +125,15 @@
 			</div>
 			<div class="col-xs-6">
 				<div class="search">
-					<div class="form-group form-group-sm has-feedback">
-						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" /><span
-							class="form-control-feedback text-simple"><i
-							class="fa fa-search"></i></span>
+					<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
+						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" />
+						<div class="search-advance text-link" ng-class="{'active': searchAdvance}" dropdown-toggle>高级搜索</div>
+						<div class="dropdown-menu">
+						   <div class="block">
+						   	111
+						   </div>
+						</div>
+						<span class="form-control-feedback text-simple"><i class="fa fa-search"></i></span>
 					</div>
 				</div>
 			</div>