Browse Source

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

wangchuanjin 9 years ago
parent
commit
1c9a562c6b

+ 1 - 1
core/src/qfw/search/searchService.go

@@ -303,7 +303,7 @@ func searhWebContentent(querymap map[string]string, n *Search, reqType string) (
 		tn, er := ip.Find(n.Protocol())
 		tn, er := ip.Find(n.Protocol())
 		if nil == er {
 		if nil == er {
 			switch tn.Region {
 			switch tn.Region {
-			case "河南", "广西", "黑龙江", "青海", "西藏", "安徽", "山西":
+			case "北京", "天津", "河北", "山西", "内蒙古", "辽宁", "吉林", "黑龙江", "上海", "江苏", "浙江", "安徽", "福建", "江西", "山东", "广东", "广西", "海南", "河南", "湖北", "湖南", "重庆", "四川", "贵州", "云南", "西藏", "陕西", "甘肃", "青海", "宁夏", "新疆":
 				ipcity = consts.Scode[tn.Region]
 				ipcity = consts.Scode[tn.Region]
 				if len(ipcity) > 0 {
 				if len(ipcity) > 0 {
 					tmp_res := redis.Get("enterprise", "ipcity_"+ipcity+"_1")
 					tmp_res := redis.Get("enterprise", "ipcity_"+ipcity+"_1")

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

@@ -10,9 +10,9 @@ import (
 
 
 type Wxsearch struct {
 type Wxsearch struct {
 	*xweb.Action
 	*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 //名片
 var mpian_reg *regexp.Regexp //名片

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

@@ -1,7 +1,6 @@
 package search
 package search
 
 
 import (
 import (
-	"encoding/base64"
 	"encoding/json"
 	"encoding/json"
 	"fmt"
 	"fmt"
 	"github.com/go-xweb/xweb"
 	"github.com/go-xweb/xweb"
@@ -14,7 +13,6 @@ import (
 	"qfw/util/elastic"
 	"qfw/util/elastic"
 	ip "qfw/util/ip17mon"
 	ip "qfw/util/ip17mon"
 	. "qfw/util/mongodb"
 	. "qfw/util/mongodb"
-	"qfw/util/redis"
 	"strconv"
 	"strconv"
 	"strings"
 	"strings"
 	"time"
 	"time"
@@ -31,7 +29,7 @@ func (n *Wxsearch) WxIndex() error {
 func (n *Wxsearch) WxgetEnterpriseList(reqType, param /*参数*/ string) error {
 func (n *Wxsearch) WxgetEnterpriseList(reqType, param /*参数*/ string) error {
 	n.T["signature"] = mobile.GetSignature(n.Url())
 	n.T["signature"] = mobile.GetSignature(n.Url())
 	i_mingpian := n.GetString("i_mingpian") //是否走名片查询
 	i_mingpian := n.GetString("i_mingpian") //是否走名片查询
-	if len(param) == 0 {
+	if n.Method() == "POST" {
 		//请求是表单提交,走的查询
 		//请求是表单提交,走的查询
 		//拼装查询对象
 		//拼装查询对象
 		querymap := map[string]string{ //"words": n.GetString("s_value"),
 		querymap := map[string]string{ //"words": n.GetString("s_value"),
@@ -45,7 +43,6 @@ func (n *Wxsearch) WxgetEnterpriseList(reqType, param /*参数*/ string) error {
 			"c_author":    n.GetString("c_author"),
 			"c_author":    n.GetString("c_author"),
 			"cityNo":      n.GetString("cityNo"), //是否是第一次查询并且没有选择地市,自动根据IP来设
 			"cityNo":      n.GetString("cityNo"), //是否是第一次查询并且没有选择地市,自动根据IP来设
 		}
 		}
-
 		//查询生成列表数据
 		//查询生成列表数据
 		var data *[]map[string]interface{}
 		var data *[]map[string]interface{}
 		if i_mingpian != "" {
 		if i_mingpian != "" {
@@ -56,15 +53,15 @@ func (n *Wxsearch) WxgetEnterpriseList(reqType, param /*参数*/ string) error {
 		rs := FormatData(data)
 		rs := FormatData(data)
 		querymap["entcard"] = n.GetString("mingpian")
 		querymap["entcard"] = n.GetString("mingpian")
 		if n.GetString("currentPage") != "" {
 		if n.GetString("currentPage") != "" {
+			n.SetHeader("Pragma", "No-cache")
+			n.SetHeader("Cache-Control", "no-cache")
+			n.SetHeader("Expires", "0")
 			return n.Write(rs)
 			return n.Write(rs)
 		}
 		}
 		n.Render("/member/incmobile/list.html", &xweb.T{"data": rs, "querymap": querymap})
 		n.Render("/member/incmobile/list.html", &xweb.T{"data": rs, "querymap": querymap})
 	} else {
 	} else {
 		//反转生成map
 		//反转生成map
-		paramstr := param[1:]
-		bs, _ := base64.StdEncoding.DecodeString(paramstr)
 		querymap := map[string]string{}
 		querymap := map[string]string{}
-		json.Unmarshal(bs, &querymap)
 		data := wxsearhWebContentent(querymap, n, reqType)
 		data := wxsearhWebContentent(querymap, n, reqType)
 		rs := FormatData(data)
 		rs := FormatData(data)
 		n.Render("/member/incmobile/list.html", &xweb.T{"data": rs, "querymap": querymap})
 		n.Render("/member/incmobile/list.html", &xweb.T{"data": rs, "querymap": querymap})
@@ -133,24 +130,9 @@ func wxsearhWebContentent(querymap map[string]string, n *Wxsearch, reqType strin
 		tn, er := ip.Find(n.Protocol())
 		tn, er := ip.Find(n.Protocol())
 		if nil == er {
 		if nil == er {
 			switch tn.Region {
 			switch tn.Region {
-			case "河南", "广西", "黑龙江", "青海", "西藏", "安徽", "山西":
+			case "北京", "天津", "河北", "山西", "内蒙古", "辽宁", "吉林", "黑龙江", "上海", "江苏", "浙江", "安徽", "福建", "江西", "山东", "广东", "广西", "海南", "河南", "湖北", "湖南", "重庆", "四川", "贵州", "云南", "西藏", "陕西", "甘肃", "青海", "宁夏", "新疆":
 				ipcity = consts.Scode[tn.Region]
 				ipcity = consts.Scode[tn.Region]
 				if len(ipcity) > 0 {
 				if len(ipcity) > 0 {
-					tmp_res := redis.Get("enterprise", "wx_ipcity_"+ipcity+"_1")
-					if nil != tmp_res {
-						tmp_res1, oks1 := tmp_res.([]interface{})
-
-						if tmp_res1 != nil && oks1 {
-							tmp_resn := make([]map[string]interface{}, len(tmp_res1))
-							for k := 0; k < len(tmp_res1); k++ {
-								tmp_resn1, _ := tmp_res1[k].(map[string]interface{})
-								tmp_resn[k] = tmp_resn1
-							}
-							return &tmp_resn
-						}
-					}
-
-					//str += `{"prefix":{"OpLocDistrict":"` + ipcity + `"}}`
 					tempBisOne = true
 					tempBisOne = true
 					query = `{"query": {
 					query = `{"query": {
 					"function_score": {
 					"function_score": {
@@ -160,7 +142,7 @@ func wxsearhWebContentent(querymap map[string]string, n *Wxsearch, reqType strin
 						    }
 						    }
 						  }
 						  }
 						,"_source":["_id","EntName","RegOrgName","RegNo","EntType","LeRep","EstDate","OpLocDistrictName","RegCap","OpStateName","OpState","s_servicenames","s_action","OpLocDistrict","RegCapCurName","s_avatar"]
 						,"_source":["_id","EntName","RegOrgName","RegNo","EntType","LeRep","EstDate","OpLocDistrictName","RegCap","OpStateName","OpState","s_servicenames","s_action","OpLocDistrict","RegCapCurName","s_avatar"]
-						,"from":0,
+						,"from": ` + fmt.Sprintf("%v", ((currentPage-1)*perPage)) + `,
 						"size":` + fmt.Sprintf("%v", perPage) + `,
 						"size":` + fmt.Sprintf("%v", perPage) + `,
 						  "sort": [{"_score": "desc"},{"OpSint":"desc"},{"RegCap":"desc"}]
 						  "sort": [{"_score": "desc"},{"OpSint":"desc"},{"RegCap":"desc"}]
 						}`
 						}`
@@ -305,7 +287,6 @@ func wxsearhWebContentent(querymap map[string]string, n *Wxsearch, reqType strin
 	"size":` + fmt.Sprintf("%v", perPage) +
 	"size":` + fmt.Sprintf("%v", perPage) +
 			`,"sort":[` + sort + `] }`
 			`,"sort":[` + sort + `] }`
 	}
 	}
-
 	//查询列表数据
 	//查询列表数据
 	client := elastic.GetEsConn()
 	client := elastic.GetEsConn()
 	defer elastic.DestoryEsConn(client)
 	defer elastic.DestoryEsConn(client)
@@ -398,10 +379,6 @@ func wxsearhWebContentent(querymap map[string]string, n *Wxsearch, reqType strin
 
 
 		}
 		}
 	}
 	}
-
-	if tempBisOne && len(ipcity) > 0 {
-		redis.Put("enterprise", "wx_ipcity_"+ipcity+"_1", res, 5*86400)
-	}
 	return &res
 	return &res
 }
 }
 
 

+ 19 - 20
core/src/web/staticres/css/mobile/incmobile.css

@@ -60,9 +60,9 @@ ul{
 .m-searchbar .searchbtn1{
 .m-searchbar .searchbtn1{
 	display: inline-block;
 	display: inline-block;
 	position: absolute;
 	position: absolute;
-	height: 28px;
-	line-height: 30px;
-	margin: 1px 0 0 -80px;
+	height: 26px;
+	line-height: 26px;
+	margin: 3px 0 0 -80px;
 	text-align: center;
 	text-align: center;
 	color: #A0A0A0;
 	color: #A0A0A0;
 	background: #FFF;
 	background: #FFF;
@@ -94,18 +94,19 @@ ul{
 .inclist caption div.left{  
 .inclist caption div.left{  
 	float:left;
 	float:left;
 	width:75%;
 	width:75%;
-	font-size:13px;
+	font-size:16px;
 	font-weight:600;
 	font-weight:600;
 	color:#1A1A1A !important;
 	color:#1A1A1A !important;
 	clear:both;
 	clear:both;
 }
 }
 .inclist td{
 .inclist td{
 	color:#B5B6BB;
 	color:#B5B6BB;
+	word-break: break-all;
 	font-size:12px;
 	font-size:12px;
 }
 }
-.inclist td.left{
+/*.inclist td.left{
 	padding-right:15px;
 	padding-right:15px;
-}
+}*/
 .inclist span{
 .inclist span{
 	color:#666666 !important;
 	color:#666666 !important;
 }
 }
@@ -121,7 +122,7 @@ span#camera {
     margin-top: -12px;
     margin-top: -12px;
     line-height: 40px;
     line-height: 40px;
     background: #FFF;
     background: #FFF;
-    width: 30px;
+    width: 35px;
     text-align: center;
     text-align: center;
     margin-right: -9px;
     margin-right: -9px;
 }
 }
@@ -140,7 +141,6 @@ span#camera {
 }
 }
 .nomore{
 .nomore{
 	color:#B5B6BB;
 	color:#B5B6BB;
-	font-size:11px;
 }
 }
 .col-xs-12{
 .col-xs-12{
 	padding:0;	
 	padding:0;	
@@ -254,7 +254,6 @@ span#camera {
 
 
 .index-header div.title,.index-header div.type ,.index-header div.taupe,.index-header div.abn{
 .index-header div.title,.index-header div.type ,.index-header div.taupe,.index-header div.abn{
 	display:inline-table;
 	display:inline-table;
-	font-size: 11px;
 	color:#FFF;
 	color:#FFF;
 	margin:5px 0 0 0 ;
 	margin:5px 0 0 0 ;
 	line-height:19px;
 	line-height:19px;
@@ -262,13 +261,13 @@ span#camera {
 .index-header div.taupe{
 .index-header div.taupe{
 	padding-left:8px;
 	padding-left:8px;
 	margin-left:5px;
 	margin-left:5px;
-	width:45px;
+	width:46px;
 	text-align:left;	
 	text-align:left;	
 }
 }
 .index-header div.title{
 .index-header div.title{
 	clear:both;
 	clear:both;
 	margin-top:10px;
 	margin-top:10px;
-	font-size:14px;
+	font-size:16px;
 	font-weight:600;
 	font-weight:600;
 }
 }
 .index-header div.abn{
 .index-header div.abn{
@@ -365,8 +364,6 @@ span#camera {
 }
 }
 .combody{
 .combody{
 	text-align:left;
 	text-align:left;
-	font-size:11px;
-
 }
 }
 .baseinfo li{
 .baseinfo li{
 	padding:20px 0 0 10px;
 	padding:20px 0 0 10px;
@@ -547,7 +544,10 @@ span#camera {
 }
 }
 .creditrules div.content{
 .creditrules div.content{
 	overflow-y: scroll;
 	overflow-y: scroll;
-	padding: 10px 20px;
+	padding: 5px 20px;
+	padding-bottom: 20px;
+	overflow: scroll;
+	max-height: 320px;
 }
 }
 .ent-dishonesty{
 .ent-dishonesty{
 	text-align:left;
 	text-align:left;
@@ -557,12 +557,12 @@ span#camera {
 .ent-dishonesty .ent-table .b-com-first {
 .ent-dishonesty .ent-table .b-com-first {
     margin-bottom: 5px;
     margin-bottom: 5px;
     font-weight: bold;
     font-weight: bold;
-    font-size: 13px;
+    font-size: 16px;
 }
 }
 .ent-dishonesty .ent-table .b-com-second,.ent-dishonesty .ent-table .b-com-third {
 .ent-dishonesty .ent-table .b-com-second,.ent-dishonesty .ent-table .b-com-third {
     margin-bottom: 5px;
     margin-bottom: 5px;
     color: #a0a0a0;
     color: #a0a0a0;
-	font-size:10px;
+	font-size:14px;
 }
 }
 .ent-dishonesty .ent-table td {
 .ent-dishonesty .ent-table td {
 	text-align:left;
 	text-align:left;
@@ -601,9 +601,9 @@ span#camera {
 	font-size:16px;
 	font-size:16px;
 }
 }
 .index-bodybg .main div.smallsign{
 .index-bodybg .main div.smallsign{
-	font-size:9px;
-	padding-bottom:10px;
-	color:#DBDBDC;
+	font-size: 14px;
+	padding-bottom: 10px;
+	color: #A0A0A0;
 }
 }
 .form-control{
 .form-control{
 	border-radius:0px;
 	border-radius:0px;
@@ -624,7 +624,6 @@ span#camera {
 	z-index: 30;
 	z-index: 30;
 	position: absolute;
 	position: absolute;
 	color: #A0A0A0;
 	color: #A0A0A0;
-	font-size:11px;
 }
 }
 .input-before{
 .input-before{
 	top: 14px;
 	top: 14px;

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


+ 1 - 1
core/src/web/templates/member/incmobile/alter.html

@@ -57,7 +57,7 @@
 	</div>
 	</div>
 	</div>
 	</div>
 </div>
 </div>
-<div style="position: absolute;width:100%;z-index:4410;background:#FFF;bottom: 0;display:none;font-size:12px;overflow:auto;min-height:150px;" class="creditrules">
+<div style="position: fixed;width:100%;z-index:4410;background:#FFF;bottom: 0;display:none;font-size:12px;overflow:auto;min-height:160px;" class="creditrules">
 		<div class="title">
 		<div class="title">
 			详细变更信息
 			详细变更信息
 			<button class="btn btn-link navcolor " style="float:right;"onclick="$(this).parent().parent().hide();$('.modal-backdrop').hide()" >确定</button>
 			<button class="btn btn-link navcolor " style="float:right;"onclick="$(this).parent().parent().hide();$('.modal-backdrop').hide()" >确定</button>

+ 35 - 35
core/src/web/templates/member/incmobile/baseinfo.html

@@ -5,98 +5,98 @@
 <div class="combody baseinfo">
 <div class="combody baseinfo">
 	<ul>
 	<ul>
 		<li>
 		<li>
-			<div class="col-xs-4">
-					<img src="/images/entcommunity/zhucehao.png"   width=14 />
+			<div class="col-xs-5">
+					<img src="/images/entcommunity/zhucehao.png"   width=23 />
 					<span class="ent {{if not .T.res.RegNo}}entnull{{end}}">注册号</span>
 					<span class="ent {{if not .T.res.RegNo}}entnull{{end}}">注册号</span>
 			</div>
 			</div>
-			<span class="col-xs-8 entvar">{{if .T.res.RegNo}}{{.T.res.RegNo}}{{end}}</span>
+			<span class="col-xs-7 entvar">{{if .T.res.RegNo}}{{.T.res.RegNo}}{{end}}</span>
 		</li>
 		</li>
 		<li>
 		<li>
-			<div class="col-xs-4">
-				<img src="/images/entcommunity/hangye.png"  width=14 />
+			<div class="col-xs-5">
+				<img src="/images/entcommunity/hangye.png"  width=23 />
 				<span class="ent {{if not .T.res.IndustryPhyName}}entnull{{end}}">行业</span>
 				<span class="ent {{if not .T.res.IndustryPhyName}}entnull{{end}}">行业</span>
 			</div>
 			</div>
-			<span class="col-xs-8 entvar">{{if .T.res.IndustryPhyName}}{{.T.res.IndustryPhyName}}{{end}}</span>
+			<span class="col-xs-7 entvar">{{if .T.res.IndustryPhyName}}{{.T.res.IndustryPhyName}}{{end}}</span>
 		</li>
 		</li>
 		<li>
 		<li>
-			<div class="col-xs-4">
-				<img src="/images/entcommunity/chenglirizi.png"  width=14/>
+			<div class="col-xs-5">
+				<img src="/images/entcommunity/chenglirizi.png"  width=23/>
 				<span class="ent {{if not .T.res.EstDate}}entnull{{end}}">成立日期</span>
 				<span class="ent {{if not .T.res.EstDate}}entnull{{end}}">成立日期</span>
 			</div>
 			</div>
-			<span class="col-xs-8 entvar">{{if .T.res.EstDate}}{{.T.res.EstDate}}{{end}}</span>
+			<span class="col-xs-7 entvar">{{if .T.res.EstDate}}{{.T.res.EstDate}}{{end}}</span>
 		</li>
 		</li>
 		<li>
 		<li>
-			<div class="col-xs-4">
-				<img src="/images/entcommunity/shijian.png"  width=14 />
+			<div class="col-xs-5">
+				<img src="/images/entcommunity/shijian.png"  width=23 />
 				<span class="ent {{if and (not .T.res.OpFrom) (not .T.res.OpTo)}} entnull{{end}}">营业期限</span>
 				<span class="ent {{if and (not .T.res.OpFrom) (not .T.res.OpTo)}} entnull{{end}}">营业期限</span>
 			</div>
 			</div>
-			<span class="col-xs-8 entvar">{{if .T.res.OpFrom}}{{.T.res.OpFrom}}{{end}}{{if .T.res.OpTo}}&nbsp;-&nbsp;{{.T.res.OpTo}}{{else}}&nbsp;-&nbsp;长期{{end}}</span>
+			<span class="col-xs-7 entvar">{{if .T.res.OpFrom}}{{.T.res.OpFrom}}{{end}}{{if .T.res.OpTo}}&nbsp;-&nbsp;{{.T.res.OpTo}}{{else}}&nbsp;-&nbsp;长期{{end}}</span>
 		</li>
 		</li>
 		<li>
 		<li>
 		{{if and .T.res.RegCap .T.res.EntType}}
 		{{if and .T.res.RegCap .T.res.EntType}}
 			{{if and (ne .T.res.EntType "9600") (ne .T.res.EntType "5810") (ne .T.res.EntType "4540") (ne .T.res.EntType "4533")}}
 			{{if and (ne .T.res.EntType "9600") (ne .T.res.EntType "5810") (ne .T.res.EntType "4540") (ne .T.res.EntType "4533")}}
-				<div class="col-xs-4">
-					<img src="/images/entcommunity/zhuceziben.png"  width=14 />
+				<div class="col-xs-5">
+					<img src="/images/entcommunity/zhuceziben.png"  width=23 />
 					<span class="ent">注册资本</span>
 					<span class="ent">注册资本</span>
 				</div>
 				</div>
-				<span class="col-xs-8 entvar">
+				<span class="col-xs-7 entvar">
 								<script>var d1={{.T.res.RegCap}};d1=d1?d1:0; var lenD1=(d1+"").length ;if(lenD1>4&&(d1+"").indexOf(".")>-1&&(lenD1-(d1+"").indexOf("."))>4){document.write(d1.toFixed(4))}else{document.write(d1)}</script>万{{if .T.res.RegCapCurName}}{{.T.res.RegCapCurName}}{{else}}元{{end}}
 								<script>var d1={{.T.res.RegCap}};d1=d1?d1:0; var lenD1=(d1+"").length ;if(lenD1>4&&(d1+"").indexOf(".")>-1&&(lenD1-(d1+"").indexOf("."))>4){document.write(d1.toFixed(4))}else{document.write(d1)}</script>万{{if .T.res.RegCapCurName}}{{.T.res.RegCapCurName}}{{else}}元{{end}}
 				</span>
 				</span>
 				{{else}}
 				{{else}}
-					<div class="col-xs-4">
-						<img src="/images/entcommunity/ziben.png"  width=14 />
+					<div class="col-xs-5">
+						<img src="/images/entcommunity/zhuceziben.png"  width=23 />
 						<span class="ent entnull">注册资本</span>
 						<span class="ent entnull">注册资本</span>
 					</div>
 					</div>
-					<span class="col-xs-8 entvar">
+					<span class="col-xs-7 entvar">
 					</span>
 					</span>
 				{{end}}
 				{{end}}
 			{{else}}
 			{{else}}
-				<div class="col-xs-4">
+				<div class="col-xs-5">
 					<span class="glyphicon glyphicon-flag colorc"></span>
 					<span class="glyphicon glyphicon-flag colorc"></span>
 					<span class="ent entnull">注册资本</span>
 					<span class="ent entnull">注册资本</span>
 				</div>
 				</div>
-				<span class="col-xs-8 entvar">
+				<span class="col-xs-7 entvar">
 				</span>
 				</span>
 			{{end}}
 			{{end}}
 			
 			
 		</li>
 		</li>
 		<li>
 		<li>
-			<div class="col-xs-4">
-				<img src="/images/entcommunity/dizhi.png"  width=14 />
+			<div class="col-xs-5">
+				<img src="/images/entcommunity/dizhi.png"  width=23 />
 				<span class="ent {{if not .T.res.Dom}}entnull{{end}}">地址</span>
 				<span class="ent {{if not .T.res.Dom}}entnull{{end}}">地址</span>
 			</div>
 			</div>
-			<span class="col-xs-8 entvar">{{if .T.res.Dom}}{{.T.res.Dom}}{{else}}空{{end}}</span>
+			<span class="col-xs-7 entvar">{{if .T.res.Dom}}{{.T.res.Dom}}{{else}}空{{end}}</span>
 		</li>
 		</li>
 		<li>
 		<li>
-			<div class="col-xs-4">
-				<img src="/images/entcommunity/gongsileixing.png"  width=14 />
+			<div class="col-xs-5">
+				<img src="/images/entcommunity/gongsileixing.png"  width=23 />
 				<span class="ent {{if not .T.res.EntTypeName}} entnull{{end}}">企业类型</span>
 				<span class="ent {{if not .T.res.EntTypeName}} entnull{{end}}">企业类型</span>
 			</div>
 			</div>
-			<span class="col-xs-8 entvar">{{if .T.res.EntTypeName}}{{.T.res.EntTypeName}}{{else}}空{{end}}</span>
+			<span class="col-xs-7 entvar">{{if .T.res.EntTypeName}}{{.T.res.EntTypeName}}{{else}}空{{end}}</span>
 		</li>
 		</li>
 		<li>
 		<li>
-			<div class="col-xs-4">
-				<img src="/images/entcommunity/dengjijiguan.png"  width=14 />
+			<div class="col-xs-5">
+				<img src="/images/entcommunity/dengjijiguan.png"  width=23 />
 				<span class="ent {{if not .T.res.RegOrgName}}entnull{{end}}">登记机关</span>
 				<span class="ent {{if not .T.res.RegOrgName}}entnull{{end}}">登记机关</span>
 			</div>
 			</div>
-			<span class="col-xs-8 entvar ">{{if .T.res.RegOrgName}}{{.T.res.RegOrgName}}{{else}}空{{end}}</span>
+			<span class="col-xs-7 entvar ">{{if .T.res.RegOrgName}}{{.T.res.RegOrgName}}{{else}}空{{end}}</span>
 		</li>
 		</li>
 <!--		<li>
 <!--		<li>
-			<div class="col-xs-4">
+			<div class="col-xs-5">
 				<span class="glyphicon glyphicon-flag colorc"></span>
 				<span class="glyphicon glyphicon-flag colorc"></span>
 				<span class="ent entnull">公司规模</span>
 				<span class="ent entnull">公司规模</span>
 			</div>
 			</div>
-			<span class="col-xs-8 entvar">空</span>
+			<span class="col-xs-7 entvar">空</span>
 		</li>-->
 		</li>-->
 		<li>
 		<li>
-			<div class="col-xs-5">
-				<img src="/images/entcommunity/ren.png"  width=14 />
+			<div class="col-xs-6" style="max-width:145px;">
+				<img src="/images/entcommunity/ren.png"  width=23 />
 				<span class="ent {{if not .T.res.LeRep}} entnull {{end}}">法定代表人</span>
 				<span class="ent {{if not .T.res.LeRep}} entnull {{end}}">法定代表人</span>
 			</div>
 			</div>
-			<div class="col-xs-6" style="margin-left:-3%;">
-				<span class="col-xs-8 entvar">{{if not .T.res.LeRep}}空{{else}}{{.T.res.LeRep}}{{end}}</span>
+			<div class="col-xs-6">
+				<span class="col-xs-6 entvar">{{if not .T.res.LeRep}}空{{else}}{{.T.res.LeRep}}{{end}}</span>
 			</div>
 			</div>
 		</li>
 		</li>
 	</ul>
 	</ul>

+ 0 - 35
core/src/web/templates/member/incmobile/detail.html

@@ -1,35 +0,0 @@
-<!DOCTYPE HTML>
-<html>
- <head>
-  <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" />
-	<link href="/css/bootstrap.min.css" rel="stylesheet" />
- 	<link href="/css/entcommunity.css" rel="stylesheet" />
-	<link href="/css/mobile/incmobile.css" rel="stylesheet" />
-	
-	<style>
-		body{
-			background:#FFF;
-		}
-		.entinfo-page .b-right {
-			margin-top: 0px;
-			float: none;
-			margin-left: 5px;
-			color:#222222;
-		}
-		.entinfo-page .b-right span{
-			font-size:11px;
-		}
-	</style>
- </head>
- <body>
-{{include "/member/incmobile/news.html"}}
-<script src="/js/jquery.js"></script>
-<script src="/js/qfw.js"></script>
-<script src="/js/fastclick.js"></script>
-<script src="/js/bootstrap.min.js"></script>
-<script src="/js/entcommunity.js"></script>
- </body>
-<html>

+ 16 - 5
core/src/web/templates/member/incmobile/detailindex.html

@@ -1,6 +1,6 @@
 <html>
 <html>
  <head>
  <head>
-  <title> 企业社区-列表</title>
+  <title> {{.T.res.EntName}}- 企业信息</title>
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 	<meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1" />
 	<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 name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,initial-scale=1.0" user-scalable="yes" />
@@ -26,7 +26,6 @@
 		}
 		}
 		.ent-mainpersons .b-com-name{
 		.ent-mainpersons .b-com-name{
 			font-weight: bold;
 			font-weight: bold;
-			font-size: 13px;
 			margin-bottom: 5px;
 			margin-bottom: 5px;
 		}
 		}
 		.ent-mainpersons font {
 		.ent-mainpersons font {
@@ -49,6 +48,7 @@
 			border: none !important;
 			border: none !important;
 			border-bottom: 1px solid #e5e6e9 !important;
 			border-bottom: 1px solid #e5e6e9 !important;
 			border-radius: 0px !important;
 			border-radius: 0px !important;
+			height: 55px;
 		}
 		}
 		#entrelation-restore,#entrelation-fullscreen{
 		#entrelation-restore,#entrelation-fullscreen{
 			display:none;
 			display:none;
@@ -59,6 +59,15 @@
 		.disabled{
 		.disabled{
 			color:#BCBCBC;
 			color:#BCBCBC;
 		}
 		}
+		.col-xs-5{
+			max-width:120px;
+		}
+		.ent-mainpersons .staffinfo-vertical{
+			    margin-bottom: -19px !important;
+		}
+		.staffinfo-level-2{
+			margin-top:5px;
+		}
 	</style>
 	</style>
  </head>
  </head>
  <body>
  <body>
@@ -92,7 +101,7 @@
 			</div>
 			</div>
 		</div>
 		</div>
 		<div class="col-xs-12 index-middle">
 		<div class="col-xs-12 index-middle">
-			<div class="col-xs-6" style="border-right: 1px solid #16A086;" data-id="c_card" onclick="childrenshow(this);"><span class="glyphicon qiyemingpian" style="font-size:11px;"></span>&nbsp;企业名片</div>
+			<div class="col-xs-6" style="border-right: 1px solid #16A086;" data-id="c_card" onclick="childrenshow(this);"><span class="glyphicon qiyemingpian"></span>&nbsp;企业名片</div>
 			{{if .T.res.s_microwebsite}}
 			{{if .T.res.s_microwebsite}}
 			<div class="col-xs-6" onclick="wgw();"><span class="glyphicon weiguanwang2"></span>&nbsp;微官网</a></div>
 			<div class="col-xs-6" onclick="wgw();"><span class="glyphicon weiguanwang2"></span>&nbsp;微官网</a></div>
 			{{else}}
 			{{else}}
@@ -181,8 +190,6 @@
 <script src="/js/entcommunity.js"></script>
 <script src="/js/entcommunity.js"></script>
 <script>
 <script>
 	$(function(){		   
 	$(function(){		   
-			$("#entrelation").css("width",window.screen.width+"px");
-			$("#entrelation").css("height",window.screen.height+"px");
 			resize();
 			resize();
 			mCommunity().initmemer();
 			mCommunity().initmemer();
 			DishonestyPaging();
 			DishonestyPaging();
@@ -248,6 +255,10 @@
 	}
 	}
 	function resize(){
 	function resize(){
 			$(".index-navtable div.content").height($(".index-navtable div.content").width());
 			$(".index-navtable div.content").height($(".index-navtable div.content").width());
+			$("#entrelation").css("width",$(window).width()+"px");
+			$("#entrelation").css("height",$(window).height()+"px");
+			$("svg").attr("width",$(window).width()+"");		
+			$("svg").attr("height",$(window).height()+"");
 	}
 	}
 	$(function(){
 	$(function(){
 		$(".date").each(function(i,n){
 		$(".date").each(function(i,n){

+ 3 - 9
core/src/web/templates/member/incmobile/index.html

@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <!DOCTYPE HTML>
 <html>
 <html>
 	<head>
 	<head>
-		<title> 企业社区-列表</title>
+		<title> 企业社区-首页</title>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 		<meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1" />
 		<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 name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,initial-scale=1.0" user-scalable="yes" />
@@ -62,7 +62,7 @@ if(typeof(signature) != "undefined" && signature != null && signature.length ==
 				查企业,查企业失信信息,查企业变更,查你所想,无所不能...
 				查企业,查企业失信信息,查企业变更,查你所想,无所不能...
 			</div>
 			</div>
 			<div style="clear:both;" class="col-sm-8">
 			<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">
 						<div class="input-group col-xs-12">
                  		<input type="text" id="query" class="form-control"  style="height:40px;" name="words" placeholder="找企业"  >
                  		<input type="text" id="query" class="form-control"  style="height:40px;" name="words" placeholder="找企业"  >
 							<input type="hidden" name="i_mingpian" id="i_mingpian" value="" />
 							<input type="hidden" name="i_mingpian" id="i_mingpian" value="" />
@@ -75,13 +75,7 @@ if(typeof(signature) != "undefined" && signature != null && signature.length ==
 		</div>
 		</div>
 		<footer class="footer">
 		<footer class="footer">
 	      <div class="container">
 	      <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>
 	      </div>
 		</footer>
 		</footer>
 <script src="/js/jquery.js"></script>
 <script src="/js/jquery.js"></script>

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

@@ -83,7 +83,6 @@
 			mCommunity().initIndex();
 			mCommunity().initIndex();
 			if(data.length>10){
 			if(data.length>10){
 				data=eval(data);
 				data=eval(data);
-				console.log(data);
 				if(data.length>5){
 				if(data.length>5){
 					$(".loadmore").removeClass("hides");
 					$(".loadmore").removeClass("hides");
 					$(".loadmore").addClass("inline-shows");
 					$(".loadmore").addClass("inline-shows");
@@ -155,6 +154,11 @@
 				}
 				}
 				$(".inclist").append($(li));
 				$(".inclist").append($(li));
 		}
 		}
+	$(function(){
+		$("ul.inclist li").click(function(n){
+			window.location.href=$(n.currentTarget).find("a").attr("href");
+		});
+	});
 	</script>
 	</script>
 	<script>
 	<script>
 		var signature = {{.T.signature}};
 		var signature = {{.T.signature}};
@@ -259,14 +263,13 @@
 				"currentPage":++currentPage
 				"currentPage":++currentPage
 			};
 			};
 			$.ajax({
 			$.ajax({
-				url:"/wx/search/enterprise/list.html",
+				url:"/wx/search/enterprise/m/list"+(new Date().getTime()),
 				data:query,
 				data:query,
-				type:"post",
+				type:"POST",
 				dataType:"json",
 				dataType:"json",
 				success:function(r){
 				success:function(r){
-					if (typeof(r)=="object"){
+					if (typeof(r)=="object" && r.length!=0){
 							data=data.concat(r);
 							data=data.concat(r);
-							
 					}else{
 					}else{
 						$(".loadmore").hide();
 						$(".loadmore").hide();
 						$(".nomore").show();
 						$(".nomore").show();