wangshan 5 tahun lalu
induk
melakukan
eb4443e233

+ 2 - 16
src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html

@@ -825,10 +825,9 @@
 	    });
 		//查询是否开通超级搜索和中标企业搜索
 	    $.post("/jyapp/jylab/supsearch/getstatus?t="+new Date().getTime(),function(result){
-			  $("#searchIndex .inp-search").unbind("touchend").on("touchend",function () {
-<<<<<<< HEAD
+			$("#searchIndex .inp-search").unbind("touchend").on("touchend",function () {
 		        SuperSearch.init(true,true,true);
-		      });
+		    });
 			if(result.userId==""){
 				userId = "";
 				//中标企业搜索跳转
@@ -849,19 +848,6 @@
 						EntSearch.init(true,true,true);
 			    });
 			}
-=======
-	        SuperSearch.init(true,true,true);
-	      });
-
-			userId = result.userId;
-			SuperSearch.openTablepro=result.tablepro;
-			//中标企业搜索跳转
-	    $(".content ul li a:eq(0)").unbind("tap").on("tap",function(){
-				EntSearch.clearSessionStorage();
-				EntSearch.init(true,true,true);
-	    });
-
->>>>>>> dev2.8.4
 	    });
 	}
 	function backThisPage(){