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

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

@@ -11,7 +11,7 @@
 	width: 520px;
 	height: 440px;
 }
-.loginModal a,.loginModal .text-primary{
+.loginModal .text-primary{
 	color: #ff5a5f !important;
 }
 .loginForm{
@@ -302,7 +302,7 @@ function afterLoginSkip(data,flag){
 							  	<a class="pull-right text-primary" href="/front/findpwd">忘记密码?</a>
 						  	</div>
 						  	<div class="form-group text-center margin-t-20">
-						    	<button type="submit" class="btn btn-primary" style="background-color: #ff5a5f;width: 100%;">登录</button>
+						    	<button type="submit" class="btn btn-primary" style="background-color: #ff5a5f;border-color: #ff5a5f;width: 100%;">登录</button>
 						  	</div>
 						</form>
 					</div>

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

@@ -134,7 +134,10 @@
 							{{if .T.einfo.s_qq}}
 							<span class="glyphicon qq1 icon_gray  text-muted"  ></span><span class="text-muted"><a href="tencent://message/?uin={{.T.einfo.s_qq}}&Site=hexun.com/ngdao&Menu=yes" class="margin-r-10"><img src="/images/u124.png" style="margin-top:-10px;cursor:pointer;" /></a></span>
 							{{end}}
-							<br/><span class="glyphicon dizhi icon_gray  text-muted"  ></span><span class="text-muted"><span id="de-address"></span> </span><br/>
+							<br/><span class="glyphicon dizhi icon_gray  text-muted"  ></span><span class="text-muted"><span id="de-address"></span><a href="javascript:void(0)" onclick="showMap()">查看详细地图</a>
+								<input id="location" type="hidden" value="">
+								<input id="cityname" type="hidden" value="">
+							</span><br/>
 						</div>
 		 			</div>
 		 </div>
@@ -297,11 +300,20 @@
 	{{include "/common/hotservice.html"}}
 	</div>
 </div>
+<!--显示地图信息-->
+<div id="mapshowdiv" class="white_content"></div>
+<a href ="javascript:void(0)" onclick="closeMap();"><div id="closeshowmap" class="closeshowmap">X</div></a>
+<div id="fade" class="black_overlay"></div>
 {{include "/common/bottom.html"}}
 <script type="text/javascript">
 compulsoryreRresh = true;
 $(function(){
-	
+	//获取地图的经纬度
+	loadJS("http://api.map.baidu.com/getscript?v=2&ak=AFd8b176f363f23e6a23d516f4cfb742&services=&t=20150522093217",function(){
+		loadJS("/js/geocoder.js",function(){
+			doOptions();
+		});
+	});
 	$(".d_fwfl a").eq(0).addClass("d_fwfl")
 	$(".m-comment li").mouseover(function(a,b,c){
 			var node=$(a.currentTarget);
@@ -627,6 +639,20 @@ function comment(){
 				$(".glyphicon.dizhi.icon_gray.text-muted").remove();
 			}
 		});
+		//显示地图
+	function showMap(){
+		document.getElementById('mapshowdiv').style.display = 'block';
+		document.getElementById('closeshowmap').style.display = 'block';
+		document.getElementById('fade').style.display = 'block';
+		$("html,body").addClass("overflow-hidden");
+	}
+	//关闭地图
+	function closeMap(){
+		document.getElementById('mapshowdiv').style.display = 'none';
+		document.getElementById('closeshowmap').style.display = 'none';
+		document.getElementById('fade').style.display = 'none';
+		$("html,body").removeClass("overflow-hidden");
+	}
 	</script>
 	
 <script src="/js/jquery.cxselect.js" type="text/javascript"> </script>

core/src/web/templates/swordfish/infolist.html

@@ -57,22 +57,12 @@ $(function(){
 			var str="";
 			for(var i=0;i<res.length;i++){
 				var temp=res[i];
-				var s_type = temp["s_type"];
-				s_type = "bid";
-				if(s_type == "bid"){
-					s_type = "中标";
-				}else if(s_type == "tender"){
-					s_type = "招标";
-				}
-				if(s_type != ""){
-					str+="<span style='display: none;' class='dataType'>【"+s_type+"】</span>";
-				}
 				str+=temp["s_content"];
 				a_visitedindex=temp["a_visitedindex"];
 				a_publishtime=temp["a_publishtime"];
 				f_id=temp["_id"];
 			}
-			$("#conlist").append('<div id="ycwords">'+str+'</div>');			
+			$("#conlist").append('<div id="ycwords" datatype="'+temp["s_type"]+'">'+str+'</div>');			
 			//信息条总数
 			le=$(".tslist").length;
 			//
@@ -85,18 +75,24 @@ $(function(){
 				var html = $(this).html();
 				for(var i=0;i<s_words.length;i++){
 					if(s_words[i] != ""){
-						var reg = new RegExp(s_words[i],"gm");
-						html = html.replace(reg,function(word){
-							return '<font class="keyword">'+word+'</font>';
-						});
+						var wordsArray = s_words[i].split("+");
+						for(var si=0;si<wordsArray.length;si++){
+							var reg = new RegExp(wordsArray[si],"gm");
+							html = html.replace(reg,function(word){
+								return '<font class="keyword">'+word+'</font>';
+							});
+						}
 					}
 				}
 				for(var i=0;i<a_interest.length;i++){
 					if(a_interest[i] != ""){
-						var reg = new RegExp(a_interest[i],"gm");
-						html = html.replace(reg,function(word){
-							return '<font class="keyword">'+word+'</font>';
-						});
+						var interestArray = a_interest[i].split("+");
+						for(var si=0;si<interestArray.length;si++){
+							var reg = new RegExp(interestArray[si],"gm");
+							html = html.replace(reg,function(word){
+								return '<font class="keyword">'+word+'</font>';
+							});
+						}
 					}
 				}
 				$(this).html(html);
@@ -109,7 +105,15 @@ $(function(){
 						}
 					}
 				}
-				$(this).find("a.bt").wrap("<div class='bt-parent' id="+xh+"></div>");
+				var datatype = $(this).parents("#ycwords").attr("datatype");
+				if(datatype == "bid"){
+					datatype = "【中标】";
+				}else if(datatype == "tender"){
+					datatype = "【招标】";
+				}else{
+					datatype = "";
+				}
+				$(this).find("a.bt").prepend(datatype).wrap("<div class='bt-parent' id="+xh+"></div>");
 				$(this).append(function(){
 					if(a_publishtime == "" || typeof(a_publishtime[xh]) == "undefined"){
 						return "";
@@ -187,23 +191,13 @@ function loadMore(){
 			var str="";
 			for(var i=0;i<res.length;i++){
 				var temp=res[i];
-				var s_type = temp["s_type"];
-				s_type = "bid";
-				if(s_type == "bid"){
-					s_type = "中标";
-				}else if(s_type == "tender"){
-					s_type = "招标";
-				}
-				if(s_type != ""){
-					str+="<span style='display: none;' class='dataType'>【"+s_type+"】</span>";
-				}
 				str+=temp["s_content"];
 				a_visitedindex=temp["a_visitedindex"];
 				a_publishtime=temp["a_publishtime"];
 				f_id=temp["_id"];
 			}
 			
-			$("#conlist").append('<div id="ycwords">'+str+'</div>');
+			$("#conlist").append('<div id="ycwords" datatype="'+temp["s_type"]+'">'+str+'</div>');
 			//
 			$(".tslist").each(function(n){
 				$(this).children(".xh").text(function(i,v){
@@ -214,18 +208,24 @@ function loadMore(){
 				var html = $(this).html();
 				for(var i=0;i<s_words.length;i++){
 					if(s_words[i] != ""){
-						var reg = new RegExp(s_words[i],"gm");
-						html = html.replace(reg,function(word){
-							return '<font class="keyword">'+word+'</font>';
-						});
+						var wordsArray = s_words[i].split("+");
+						for(var si=0;si<wordsArray.length;si++){
+							var reg = new RegExp(wordsArray[si],"gm");
+							html = html.replace(reg,function(word){
+								return '<font class="keyword">'+word+'</font>';
+							});
+						}
 					}
 				}
 				for(var i=0;i<a_interest.length;i++){
 					if(a_interest[i] != ""){
-						var reg = new RegExp(a_interest[i],"gm");
-						html = html.replace(reg,function(word){
-							return '<font class="keyword">'+word+'</font>';
-						});
+						var interestArray = a_interest[i].split("+");
+						for(var si=0;si<interestArray.length;si++){
+							var reg = new RegExp(interestArray[si],"gm");
+							html = html.replace(reg,function(word){
+								return '<font class="keyword">'+word+'</font>';
+							});
+						}
 					}
 				}
 				$(this).html(html);
@@ -240,7 +240,15 @@ function loadMore(){
 					}
 				}
 				if($(this).children(".time-diff").length == 0){
-					$(this).find("a.bt").wrap("<div class='bt-parent' id="+vi+"></div>");
+					var datatype = $(this).parents("#ycwords").attr("datatype");
+					if(datatype == "bid"){
+						datatype = "【中标】";
+					}else if(datatype == "tender"){
+						datatype = "【招标】";
+					}else{
+						datatype = "";
+					}
+					$(this).find("a.bt").prepend(datatype).wrap("<div class='bt-parent' id="+vi+"></div>");
 					$(this).append(function(){
 						if(a_publishtime == "" || typeof(a_publishtime[vi]) == "undefined"){
 							return "";