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

core/src/timetask.json

@@ -1 +1 @@
-{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-03-21 16:30:45"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-03-21 16:30:45"}},"marketisstart":true,"marketrate":300}
+{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-03-21 16:42:20"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-03-21 16:42:20"}},"marketisstart":true,"marketrate":300}

core/src/web/templates/index.html

@@ -481,7 +481,7 @@ $(function(){
 				},4000);
 			});*/
 		}else{
-			$(".a-index-hd").append('<a href="http://iot.huizhuozz.com" target="_blank"><img src="{{Msg "seo" "cdn"}}/images/wlw.png"></a>');
+			$(".a-index-hd").append('{{$s:=(Ad "index-center-11" 1)}}{{range $k,$v := $s}}<a {{if $v.s_link}} target="_blank"  href="{{$v.s_link}}"{{end}}><img {{if $v.s_pic}} src="{{$v.s_pic}}" {{end}} ></a>{{end}}');
 		}
 		var oldImgSrc = null;
 		$("#iWant>div").mouseover(function(){

core/src/web/templates/member/incmobile/index.html

@@ -129,10 +129,11 @@ if(typeof(signature) != "undefined" && signature != null && signature.length ==
 				查企业，查企业失信信息，查企业变更，查你所想，无所不能...
 			</div>
 			<div style="clear:both;" class="col-sm-8">
-              <form method="post"  action="/search/enterprise/ent.html">
+              <form method="post"  action="/search/enterprise/ent.html" id="search">
 						<div class="input-group col-xs-12">
 							<i class="glyphicon glyphicon-search input-before"></i>
                  		<input type="text" id="query" class="form-control" name="words" placeholder="找企业"  >
+							<input type="hidden" name="i_mingpian" id="i_mingpian" value="" />
 							<span class="input-group-addon"><span class="glyphicon glyphicon-camera"></span></span>
              		</div>
 					</form>
@@ -183,7 +184,9 @@ function getmpname(serverId){
         cache: false, 
         error: function(){return false;}, 
         success:function(obj){
-			alert(obj["name"]);
+			 $("#query").val(obj["name"]);
+			 $("#i_mingpian").val("1");
+			 $("#search").submit();
         } 
     }); 
 }