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

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

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 //名片

core/src/qfw/search/wxsearchservice.go

@@ -1,7 +1,6 @@
 package search
 
 import (
-	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"github.com/go-xweb/xweb"
@@ -14,9 +13,9 @@ import (
 	"qfw/util/elastic"
 	ip "qfw/util/ip17mon"
 	. "qfw/util/mongodb"
-	"qfw/util/redis"
 	"strconv"
 	"strings"
+	"time"
 )
 
 //企业社区首页
@@ -30,7 +29,7 @@ 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 {
+	if n.Method() == "POST" {
 		//请求是表单提交，走的查询
 		//拼装查询对象
 		querymap := map[string]string{ //"words": n.GetString("s_value"),
@@ -44,7 +43,6 @@ func (n *Wxsearch) WxgetEnterpriseList(reqType, param /*参数*/ string) error {
 			"c_author":    n.GetString("c_author"),
 			"cityNo":      n.GetString("cityNo"), //是否是第一次查询并且没有选择地市，自动根据IP来设
 		}
-
 		//查询生成列表数据
 		var data *[]map[string]interface{}
 		if i_mingpian != "" {
@@ -55,15 +53,15 @@ func (n *Wxsearch) WxgetEnterpriseList(reqType, param /*参数*/ string) error {
 		rs := FormatData(data)
 		querymap["entcard"] = n.GetString("mingpian")
 		if n.GetString("currentPage") != "" {
+			n.SetHeader("Pragma", "No-cache")
+			n.SetHeader("Cache-Control", "no-cache")
+			n.SetHeader("Expires", "0")
 			return n.Write(rs)
 		}
 		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})
@@ -77,13 +75,18 @@ func FormatData(data *[]map[string]interface{}) string {
 		return ""
 	}
 	for _, v := range *data {
+		estDate := fmt.Sprint(v["EstDate"])
+		if strings.Index(estDate, "-") == -1 {
+			unix, _ := strconv.Atoi(estDate)
+			estDate = time.Unix(int64(unix), 0).Format("2006-01-02")
+		}
 		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["OpLocDistrictName"]),
-			"EstDate":       fmt.Sprint(v["EstDate"]),
+			"EstDate":       estDate,
 			"OpStateName":   fmt.Sprint(v["OpStateName"]),
 		}
 		entinfos = append(entinfos, tmp)
@@ -127,24 +130,9 @@ func wxsearhWebContentent(querymap map[string]string, n *Wxsearch, reqType strin
 		tn, er := ip.Find(n.Protocol())
 		if nil == er {
 			switch tn.Region {
-			case "河南", "广西", "黑龙江", "青海", "西藏", "安徽", "山西":
+			case "北京", "天津", "河北", "山西", "内蒙古", "辽宁", "吉林", "黑龙江", "上海", "江苏", "浙江", "安徽", "福建", "江西", "山东", "广东", "广西", "海南", "河南", "湖北", "湖南", "重庆", "四川", "贵州", "云南", "西藏", "陕西", "甘肃", "青海", "宁夏", "新疆":
 				ipcity = consts.Scode[tn.Region]
 				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
 					query = `{"query": {
 					"function_score": {
@@ -154,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"]
-						,"from":0,
+						,"from": ` + fmt.Sprintf("%v", ((currentPage-1)*perPage)) + `,
 						"size":` + fmt.Sprintf("%v", perPage) + `,
 						  "sort": [{"_score": "desc"},{"OpSint":"desc"},{"RegCap":"desc"}]
 						}`
@@ -299,7 +287,6 @@ func wxsearhWebContentent(querymap map[string]string, n *Wxsearch, reqType strin
 	"size":` + fmt.Sprintf("%v", perPage) +
 			`,"sort":[` + sort + `] }`
 	}
-
 	//查询列表数据
 	client := elastic.GetEsConn()
 	defer elastic.DestoryEsConn(client)
@@ -392,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
 }
 
@@ -407,7 +390,7 @@ func wxsearhWebContententMp(querymap map[string]string, n *Wxsearch, reqType str
 	var query = `{
 	    "query": {
 	        "bool": {
-	            "must": ["match": {"enterprise.EntName": {"query": "` + keyword + `","operator": "and"}}}],
+	            "must": [{"match": {"enterprise.EntName": {"query": "` + keyword + `","operator": "and"}}}],
 	            "must_not": {"terms": {"SourceType": ["03", "04"]}},
 	            "should": [],
 	            "minimum_should_match": 1

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

@@ -60,11 +60,13 @@ ul{
 .m-searchbar .searchbtn1{
 	display: inline-block;
 	position: absolute;
-	height: 30px;
-	line-height: 30px;
-	margin: 0 0 0 -72px;
+	height: 26px;
+	line-height: 26px;
+	margin: 3px 0 0 -80px;
 	text-align: center;
 	color: #A0A0A0;
+	background: #FFF;
+	width: 30px;
 }
 .m-searchbar .searchbtn b{
 	color:#FFF;
@@ -92,18 +94,19 @@ ul{
 .inclist caption div.left{  
 	float:left;
 	width:75%;
-	font-size:13px;
+	font-size:16px;
 	font-weight:600;
 	color:#1A1A1A !important;
 	clear:both;
 }
 .inclist td{
 	color:#B5B6BB;
+	word-break: break-all;
 	font-size:12px;
 }
-.inclist td.left{
+/*.inclist td.left{
 	padding-right:15px;
-}
+}*/
 .inclist span{
 	color:#666666 !important;
 }
@@ -114,6 +117,15 @@ hr.list{
 	margin-top:10px;
 	padding:0;
 }
+span#camera {
+    height: 38px;
+    margin-top: -12px;
+    line-height: 40px;
+    background: #FFF;
+    width: 35px;
+    text-align: center;
+    margin-right: -9px;
+}
 .loadmore{
 	width:250px;
 	height:35px;
@@ -129,7 +141,6 @@ hr.list{
 }
 .nomore{
 	color:#B5B6BB;
-	font-size:11px;
 }
 .col-xs-12{
 	padding:0;	
@@ -243,7 +254,6 @@ hr.list{
 
 .index-header div.title,.index-header div.type ,.index-header div.taupe,.index-header div.abn{
 	display:inline-table;
-	font-size: 11px;
 	color:#FFF;
 	margin:5px 0 0 0 ;
 	line-height:19px;
@@ -251,13 +261,13 @@ hr.list{
 .index-header div.taupe{
 	padding-left:8px;
 	margin-left:5px;
-	width:45px;
+	width:46px;
 	text-align:left;	
 }
 .index-header div.title{
 	clear:both;
 	margin-top:10px;
-	font-size:14px;
+	font-size:16px;
 	font-weight:600;
 }
 .index-header div.abn{
@@ -354,8 +364,6 @@ hr.list{
 }
 .combody{
 	text-align:left;
-	font-size:11px;
-
 }
 .baseinfo li{
 	padding:20px 0 0 10px;
@@ -536,7 +544,10 @@ hr.list{
 }
 .creditrules div.content{
 	overflow-y: scroll;
-	padding: 10px 20px;
+	padding: 5px 20px;
+	padding-bottom: 20px;
+	overflow: scroll;
+	max-height: 320px;
 }
 .ent-dishonesty{
 	text-align:left;
@@ -546,12 +557,12 @@ hr.list{
 .ent-dishonesty .ent-table .b-com-first {
     margin-bottom: 5px;
     font-weight: bold;
-    font-size: 13px;
+    font-size: 16px;
 }
 .ent-dishonesty .ent-table .b-com-second,.ent-dishonesty .ent-table .b-com-third {
     margin-bottom: 5px;
     color: #a0a0a0;
-	font-size:10px;
+	font-size:14px;
 }
 .ent-dishonesty .ent-table td {
 	text-align:left;
@@ -568,7 +579,9 @@ hr.list{
 	font-size:13px;
 	color:#16A086;
 }
-
+.inline-shows{
+	display:inline-block;
+}
 /*搜索首页*/
 #case2 a{
 	color:#3399FF;
@@ -588,9 +601,9 @@ hr.list{
 	font-size:16px;
 }
 .index-bodybg .main div.smallsign{
-	font-size:9px;
-	padding-bottom:10px;
-	color:#DBDBDC;
+	font-size: 14px;
+	padding-bottom: 10px;
+	color: #A0A0A0;
 }
 .form-control{
 	border-radius:0px;
@@ -611,7 +624,6 @@ hr.list{
 	z-index: 30;
 	position: absolute;
 	color: #A0A0A0;
-	font-size:11px;
 }
 .input-before{
 	top: 14px;

core/src/web/staticres/js/entportrait.js

@@ -28,7 +28,7 @@ $(function(){
 		workCopyRight = copyright.WorkCopyRight;
 		workCopyRightFlag = typeof(workCopyRight) != "undefined" && workCopyRight != null;
 		//软件
-		computerSoftCopyRight = copyright.ComputerSoftCopyRight;
+		computerSoftCopyRight = copyright.SoftWareCopyRight;
 		computerSoftCopyRightFlag = typeof(computerSoftCopyRight) != "undefined" && computerSoftCopyRight != null;
 		//专利
 		patent = copyright.Patent;
@@ -356,9 +356,9 @@ function CopyrightEntity(){
 			if(patentFlag){
 				$("#patentList .badge").text(patent.length);
 				patent.sort(function(a,b){
-					if(a.PublicDate<b.PublicDate){
+					if(a.publicdate<b.publicdate){
 						return 1;
-					}else if(a.PublicDate==b.PublicDate){
+					}else if(a.publicdate==b.publicdate){
 						return 0;
 					}
 					return -1;
@@ -366,14 +366,14 @@ function CopyrightEntity(){
 				var frontPaging = new FrontPaging("patentListPaging",patent,5,function(r){
 					var hm = '';
 					for(var i=0;i<r.length;i++){
-						hm += '<tr><td><div class="b-com-first">'+(r[i].PatentName?r[i].PatentName:"")+'</div>'
+						hm += '<tr><td><div class="b-com-first">'+(r[i].patentname?r[i].patentname:"")+'</div>'
 							+'<div class="b-com-second"><div>'
-							+'<span>申请人：'+(r[i].ApplyPerson?r[i].ApplyPerson:"")+'</span>'
-							+'<span>申请号：'+(r[i].ApplyNo?r[i].ApplyNo:"")+'</span>'
-							+'<span>申请日期：'+(r[i].ApplyDate?r[i].ApplyDate.replace(/\./g,"-"):"")+'</span>'
-							+'</div><span>分类号：'+(r[i].IpcTypeNo?r[i].IpcTypeNo:"")+'</span>'
-							+'<span>公开号：'+(r[i].PublicNo?r[i].PublicNo:"")+'</span>'
-							+'<span>公开日期：'+(r[i].PublicDate?r[i].PublicDate.replace(/\./g,"-"):"")+'</span>'
+							+'<span>申请人：'+(r[i].applyperson?r[i].applyperson:"")+'</span>'
+							+'<span>申请号：'+(r[i].applyno?r[i].applyno:"")+'</span>'
+							+'<span>申请日期：'+(r[i].applydate?r[i].applydate.replace(/\./g,"-"):"")+'</span>'
+							+'</div><span>分类号：'+(r[i].ipctypeno?r[i].ipctypeno:"")+'</span>'
+							+'<span>公开号：'+(r[i].publicno?r[i].publicno:"")+'</span>'
+							+'<span>公开日期：'+(r[i].publicdate?r[i].publicdate.replace(/\./g,"-"):"")+'</span>'
 							+'</div></td></tr>';
 					}
 					$("#patentListPaging").parent().prevAll().remove();

core/src/web/staticres/wxswordfish/main.js

@@ -248,7 +248,7 @@ function showAlls(){
 							alert("请稍后再试"+st)
 						}
 					})
-					window.location.reload()
+					window.location.href="/swordfish/page";
 				})
 				$("html,body").addClass("overflow-hidden");
 			})
@@ -281,7 +281,7 @@ function showAlls(){
 						alert("请稍后再试"+st)
 					}
 				})
-				window.location.reload()
+				window.location.href="/swordfish/page";
 		})
 		$("#txt_tip").text(contents+strs)
 		$(".visible").show()
@@ -498,8 +498,31 @@ $(function(){
 	}
 	$("body").append($("#tender-keyword").clone().removeAttr("id").attr("id","bid-keyword"))
 			.append($("#tender-scope").clone().removeAttr("id").attr("id","bid-scope"));
+	var searchnameIsExsit = false;
+	if (typeof(searchname) != "undefined" && searchname.length > 0 ){
+		if(typeof(msgset[s_type]) != "undefined"){
+			var keywordes = msgset[s_type].a_key;
+			if(typeof(keywordes) != "undefined" && keywordes.length > 0){
+				for(var i=0;i<keywordes.length;i++){
+					var keywordesArr = keywordes[i].split("+");
+					for(var k=0;k<keywordesArr.length;k++){
+						if(keywordesArr[k] == searchname){
+							searchnameIsExsit = true;
+						}
+					}
+				}
+				if(!searchnameIsExsit){
+					keywordes.push(searchname);
+				}
+			}else{
+				msgset[s_type]["a_key"] = [searchname];
+			}
+		}else{
+			msgset[s_type] = {"a_key":[searchname]};
+		}
+	}
 	if(typeof(msgset.tender) != "undefined"){
-		//setKeyWord("tender",msgset.tender.a_key);
+		setKeyWord("tender",msgset.tender.a_key,false);
 		setScope("tender",msgset.tender.s_scope);
 		if(msgset.tender.i_switchstatus){
 			turnOn($("#tender-on-off"));
@@ -510,7 +533,7 @@ $(function(){
 		}
 	}
 	if(typeof(msgset.bid) != "undefined"){
-		//setKeyWord("bid",msgset.bid.a_key);
+		setKeyWord("bid",msgset.bid.a_key,false);
 		setScope("bid",msgset.bid.s_scope);
 		if(msgset.bid.i_switchstatus){
 			turnOn($("#bid-on-off"));
@@ -534,9 +557,17 @@ $(function(){
 			turnOn($(this));
 		}
 		//判断是不是开，是开再判断是不是在有效期内，如果不在有效期内，则进行提示并存快照
-		
 		commonAjaxReq(null,$(this).attr("v"));
 	});
+	//直接订阅带过来的关键字不存在
+	if(typeof(searchname) != "undefined" && searchname.length > 0){
+		//自动打开
+		if(!$("#"+s_type +"-on-off").hasClass("open")){
+			$("#"+s_type+"-on-off").click();
+		}else if(!searchnameIsExsit){//修改关键词
+			commonAjaxReq($("#"+s_type+"-keyword"),s_type);
+		}
+	}
 	//收费规则
 	$(".rule").closest(".parent-node").click(function(){
 		$(".credit-dialog").show();
@@ -581,34 +612,4 @@ $(function(){
 			alert("请输入关键字后预览。")
 		}
 	})
-	if (searchname.length > 0 ){
-		if(typeof(msgset[s_type]) != "undefined"){
-			var keywordes = msgset[s_type].a_key
-			if(keywordes && keywordes.length > 0){
-				console.log(keywordes)
-				console.log(searchname)
-				console.log(s_type)
-				for (var i=0;i<keywordes.length;i++){
-					if (keywordes[i] != searchname){
-						if (i == keywordes.length-1 ){
-							keywordes.push(searchname)
-						}
-					}
-				}
-				console.log(keywordes)
-				console.log(searchname)
-				console.log(s_type)
-				setKeyWord(s_type,keywordes);
-			}else{
-				keywordes.push(searchname)
-				setKeyWord(s_type,keywordes);
-			}
-			turnOn($("#"+s_type +"-on-off"));
-		}else{
-			keywordes.push(searchname)
-			setKeyWord(s_type,keywordes);
-			turnOn($("#"+s_type +"-on-off"));
-		}
-
-	}
 });

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

@@ -516,9 +516,22 @@ img{
 	line-height: 40px;
 	text-align: center;
 }
-.bottom-toolbar>li img{
-	width: 18px;
-	height: 18px;
+.bottom-toolbar>li:first-child img{
+	width: 15px;
+    height: 15px;
+    margin-bottom: 2px;
+}
+.bottom-toolbar>li:nth-child(2) img{
+	width: 16px;
+    height: 16px;
+    margin-bottom: 2px;
+	margin-right: 2px;
+}
+.bottom-toolbar>li:last-child img{
+	width: 14px;
+    height: 14px;
+    margin-bottom: 3px;
+	margin-right: 2px;
 }
 .bottom-toolbar>li:nth-child(2){
 	width: 34%;

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

@@ -57,7 +57,7 @@
 	</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">
 			详细变更信息
 			<button class="btn btn-link navcolor " style="float:right;"onclick="$(this).parent().parent().hide();$('.modal-backdrop').hide()" >确定</button>

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

@@ -5,98 +5,98 @@
 <div class="combody baseinfo">
 	<ul>
 		<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>
 			</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>
-			<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>
 			</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>
-			<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>
 			</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>
-			<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>
 			</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>
 		{{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")}}
-				<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>
 				</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}}
 				</span>
 				{{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>
 					</div>
-					<span class="col-xs-8 entvar">
+					<span class="col-xs-7 entvar">
 						空
 					</span>
 				{{end}}
 			{{else}}
-				<div class="col-xs-4">
+				<div class="col-xs-5">
 					<span class="glyphicon glyphicon-flag colorc"></span>
 					<span class="ent entnull">注册资本</span>
 				</div>
-				<span class="col-xs-8 entvar">
+				<span class="col-xs-7 entvar">
 					空
 				</span>
 			{{end}}
 			
 		</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>
 			</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>
-			<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>
 			</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>
-			<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>
 			</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>
-			<div class="col-xs-4">
+			<div class="col-xs-5">
 				<span class="glyphicon glyphicon-flag colorc"></span>
 				<span class="ent entnull">公司规模</span>
 			</div>
-			<span class="col-xs-8 entvar">空</span>
+			<span class="col-xs-7 entvar">空</span>
 		</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>
 			</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>
 		</li>
 	</ul>

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>

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

@@ -1,6 +1,6 @@
 <html>
  <head>
-  <title> 企业社区-列表</title>
+  <title> {{.T.res.EntName}}- 企业信息</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" />
@@ -26,7 +26,6 @@
 		}
 		.ent-mainpersons .b-com-name{
 			font-weight: bold;
-			font-size: 13px;
 			margin-bottom: 5px;
 		}
 		.ent-mainpersons font {
@@ -49,6 +48,7 @@
 			border: none !important;
 			border-bottom: 1px solid #e5e6e9 !important;
 			border-radius: 0px !important;
+			height: 55px;
 		}
 		#entrelation-restore,#entrelation-fullscreen{
 			display:none;
@@ -59,6 +59,15 @@
 		.disabled{
 			color:#BCBCBC;
 		}
+		.col-xs-5{
+			max-width:120px;
+		}
+		.ent-mainpersons .staffinfo-vertical{
+			    margin-bottom: -19px !important;
+		}
+		.staffinfo-level-2{
+			margin-top:5px;
+		}
 	</style>
  </head>
  <body>
@@ -92,7 +101,7 @@
 			</div>
 		</div>
 		<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}}
 			<div class="col-xs-6" onclick="wgw();"><span class="glyphicon weiguanwang2"></span>&nbsp;微官网</a></div>
 			{{else}}
@@ -181,8 +190,6 @@
 <script src="/js/entcommunity.js"></script>
 <script>
 	$(function(){		   
-			$("#entrelation").css("width",window.screen.width+"px");
-			$("#entrelation").css("height",window.screen.height+"px");
 			resize();
 			mCommunity().initmemer();
 			DishonestyPaging();
@@ -248,6 +255,10 @@
 	}
 	function resize(){
 			$(".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(){
 		$(".date").each(function(i,n){

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

@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html>
 	<head>
-		<title> 企业社区-列表</title>
+		<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" />
@@ -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>

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,14 @@
 			mCommunity().initIndex();
 			if(data.length>10){
 				data=eval(data);
-				$(".loadmore").show();
+				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>"
@@ -151,6 +154,11 @@
 				}
 				$(".inclist").append($(li));
 		}
+	$(function(){
+		$("ul.inclist li").click(function(n){
+			window.location.href=$(n.currentTarget).find("a").attr("href");
+		});
+	});
 	</script>
 	<script>
 		var signature = {{.T.signature}};
@@ -235,7 +243,7 @@
 							$("#query").val(obj["names"][0]);
 							$("#i_mingpian").val("1");
 							$("#mingpian").val(obj["names"].join(","));
-							$("#search").submit();	
+							$("#queryform").submit();
 						}else{
 							alert("没有成功识别!");
 						}		 	
@@ -255,14 +263,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();

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

@@ -56,10 +56,11 @@ body{
 	height:25px;
 }
 .searchzhao1,.searchzhong1{
-	float:left;
-	width:10%;
 	margin-top: 10px;
+	margin-bottom: 10px;
 	cursor:hand;
+	display: inline-block;
+	vertical-align: top;
 }
 
 .searchzhao1 img,.searchzhong1 img{
@@ -67,16 +68,20 @@ body{
 	
 }
 .searchzhao2,.searchzhong2{
-	float:left;
 	margin:0px 5px;
-	width:35%;
+	display: inline-block;
+	margin-bottom: 10px;
+	vertical-align: top;
+	margin-top: 13px;
 }
 .searchzhao3,.searchzhong3{
-	float:left;
-	width:140px;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
+	display: inline-block;
+	margin-bottom: 10px;
+	margin-top: 13px;
+	word-wrap: break-word;
+	word-break: break-all;
+	white-space: normal !important;
+	margin-left: -5px;
 }
 .searchzhao3 span , .searchzhong3 span{
 	float:left;
@@ -107,8 +112,6 @@ body{
 	width:100%;
 }
 .searchbs{
-	height:45px;
-	line-height:45px;
 	cursor:hand;
 }
 .parent-node img {
@@ -158,7 +161,7 @@ body{
 	</form>
 		<!--中标 end-->
 		<div  class="wx-xhx"></div>
-		<!--企业情报 start-->
+		<!--企业情报 start
 	<form action="/member/wxswordfish/searchlist" name="searchthree" method="post" style="margin-bottom: auto;">
 		<div onClick="searchbiao(3)"  class="searchbs  hidden" >
 		<div class="searchzhong1"><img src="{{Msg "seo" "cdn"}}/images/wxjs.png"/></div>
@@ -169,9 +172,9 @@ body{
 		<div style="clear:both"></div>
 		
 		</div>
-	</form>
-		<!--企业情报 end-->
-		<div  class="wx-xhx"></div>
+	</form>-->
+		<!--企业情报 end
+		<div  class="wx-xhx"></div>-->
 		
 </div>
 <div id="myorder" class="text-center hidden">

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

@@ -115,7 +115,7 @@ $(function(){
 				var h=$(this).attr("href");
 				$(this).removeAttr("target");
 				$(this).removeAttr("href");
-				if (h.indexOf("java")==-1){							
+				if (typeof(h) != "undefined" &&　h.indexOf("java")==-1){							
 					$(this).attr("s",h)
 					$(this).attr("f_id",f_id)
 					$(this).attr("href","javascript:void(0);")	
@@ -255,7 +255,6 @@ body{
 	width:60%;
 }
 .rescontent,.nullcontent{
-	border-top:1px solid #e5e6e9;
 	padding:10px 20px;
 	background-color:#fff;
 	width:100%;
@@ -313,7 +312,6 @@ body{
 <div class="rescontent">
 	
 </div>
-<div style="height:80px;"></div>
 
 </div>
 <div class="resbm" >
@@ -327,7 +325,7 @@ body{
 
 <div class="nullcontent text-center  hidden">
 <div >
-<img style="width:137px;margin-top:160px;" src="{{Msg "seo" "cdn"}}/images/findnull.png">
+<img style="width:137px;margin-top:20px;" src="{{Msg "seo" "cdn"}}/images/findnull.png">
 </div>
 <div>没有找到和该关键词匹配的信息</div>
 </div>

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

@@ -90,7 +90,7 @@ $(function(){
 		}else if($(this).index() == 1){
 			window.location.href = "/swordfish/page";
 		}else if($(this).index() == 2){
-			$(this).children(".toolbar-popover").show();
+			$(this).children(".toolbar-popover").toggle();
 		}
 	});
 	$(".popover-ul>li").click(function(event){
@@ -113,6 +113,11 @@ $(function(){
 			obj.removeClass("active");
 		},100);
 	});
+	$("body").on("touchstart",function(e){
+		if(e.target.id != "toolbar-list"){
+			$(".toolbar-popover").hide();
+		}
+	});
 	$("[id='goToShare']").click(function(){
 		window.location.href = "/swordfish/guide/share";
 		/*$(".share-dialog").show();

core/src/web/templates/yellowpage/enterpriseinfo.html

@@ -132,7 +132,7 @@
 		<li class="ent-active"><div class="b-com-border-top"></div>{{if eq .T.res.s_action "01"}}企业{{else if eq .T.res.s_action "02"}}商家{{else if eq .T.res.s_action "03"}}机构{{else}}企业{{end}}概况</li>
 		<li><div class="b-com-border-top"></div>关系网</li>
 		<li{{if not .T.res.staffinfo}} class="disabled"{{end}}><div class="b-com-border-top"></div>主要人员<front class="badge" id="ent-tab-staffinfo">0</front></li>
-		<li{{if and (not .T.copyright.WorkCopyRight) (not .T.copyright.ComputerSoftCopyRight) (not .T.copyright.Patent)}} class="disabled"{{end}}><div class="b-com-border-top"></div>著作权<front class="badge" id="ent-tab-copyright">0</front></li>
+		<li{{if and (not .T.copyright.WorkCopyRight) (not .T.copyright.SoftWareCopyRight) (not .T.copyright.Patent)}} class="disabled"{{end}}><div class="b-com-border-top"></div>著作权<front class="badge" id="ent-tab-copyright">0</front></li>
 		<li{{if not .T.res.alterInfo}} class="disabled"{{end}}><div class="b-com-border-top"></div>变更信息<front class="badge{{if .T.res.alterInfo}}{{if eq (len .T.res.alterInfo) 0}} disabled{{end}}{{else}} disabled{{end}}">{{if .T.res.alterInfo}}{{len .T.res.alterInfo}}{{else}}0{{end}}</front></li>
 		<li{{if not .T.dishonesty.count}} class="disabled"{{end}}><div class="b-com-border-top"></div>失信信息<front class="badge" id="ent-tab-dishonesty">0</front></li>
 		<li class="{{if and (not .T.service.count) (not .T.res.s_synopsis)}}disabled {{end}}border-r-0"><div class="b-com-border-top"></div>{{if eq .T.res.s_action "01"}}企业{{else if eq .T.res.s_action "02"}}商家{{else if eq .T.res.s_action "03"}}机构{{else}}企业{{end}}黄页</li>
@@ -340,7 +340,7 @@
 		<!--著作权-->
 		<div class="ent-copyright hide">
 			<!--计算机软件著作权信息-->
-			{{if .T.copyright.ComputerSoftCopyRight}}
+			{{if .T.copyright.SoftWareCopyRight}}
 			<div class="ent-layout-down" id="computerSoftCopyRightList">
 				<div class="b-com-title">
 					<span><span class="bootstrap-glyphicon glyphicon-menu-right"></span></span>计算机软件著作权信息<front class="badge">0</front>