Merge branch 'develop' of 192.168.3.17:zhanghongbo/qfw into develop

core/src/web/staticres/css/dev-qfw.css

@@ -1110,6 +1110,51 @@ a{
 }
 /*首页css-end*/
 /*服务预约原型css-start*/
+ .b-menu{
+	display: none;
+	z-index: 5;
+	line-height: 34px;
+	position: absolute;
+	top: 45px;
+	left: 0px;
+	background: #FFF;
+	width: 105px;
+	border: 1px solid #e5e6e9;
+	height: 70px;
+	border-radius: 4px;
+}
+ .b-menu div{
+	height:35px;
+	width:103px;
+	text-align:center;
+	cursor:pointer;
+}
+.b-bubble{
+	display:none;
+	position: absolute;
+	top: 35px;
+	z-index: 6;
+	left: 68px;
+	width: 0;
+	height: 0;
+	border-width: 5px;
+	border-style: solid;
+	border-color: transparent  transparent  #e5e6e9;
+	font-size: 0;
+	line-height: 0;
+}
+.b-bubble-outer{
+	display:none;
+	border-color: transparent  transparent  #FFF;
+	top: 36px;
+}
+.typename span{
+	background:none !important;
+}
+.b-menu div:hover{
+	color:#FFF;
+	background:#FF5A5F;
+}
 .a-servicedetail {
 	margin-top:10px;
 }

core/src/web/templates/common/indexhead.html

@@ -14,7 +14,48 @@
 			        </div> <!--/btn-group -->
 					<form method="post" id="searchForm" action="/market/0/list.html">
 						<span id="searchFormBtn"><i class="glyphicon sousuo"></i></span>
-				        <input type="text" name="words" class="form-control" id="header-searchInput" placeholder="找服务" value="{{if .T.querymap}}{{index .T.querymap "query"}}{{end}}">
+				       <input type="text" name="words" class="form-control" id="header-searchInput" placeholder="" value="{{if .T.querymap}}{{index .T.querymap "query"}}{{end}}" style="padding-left:90px;">
+						<div class="b-btngroup" style="position:absolute;top:-14px;left:23px;z-index:2;">
+							<a class="typename" style="color:#A0A0A0;" data="expand"><span class="b-showname">找服务 </span><span class="b-btnsign" style="font-size:11px;background:none;">▼</span></a>
+						</div>
+						<div>
+							<div class="b-bubble"></div>
+							<div class="b-bubble b-bubble-outer"></div>
+							<div class="b-menu">
+								<div data-id="service" id="b-menu-service" style="	border-radius: 4px 4px 0 0;">服务</div>
+								<div data-id="demand" style="	border-radius: 0 0 4px 4px;">需求</div>
+							</div>	
+						</div>
+						<script>
+							$(function(){
+								$("#b-menu-service").bind("mousemove",function(){
+									$(".b-bubble-outer").css("border-color","transparent  transparent  #FF5A5F");
+								});
+								$("#b-menu-service").bind("mouseout",function(){
+									$(".b-bubble-outer").css("border-color","transparent  transparent  #FFF");
+								});
+								$(".typename").click(function(){
+									if ($(".typename").attr("data")!="expand"){
+										$(".typename span.b-btnsign").text("▼");
+										$(".b-menu").hide();
+										$(".b-bubble").hide();
+										$(".typename").attr("data","expand");
+									}else{
+										$(".typename span.b-btnsign").text("▲");
+										$(".b-menu").show();
+										$(".b-bubble").show();
+										$(".typename").attr("data","close");
+									}
+								});
+								$(".b-menu>div").bind("click",function(n,b){
+									$("#c_searchtype").val($(n.target).attr("data-id"));
+									$(".b-menu").trigger("changecontent");
+									$(".b-showname").text("找"+$(n.target).text());
+									$(".typename").trigger("click");
+									return false;
+								});
+							});
+						</script>
 						<input type="hidden" name="city" id="city" value="">
 						<input type="hidden" name="cityNo" id="cityNo" value="">
 						<!-- 服务市场 -->

core/src/web/templates/service/list.html

@@ -289,6 +289,12 @@
 	var c_searchtype={{.T.querymap.c_searchtype}}
 	var fwlb = {{.T.serviceStr}}
 	$(function(){
+		$(".b-menu").bind("changecontent",function(){$("#searchForm").submit();});
+		if ($("#c_searchtype").val()=="demand"){
+			$(".b-showname").text("找需求");
+		}else{
+			$(".b-showname").text("找服务");
+		}
 		$(window).bind("resize",function(){
 			if(document.body.clientWidth<1209){
 					$(".a-content.container-fluid").css("width","");