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

core/src/web/staticres/wxswordfish/style.css

@@ -695,48 +695,4 @@ img{
 	top: 0px;
 	bottom: 0px;
 	display: none;
-}
-.scroller{
-	overflow-y: auto;
-	-webkit-tap-highlight-color: rgba(0,0,0,0);
-	-webkit-transform: translateZ(0);
-	-moz-transform: translateZ(0);
-	-ms-transform: translateZ(0);
-	-o-transform: translateZ(0);
-	transform: translateZ(0);
-	-webkit-touch-callout: none;
-	-webkit-user-select: none;
-	-moz-user-select: none;
-	-ms-user-select: none;
-	user-select: none;
-	-webkit-text-size-adjust: none;
-	-moz-text-size-adjust: none;
-	-ms-text-size-adjust: none;
-	-o-text-size-adjust: none;
-	text-size-adjust: none;
-}
-.iScrollVerticalScrollbar{
-	position: absolute;
-    z-index: 9999;
-    width: 5px;
-    bottom: 2px;
-    top: 2px;
-    right: 3px;
-    overflow: hidden;
-    transform: translateZ(0px);
-    transition-duration: 500ms;
-    opacity: 0;
-}
-.iScrollIndicator{
-	box-sizing: border-box;
-    position: absolute;
-    border: 1px solid rgba(255, 255, 255, 0.901961);
-    border-radius: 4px;
-    width: 100%;
-    transition-duration: 0ms;
-    display: block;
-    transform: translate(0px, 0px) translateZ(0px);
-    background: rgba(0, 0, 0, 0.498039);
-	opacity: 0.5;
-	height: 100px;
 }

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

@@ -21,7 +21,7 @@ $(function(){
 	if (!flog){
 		$(".nullcontent").removeClass("hidden");
 		$(".resbm").addClass("hidden");
-		$(".scroller").addClass("hidden");
+		$("#wrapper").addClass("hidden");
 	}else{
 		$("#resbm").removeClass("hidden");
 		var str = ""
@@ -30,7 +30,7 @@ $(function(){
 		a_visitedindex=temp["a_visitedindex"];
 		a_publishtime=temp["a_publishtime"];
 		f_id=temp["_id"];
-		$(".scroller").append('<div id="ycwords" datatype="'+temp["s_type"]+'">'+str+'</div>')
+		$("#wrapper").append('<div id="ycwords" datatype="'+temp["s_type"]+'">'+str+'</div>')
 		//信息条总数
 		le=$(".tslist").length;
 		//
@@ -254,19 +254,13 @@ body{
 #wrapper,.nullcontent{
 	padding:0px 20px;
 	background-color:#fff;
-	position: absolute;
-    top: 65px;
-	left: 0px;
-	right: 0px;
-	overflow: auto;
-	z-index: 1;
 }
 .nullcontent{
 	bottom: 46px;
 	padding-top: 30%;
 }
 #wrapper{
-	bottom: 98px;
+	padding-bottom: 98px;
 }
 .tslist{
 	border-bottom: 1px solid #e5e6e9;
@@ -314,12 +308,7 @@ body{
 <i class="glyphicon sousuo"></i>
 </span>
 </div>
-<div id="wrapper">
-	<div class="scroller">
-	
-	</div>
-</div>
-
+<div id="wrapper"></div>
 </div>
 <div class="resbm" >
 <div class="rests">确认关键词的查询结果无误</div>