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

core/src/qfw/search/wxsearchservice.go

@@ -7,7 +7,6 @@ import (
 	"github.com/go-xweb/xweb"
 	"github.com/p/mahonia"
 	"html/template"
-	"log"
 	"qfw/coreutil"
 	"qfw/mobile"
 	. "qfw/util"
@@ -441,7 +440,6 @@ func wxsearhWebContententMp(querymap map[string]string, n *Wxsearch, reqType str
 	    "from": 0,"size": 10,
 	    "sort": [{"OpSint": "desc","RegCap": "desc"}]
 	}`
-	log.Println(query)
 	//查询列表数据
 	client := elastic.GetEsConn()
 	defer elastic.DestoryEsConn(client)

core/src/web/staticres/css/mobile/incmobile.css

@@ -60,11 +60,13 @@ ul{
 .m-searchbar .searchbtn1{
 	display: inline-block;
 	position: absolute;
-	height: 30px;
+	height: 28px;
 	line-height: 30px;
-	margin: 0 0 0 -72px;
+	margin: 1px 0 0 -80px;
 	text-align: center;
 	color: #A0A0A0;
+	background: #FFF;
+	width: 30px;
 }
 .m-searchbar .searchbtn b{
 	color:#FFF;
@@ -114,6 +116,15 @@ hr.list{
 	margin-top:10px;
 	padding:0;
 }
+span#camera {
+    height: 38px;
+    margin-top: -12px;
+    line-height: 40px;
+    background: #FFF;
+    width: 30px;
+    text-align: center;
+    margin-right: -9px;
+}
 .loadmore{
 	width:250px;
 	height:35px;
@@ -568,7 +579,9 @@ hr.list{
 	font-size:13px;
 	color:#16A086;
 }
-
+.inline-shows{
+	display:inline-block;
+}
 /*搜索首页*/
 #case2 a{
 	color:#3399FF;

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

@@ -69,7 +69,7 @@
 		</strong></h6>
 	</div>
 	</div>
-	<center style="clear:both;"><a class="loadmore btn btn-link hides" style="display:inline-block;" onclick="loadData();">加载更多</a></center>
+	<center style="clear:both;"><a class="loadmore btn btn-link hides"  onclick="loadData();">加载更多</a></center>
 	<center class="nomore hides"><div style="margin:20px;">没有搜索到？尝试更精确的搜索条件!</div></center>
 	</div>
 	<script src="/js/jquery.js"></script>
@@ -83,11 +83,15 @@
 			mCommunity().initIndex();
 			if(data.length>10){
 				data=eval(data);
-				$(".loadmore").show();
+				console.log(data);
+				if(data.length>5){
+					$(".loadmore").removeClass("hides");
+					$(".loadmore").addClass("inline-shows");
+				}
 				loadData();
 			}else{
 				data=[];
-				$(".loadmore").hide();
+				$(".loadmore").addClass("hides");
 				$("#finderror").show();
 				if (entcard&&entcard!=""){
 					var tip="<p>没有找到{ent0},</p><p> 如果这不是企业名称，请选择名片上的企业名称</p><p>{ent1}&nbsp;{ent2}&nbsp;{ent3}</p>"
@@ -235,7 +239,7 @@
 							$("#query").val(obj["names"][0]);
 							$("#i_mingpian").val("1");
 							$("#mingpian").val(obj["names"].join(","));
-							$("#search").submit();	
+							$("#queryform").submit();
 						}else{
 							alert("没有成功识别!");
 						}