Browse Source

修改列表路径

李广朋 9 years ago
parent
commit
75fd85830c

+ 3 - 3
core/src/qfw/search/wxsearch.go

@@ -10,9 +10,9 @@ import (
 
 type Wxsearch struct {
 	*xweb.Action
-	wxIndex             xweb.Mapper `xweb:"/wx/search/enterprise/index.html"`              //查询企业列表
-	wxMingpian          xweb.Mapper `xweb:"/wx/search/enterprise/mingpian"`                //获取名片
-	wxgetEnterpriseList xweb.Mapper `xweb:"/wx/search/enterprise/([^.]*)list([^.]*).html"` //查询企业列表
+	wxIndex             xweb.Mapper `xweb:"/wx/search/enterprise/index.html"`           //查询企业列表
+	wxMingpian          xweb.Mapper `xweb:"/wx/search/enterprise/mingpian"`             //获取名片
+	wxgetEnterpriseList xweb.Mapper `xweb:"/wx/search/enterprise/m/([^.]*)list([^.]*)"` //查询企业列表
 }
 
 var mpian_reg *regexp.Regexp //名片

+ 7 - 6
core/src/qfw/search/wxsearchservice.go

@@ -1,12 +1,12 @@
 package search
 
 import (
-	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"github.com/go-xweb/xweb"
 	"github.com/p/mahonia"
 	"html/template"
+	"log"
 	"qfw/coreutil"
 	"qfw/mobile"
 	. "qfw/util"
@@ -31,9 +31,11 @@ func (n *Wxsearch) WxIndex() error {
 func (n *Wxsearch) WxgetEnterpriseList(reqType, param /*参数*/ string) error {
 	n.T["signature"] = mobile.GetSignature(n.Url())
 	i_mingpian := n.GetString("i_mingpian") //是否走名片查询
-	if len(param) == 0 {
+	log.Println(n.Method())
+	if n.Method() == "POST" {
 		//请求是表单提交,走的查询
 		//拼装查询对象
+		log.Println("进入POST查找")
 		querymap := map[string]string{ //"words": n.GetString("s_value"),
 			"perPage":     "20",
 			"currentPage": n.GetString("currentPage"),
@@ -45,7 +47,7 @@ func (n *Wxsearch) WxgetEnterpriseList(reqType, param /*参数*/ string) error {
 			"c_author":    n.GetString("c_author"),
 			"cityNo":      n.GetString("cityNo"), //是否是第一次查询并且没有选择地市,自动根据IP来设
 		}
-
+		log.Println(querymap, "---------------------------", n, reqType)
 		//查询生成列表数据
 		var data *[]map[string]interface{}
 		if i_mingpian != "" {
@@ -53,7 +55,9 @@ func (n *Wxsearch) WxgetEnterpriseList(reqType, param /*参数*/ string) error {
 		} else {
 			data = wxsearhWebContentent(querymap, n, reqType)
 		}
+		log.Println(data)
 		rs := FormatData(data)
+		log.Println(rs)
 		querymap["entcard"] = n.GetString("mingpian")
 		if n.GetString("currentPage") != "" {
 			return n.Write(rs)
@@ -61,10 +65,7 @@ func (n *Wxsearch) WxgetEnterpriseList(reqType, param /*参数*/ string) error {
 		n.Render("/member/incmobile/list.html", &xweb.T{"data": rs, "querymap": querymap})
 	} else {
 		//反转生成map
-		paramstr := param[1:]
-		bs, _ := base64.StdEncoding.DecodeString(paramstr)
 		querymap := map[string]string{}
-		json.Unmarshal(bs, &querymap)
 		data := wxsearhWebContentent(querymap, n, reqType)
 		rs := FormatData(data)
 		n.Render("/member/incmobile/list.html", &xweb.T{"data": rs, "querymap": querymap})

+ 3 - 3
core/src/web/staticres/css/mobile/incmobile.css

@@ -60,9 +60,9 @@ ul{
 .m-searchbar .searchbtn1{
 	display: inline-block;
 	position: absolute;
-	height: 28px;
+	height: 26px;
 	line-height: 30px;
-	margin: 1px 0 0 -80px;
+	margin: 3px 0 0 -80px;
 	text-align: center;
 	color: #A0A0A0;
 	background: #FFF;
@@ -121,7 +121,7 @@ span#camera {
     margin-top: -12px;
     line-height: 40px;
     background: #FFF;
-    width: 30px;
+    width: 35px;
     text-align: center;
     margin-right: -9px;
 }

BIN
core/src/web/staticres/images/mobile/mobilebottom.png


+ 2 - 8
core/src/web/templates/member/incmobile/index.html

@@ -62,7 +62,7 @@ if(typeof(signature) != "undefined" && signature != null && signature.length ==
 				查企业,查企业失信信息,查企业变更,查你所想,无所不能...
 			</div>
 			<div style="clear:both;" class="col-sm-8">
-              <form method="post"  action="/wx/search/enterprise/list.html" id="search">
+              <form method="post"  action="/wx/search/enterprise/m/list" id="search">
 						<div class="input-group col-xs-12">
                  		<input type="text" id="query" class="form-control"  style="height:40px;" name="words" placeholder="找企业"  >
 							<input type="hidden" name="i_mingpian" id="i_mingpian" value="" />
@@ -75,13 +75,7 @@ if(typeof(signature) != "undefined" && signature != null && signature.length ==
 		</div>
 		<footer class="footer">
 	      <div class="container">
-	         <div>
-						<img src="/images/bottom_logo.png" width=50 />	
-				</div>
-				<div class="inc">
-							<i><b>企 明 星</b></i>
-							<p >企业服务网</p>
-						</div>
+						<img src="/images/mobile/mobilebottom.png" width=110 />	
 	      </div>
 		</footer>
 <script src="/js/jquery.js"></script>

+ 3 - 5
core/src/web/templates/member/incmobile/list.html

@@ -83,7 +83,6 @@
 			mCommunity().initIndex();
 			if(data.length>10){
 				data=eval(data);
-				console.log(data);
 				if(data.length>5){
 					$(".loadmore").removeClass("hides");
 					$(".loadmore").addClass("inline-shows");
@@ -259,14 +258,13 @@
 				"currentPage":++currentPage
 			};
 			$.ajax({
-				url:"/wx/search/enterprise/list.html",
+				url:"/wx/search/enterprise/m/list"+(new Date().getTime()),
 				data:query,
-				type:"post",
+				type:"POST",
 				dataType:"json",
 				success:function(r){
-					if (typeof(r)=="object"){
+					if (typeof(r)=="object" && r.length!=0){
 							data=data.concat(r);
-							
 					}else{
 						$(".loadmore").hide();
 						$(".nomore").show();