调整了一些外观

core/src/qfw/search/searchService.go

@@ -7,7 +7,6 @@ import (
 	"github.com/go-xweb/xweb"
 	"gopkg.in/mgo.v2/bson"
 	"html/template"
-	"log"
 	"qfw/front"
 	. "qfw/member"
 	. "qfw/util"
@@ -17,6 +16,7 @@ import (
 	ip "qfw/util/ip17mon"
 	. "qfw/util/mongodb"
 	"qfw/util/redis"
+	"regexp"
 	"strconv"
 	"strings"
 )
@@ -33,8 +33,9 @@ type EntInfo struct {
 
 //企业社区首页
 func (search *Search) EntCommunity() error {
-	ismobile := strings.Index(search.Header("User-Agent"), "Mobile")
-	if ismobile > -1 {
+	regex, _ := regexp.Compile("(Android|Mobile)")
+	ismobile := regex.FindAllString(search.Header("User-Agent"), -1)
+	if len(ismobile) > 0 {
 		search.Render("/member/incmobile/index.html")
 		return nil
 	}
@@ -137,8 +138,7 @@ func (n *Search) GetEnterpriseList(reqType, param /*参数*/ string) error {
 	//必须是登录之后的已认证用户才可以进入企业社区
 	//if ui, _ := (n.GetSession("userInfo")).(*map[string]interface{}); reqType == "m_" || (n.GetSession("userType") != nil && IntAll(n.GetSession("userType")) > 0) && ((n.GetSession("identWay") != nil && IntAll(n.GetSession("identWay")) == 1) || ((*ui)["s_pid"] != nil && (*ui)["s_pid"].(string) != "")) {
 	//n.T["uri"] = n.Uri()
-	ismobile := strings.Index(n.Header("User-Agent"), "Mobile")
-	i_mingpian := n.GetString("i_mingpian") //是否走名片查询
+
 	if len(param) == 0 {
 		//请求是表单提交，走的查询
 		//拼装查询对象
@@ -155,18 +155,8 @@ func (n *Search) GetEnterpriseList(reqType, param /*参数*/ string) error {
 			"cityNo":      n.GetString("cityNo"), // 是否是第一次查询并且没有选择地市，自动根据IP来设
 		}
 		//查询生成列表数据
-		var data *[]map[string]interface{}
-		var pagination *[]interface{}
-		var has bool = false
-		if i_mingpian != "" {
-			data, pagination, has = searhWebContententMp(querymap, n, reqType, false)
-			if !has {
-				data, pagination = searhWebContentent(querymap, n, reqType)
-			}
-		} else {
-			data, pagination = searhWebContentent(querymap, n, reqType)
-		}
-		log.Println(len(*data))
+		data, pagination := searhWebContentent(querymap, n, reqType)
+
 		//查询送积分
 		queryStr := querymap["query"]
 		if len(queryStr) > 0 {
@@ -181,25 +171,7 @@ func (n *Search) GetEnterpriseList(reqType, param /*参数*/ string) error {
 				}
 			}
 		}
-		if ismobile > -1 {
-			entinfos := make([]map[string]string, 0)
-			for _, v := range *data {
-				tmp := map[string]string{
-					"_id":           fmt.Sprint(v["_id"]),
-					"EntName":       fmt.Sprint(v["EntName"]),
-					"RegNo":         fmt.Sprint(v["RegNo"]),
-					"LeRep":         fmt.Sprint(v["LeRep"]),
-					"OpLocDistrict": fmt.Sprint(v["OpLocDistrict"]),
-					"EstDate":       fmt.Sprint(v["EstDate"]),
-					"OpStateName":   fmt.Sprint(v["OpStateName"]),
-				}
-				entinfos = append(entinfos, tmp)
-			}
-			d, _ := json.Marshal(entinfos)
-			n.Render("/member/incmobile/list.html", &xweb.T{"data": string(d)})
-		} else {
-			n.Render("/search/enterpriseList.html", &xweb.T{"querymap": querymap, "data": data, "pagination": pagination})
-		}
+		n.Render("/search/enterpriseList.html", &xweb.T{"querymap": querymap, "data": data, "pagination": pagination})
 	} else {
 		//反转生成map
 		paramstr := param[1:]
@@ -208,27 +180,12 @@ func (n *Search) GetEnterpriseList(reqType, param /*参数*/ string) error {
 
 		json.Unmarshal(bs, &querymap)
 		data, pagination := searhWebContentent(querymap, n, reqType)
-		if ismobile > -1 {
-			entinfos := make([]map[string]string, 0)
-			for _, v := range *data {
-				tmp := map[string]string{
-					"_id":           fmt.Sprint(v["_id"]),
-					"EntName":       fmt.Sprint(v["EntName"]),
-					"RegNo":         fmt.Sprint(v["RegNo"]),
-					"LeRep":         fmt.Sprint(v["LeRep"]),
-					"OpLocDistrict": fmt.Sprint(v["OpLocDistrict"]),
-					"EstDate":       fmt.Sprint(v["EstDate"]),
-					"OpStateName":   fmt.Sprint(v["OpStateName"]),
-				}
-				entinfos = append(entinfos, tmp)
-			}
-			d, _ := json.Marshal(entinfos)
-			n.Render("/member/incmobile/list.html", &xweb.T{"data": string(d)})
-		} else {
-			n.Render("/search/enterpriseList.html", &xweb.T{"querymap": querymap, "data": data, "pagination": pagination})
-		}
+		n.Render("/search/enterpriseList.html", &xweb.T{"querymap": querymap, "data": data, "pagination": pagination})
 	}
 	return nil
+	//} else {
+	//return n.Render("/search/entcommunity.html")
+	//}
 }
 
 //即时搜索

core/src/qfw/search/wxsearchservice.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/go-xweb/xweb"
+	"github.com/p/mahonia"
 	"html/template"
 	"log"
 	"qfw/coreutil"
@@ -113,6 +114,7 @@ func (n *Wxsearch) WxgetEnterpriseList(reqType, param /*参数*/ string) error {
 	//必须是登录之后的已认证用户才可以进入企业社区
 	//if ui, _ := (n.GetSession("userInfo")).(*map[string]interface{}); reqType == "m_" || (n.GetSession("userType") != nil && IntAll(n.GetSession("userType")) > 0) && ((n.GetSession("identWay") != nil && IntAll(n.GetSession("identWay")) == 1) || ((*ui)["s_pid"] != nil && (*ui)["s_pid"].(string) != "")) {
 	//n.T["uri"] = n.Uri()
+	log.Println(n.Header("User-Agent"))
 	i_mingpian := n.GetString("i_mingpian") //是否走名片查询
 	if len(param) == 0 {
 		//请求是表单提交，走的查询
@@ -129,31 +131,52 @@ func (n *Wxsearch) WxgetEnterpriseList(reqType, param /*参数*/ string) error {
 			"cityNo":      n.GetString("cityNo"), //是否是第一次查询并且没有选择地市，自动根据IP来设
 		}
 		//查询生成列表数据
+		var data *[]map[string]interface{}
+		var has bool
 		if i_mingpian != "" {
-			data, pagination, has := wxsearhWebContententMp(querymap, n, reqType, false)
-			n.Render("/member/incombile/list.html", &xweb.T{"querymap": querymap, "data": data, "pagination": pagination})
+			data, _, has = wxsearhWebContententMp(querymap, n, reqType, false)
 			if !has {
-				data, pagination := wxsearhWebContentent(querymap, n, reqType)
-				n.Render("/member/incombile/list.html", &xweb.T{"querymap": querymap, "data": data, "pagination": pagination})
+				data, _ = wxsearhWebContentent(querymap, n, reqType)
 			}
 		} else {
-			data, pagination := wxsearhWebContentent(querymap, n, reqType)
-			n.Render("/member/incombile/list.html", &xweb.T{"querymap": querymap, "data": data, "pagination": pagination})
+			data, _ = wxsearhWebContentent(querymap, n, reqType)
 		}
+		rs := FormatData(data)
+		log.Println("阿斯顿发送到发送到发的", string(rs))
+		n.Render("/member/incmobile/list.html", &xweb.T{"data": rs})
 	} else {
 		//反转生成map
 		paramstr := param[1:]
 		bs, _ := base64.StdEncoding.DecodeString(paramstr)
 		querymap := map[string]string{}
-
 		json.Unmarshal(bs, &querymap)
-		log.Println(querymap)
-		data, pagination := wxsearhWebContentent(querymap, n, reqType)
-		n.Render("/member/incombile/list.html", &xweb.T{"querymap": querymap, "data": data, "pagination": pagination})
+		data, _ := wxsearhWebContentent(querymap, n, reqType)
+		rs := FormatData(data)
+		n.Render("/member/incmobile/list.html", &xweb.T{"data": rs})
 	}
 	return nil
 }
 
+func FormatData(data *[]map[string]interface{}) string {
+	entinfos := make([]map[string]string, 0)
+	for _, v := range *data {
+		tmp := map[string]string{
+			"_id":           fmt.Sprint(v["_id"]),
+			"EntName":       fmt.Sprint(v["EntName"]),
+			"RegNo":         fmt.Sprint(v["RegNo"]),
+			"LeRep":         fmt.Sprint(v["LeRep"]),
+			"OpLocDistrict": fmt.Sprint(v["OpLocDistrict"]),
+			"EstDate":       fmt.Sprint(v["EstDate"]),
+			"OpStateName":   fmt.Sprint(v["OpStateName"]),
+		}
+		entinfos = append(entinfos, tmp)
+	}
+	b, _ := json.Marshal(entinfos)
+	m := mahonia.NewDecoder("utf8")
+	str := m.ConvertString(string(b))
+	return str
+}
+
 //实际的查询企业社区业务逻辑
 func wxsearhWebContentent(querymap map[string]string, n *Wxsearch, reqType string) (*[]map[string]interface{}, *[]interface{}) {
 	perPage, _ := strconv.Atoi(querymap["perPage"])

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

@@ -55,7 +55,7 @@ ul{
 	border-radius: 17px;
 	height: 30px;
 	width: 30px;
-	margin:0  0 0 -29px;
+	margin:0  0 0 -35px;
 	text-align:center;
 	background-color:#16A086 !important;
 }
@@ -459,4 +459,12 @@ hr.list{
 }
 .border-left{
 	border-left:1px solid #E5E6E9;
+}
+.inclist span.highlight {
+    text-decoration: inherit;
+}
+.inclist span.highlight {
+    /* color: #D5012C; */
+    color: #dd4814 !important;
+    font-weight: bold;
 }

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

@@ -129,7 +129,7 @@ if(typeof(signature) != "undefined" && signature != null && signature.length ==
 				查企业，查企业失信信息，查企业变更，查你所想，无所不能...
 			</div>
 			<div style="clear:both;" class="col-sm-8">
-              <form method="post"  action="/search/enterprise/ent.html" id="search">
+              <form method="post"  action="/wx/search/enterprise/ent.html" id="search">
 						<div class="input-group col-xs-12">
 							<i class="glyphicon glyphicon-search input-before"></i>
                  		<input type="text" id="query" class="form-control" name="words" placeholder="找企业"  >

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

@@ -4,7 +4,7 @@
   <title> 企业社区-列表</title>
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 	<meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1" />
-	<meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,initial-scale=1.0" user-scalable="yes" />
+	<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0;" name="viewport" />
 	<link href="/css/bootstrap.min.css" rel="stylesheet">
  	<link href="/css/mobile/incmobile.css" rel="stylesheet">
  </head>
@@ -13,7 +13,13 @@
 	<div class="m-searchbar">
 		<div class="containers">
 			<form id="searchForm" method="post">
-			<input type="text" id="query" class="searchtext"/>
+			<input type="text" id="query" name="words" class="searchtext"/>
+			<input type="hidden" name="city" id="city" value="">
+			<input type="hidden" name="cityNo" id="cityNo" value="">
+			<input type="hidden" name="c_author" id="hauthor" value="">
+			<input type="hidden" name="OpState" value="">
+			<input type="hidden" name="c_hfl" id="hfl" value="">
+			<input type="hidden" name="c_zb" id="zb" value="">
 			<a class="searchbtn"><b class="glyphicon glyphicon-search"></b></a>
 			<a href="javascript:" class="searchlink">高级搜索</a>
 				<div id="immediately" class="immediately">
@@ -71,7 +77,7 @@
 		});
 		var data={{.T.data}}
 		var strVar = "";
-		strVar += "<li class=\"col-xs-12\"><table align=\"center\"><caption><div class=\"left\">$EntName<\/div><b class=\"$status\">$OpStateName<\/b><\/caption><tr><td class=\"left\">注册号：<span>$RegNo<\/span><\/td><td>法定代表人：<span>$LeRep<\/span><\/td><\/tr><tr><td class=\"left\">成立时间：<span>$EstDate<\/span><\/td><td>所在地：<span>$OpLocDistrict<\/span><\/td><\/tr><tr><td colspan=\"2\"><hr class=\"list\"><\/td><\/tr><\/table><\/li>";
+		strVar += "<li class=\"col-xs-12\"><table align=\"center\"><caption><div class=\"left\"><a href=\"/enterprise/$Id.html\">$EntName</a><\/div><b class=\"$status\">$OpStateName<\/b><\/caption><tr><td class=\"left\">注册号：<span>$RegNo<\/span><\/td><td>法定代表人：<span>$LeRep<\/span><\/td><\/tr><tr><td class=\"left\">成立时间：<span>$EstDate<\/span><\/td><td>所在地：<span>$OpLocDistrict<\/span><\/td><\/tr><tr><td colspan=\"2\"><hr class=\"list\"><\/td><\/tr><\/table><\/li>";
 		if(data.length>10){
 			data=eval(data);
 			var li="";
@@ -81,6 +87,7 @@
 										 .replace("$LeRep",data[i].LeRep)
 										 .replace("$OpLocDistrict",data[i].OpLocDistrict)
 										 .replace("$EstDate",data[i].EstDate)
+										 .replace("$Id",data[i]["_id"])
 										 .replace("$OpStateName",data[i].OpStateName.substr(0,2));
 				if (data[i].OpStateName!="存续"&&data[i].OpStateName.indexOf("在营")==-1){
 					 tmp=tmp.replace("$status","ent-status-r");