wangchuanjin 9 ani în urmă
părinte
comite
b1a7656860

+ 12 - 11
core/src/web/staticres/wxswordfish/main.js

@@ -57,7 +57,6 @@ function KeyWordDialog(type,clickLi){
 		KeyWordDialog.AppendNode(dialogObj);
 	});
 	dialogObj.find(".submit").click(function(){
-		alert(type);
 		commonAjaxReq(thisClass,type);
 	});
 	if(dialogObj.find(".keyWordGroup").length == 0){
@@ -473,9 +472,12 @@ $(function(){
 			keys[i] = keys[i].replace(/\+/g," ");
 			KeyWordDialog.AppendNode($("#"+type+"-keyword"),keys[i]);
 		}
-		$("#"+type+"-content li:first").append('<div class="com-last">'+keys.join(";")+'</div>');
 		if(!searchnameIsExsit){
+			$("#"+type+"-content li:first .com-last").remove();
+			$("#"+type+"-content li:first").html('<div class="com-last">'+keys.join(";")+'</div>');
 			commonAjaxReq($("#tender-keyword"),type);
+		}else{
+			$("#"+type+"-content li:first").append('<div class="com-last">'+keys.join(";")+'</div>');
 		}
 	}
 	var setScope = function(type,scope){
@@ -503,7 +505,7 @@ $(function(){
 	$("body").append($("#tender-keyword").clone().removeAttr("id").attr("id","bid-keyword"))
 			.append($("#tender-scope").clone().removeAttr("id").attr("id","bid-scope"));
 	if(typeof(msgset.tender) != "undefined"){
-		//setKeyWord("tender",msgset.tender.a_key);
+		setKeyWord("tender",msgset.tender.a_key,false);
 		setScope("tender",msgset.tender.s_scope);
 		if(msgset.tender.i_switchstatus){
 			turnOn($("#tender-on-off"));
@@ -514,7 +516,7 @@ $(function(){
 		}
 	}
 	if(typeof(msgset.bid) != "undefined"){
-		//setKeyWord("bid",msgset.bid.a_key);
+		setKeyWord("bid",msgset.bid.a_key,false);
 		setScope("bid",msgset.bid.s_scope);
 		if(msgset.bid.i_switchstatus){
 			turnOn($("#bid-on-off"));
@@ -601,17 +603,16 @@ $(function(){
 				if(!searchnameIsExsit){
 					keywordes.push(searchname);
 				}
-				setKeyWord(s_type,keywordes,searchnameIsExsit);
 			}else{
 				keywordes.push(searchname)
-				setKeyWord(s_type,keywordes,false);
 			}
-			turnOn($("#"+s_type +"-on-off"));
+			
 		}else{
-			keywordes.push(searchname)
-			setKeyWord(s_type,keywordes,false);
-			turnOn($("#"+s_type +"-on-off"));
+			keywordes.push(searchname);
+		}
+		setKeyWord(s_type,keywordes,searchnameIsExsit);
+		if(!$("#"+s_type +"-on-off").hasClass("open")){
+			$("#"+s_type+"-on-off").click();
 		}
-
 	}
 });

+ 14 - 11
core/src/web/templates/swordfish/wxsearch.html

@@ -56,10 +56,11 @@ body{
 	height:25px;
 }
 .searchzhao1,.searchzhong1{
-	float:left;
-	width:10%;
 	margin-top: 10px;
+	margin-bottom: 10px;
 	cursor:hand;
+	display: inline-block;
+	vertical-align: top;
 }
 
 .searchzhao1 img,.searchzhong1 img{
@@ -67,16 +68,20 @@ body{
 	
 }
 .searchzhao2,.searchzhong2{
-	float:left;
 	margin:0px 5px;
-	width:35%;
+	display: inline-block;
+	margin-bottom: 10px;
+	vertical-align: top;
+	margin-top: 13px;
 }
 .searchzhao3,.searchzhong3{
-	float:left;
-	width:140px;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
+	display: inline-block;
+	margin-bottom: 10px;
+	margin-top: 13px;
+	word-wrap: break-word;
+	word-break: break-all;
+	white-space: normal !important;
+	margin-left: -5px;
 }
 .searchzhao3 span , .searchzhong3 span{
 	float:left;
@@ -107,8 +112,6 @@ body{
 	width:100%;
 }
 .searchbs{
-	height:45px;
-	line-height:45px;
 	cursor:hand;
 }
 .parent-node img {