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

core/src/qfw/search/wxsearchservice.go

@@ -7,6 +7,7 @@ import (
 	"github.com/go-xweb/xweb"
 	"github.com/p/mahonia"
 	"html/template"
+	"log"
 	"qfw/coreutil"
 	"qfw/mobile"
 	. "qfw/util"
@@ -47,16 +48,13 @@ func (n *Wxsearch) WxgetEnterpriseList(reqType, param /*参数*/ string) error {
 
 		//查询生成列表数据
 		var data *[]map[string]interface{}
-		var has bool
 		if i_mingpian != "" {
-			data, has = wxsearhWebContententMp(querymap, n, reqType, false)
-			if !has {
-				data = wxsearhWebContentent(querymap, n, reqType)
-			}
+			data, _ = wxsearhWebContententMp(querymap, n, reqType, false)
 		} else {
 			data = wxsearhWebContentent(querymap, n, reqType)
 		}
 		rs := FormatData(data)
+		querymap["entcard"] = n.GetString("mingpian")
 		n.Render("/member/incmobile/list.html", &xweb.T{"data": rs, "querymap": querymap})
 	} else {
 		//反转生成map
@@ -74,12 +72,13 @@ func (n *Wxsearch) WxgetEnterpriseList(reqType, param /*参数*/ string) error {
 func FormatData(data *[]map[string]interface{}) string {
 	entinfos := make([]map[string]string, 0)
 	for _, v := range *data {
+		log.Println(v)
 		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"]),
+			"OpLocDistrict": fmt.Sprint(v["OpLocDistrictName"]),
 			"EstDate":       fmt.Sprint(v["EstDate"]),
 			"OpStateName":   fmt.Sprint(v["OpStateName"]),
 		}

core/src/qfw/yellowpage/yellowpagemanager.go

@@ -238,23 +238,28 @@ func (yp *Yellowpage) EnterpriseInfo(id string) error {
 			if relflag {
 				if d, err := json.Marshal(relation["nodes"]); err == nil && json.Unmarshal(d, &nodes) == nil && len(*nodes) > 0 {
 					//相关企业
-					var regNos []string
+					var entmids []ObjectId
 					for _, v := range *nodes {
-						if v["type"] == "e" {
-							regNos = append(regNos, v["name"].(string))
-						}
-						if len(regNos) == 6 {
-							break
+						if v["type"] == "e" && v["entmid"] != nil && v["entmid"].(string) != "" {
+							entmids = append(entmids, ObjectIdHex(v["entmid"].(string)))
 						}
 					}
-					if len(regNos) > 0 {
-						relevantEnts := Find("enterprise", M{"RegNo": M{"$in": regNos}}, nil, `{"s_avatar":1,"RegNo":1,"EntName":1}`, false, -1, -1)
+					if len(entmids) > 0 {
+						relevantEnts := Find("enterprise", M{"_id": M{"$in": entmids}}, nil, `{"s_avatar":1,"RegNo":1,"EntName":1}`, false, -1, -1)
 						if relevantEnts != nil && len(*relevantEnts) > 0 {
 							for _, relevantEnt := range *relevantEnts {
 								relevantEnt["_id"] = util.BsonIdToSId(relevantEnt["_id"])
+								for _, node := range *nodes {
+									if node["entmid"] != nil && node["entmid"].(string) == relevantEnt["_id"] {
+										node["haslink"] = true
+										break
+									}
+								}
 							}
 							yp.T["relevantEnts"] = relevantEnts
 						}
+						relation["nodes"] = nodes
+						redis.Put("enterprise", "relation-"+regNo, relation, 7*ONEDAY)
 					}
 				}
 			}
@@ -415,7 +420,8 @@ func storeNode(data *map[string]interface{}, ls *list.List, dir /*方向反转*/
 	invopstate, _ := (*data)["invopstate"].(string)
 	regcapcurname, _ := (*data)["regcapcurname"].(string)
 	shortname, _ := (*data)["shortname"].(string)
-	ls.PushBack([]string{invtype, invcerno, invname, entregno, entname, strconv.Itoa(level), fmt.Sprint(invweight), invacconam, fmt.Sprint(regcap), fmt.Sprint(invregcap), legcerno, opstate, invopstate, regcapcurname, util.BsonIdToSId((*data)["_id"]), shortname})
+	entmid := (*data)["entmid"]
+	ls.PushBack([]string{invtype, invcerno, invname, entregno, entname, strconv.Itoa(level), fmt.Sprint(invweight), invacconam, fmt.Sprint(regcap), fmt.Sprint(invregcap), legcerno, opstate, invopstate, regcapcurname, util.BsonIdToSId((*data)["_id"]), shortname, util.BsonIdToSId(entmid)})
 }
 
 func findIndex(code string, arr []interface{}) (index int, mtType string) {
@@ -442,7 +448,7 @@ func (yp *Yellowpage) GetRelation() error {
 	var relation map[string]interface{}
 	var flag bool
 	//判断登录状态
-	if yp.GetSession("userType") != nil && util.IntAll(yp.GetSession("userType")) > 0 && util.IntAll(yp.GetSession("identWay")) == 1 {
+	if yp.GetSession("userType") != nil && util.IntAll(yp.GetSession("userType")) > 0 /*&& util.IntAll(yp.GetSession("identWay")) == 1 */ {
 		regNo := yp.GetString("regNo")
 		entName := yp.GetString("entName")
 		if regNo != "" && entName != "" {
@@ -521,6 +527,7 @@ func makeRelation(mnregno, mnname string) interface{} {
 				"regcapcurname": v[13],
 				"_id":           v[14],
 				"shorttext":     v[15],
+				"entmid":        v[16],
 			}
 		}
 		//加企业
@@ -536,6 +543,7 @@ func makeRelation(mnregno, mnname string) interface{} {
 				"regcapcurname": v[13],
 				"_id":           v[14],
 				"shorttext":     v[15],
+				"entmid":        v[16],
 			}
 		}
 	}

core/src/web/staticres/css/entcommunity.css

@@ -642,7 +642,7 @@ a:focus, a:hover{
     position: absolute;
     display: inline-block;
     border-radius: 4px;
-    width: 80px;
+    width: 110px;
 	height: 25px;
     line-height: 25px;
     text-align: center;

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

@@ -227,7 +227,7 @@ hr.list{
 	display:none;
 }
 .shows{
-	display:block;
+	display:block !important;
 }
 /*首页*/
 #header div,.index span{
@@ -321,13 +321,27 @@ hr.list{
 	background-image: url("/images/status-r.png");
 }
 /*各详细页面*/
-.comnav ,.secnav{
+.comnav, .secnav{
 	height:50px;
 	padding:15px 0px 15px 20px;
 	color:#FFF;
 	text-align:left;
 	background:#16A086;
 }
+.combody.baseinfo li span{
+	padding-top:5px;
+}
+.secnav{
+	padding-left:0px;
+	background:#fff;
+	clear:both;
+}
+.comnav span.header{
+	    float: left;
+	    margin-top: -20px;
+	    margin-left: -10px;
+}
+}
 .secnav{
 	padding-left:0px;
 	background:#FFF;
@@ -518,12 +532,12 @@ hr.list{
 	font-size: 13px;
 	color: #000;
 	background: #F6F7F8;
-	position: fixed;
 	width: 100%;
 }
 .creditrules div.content{
-	min-height: 170px;
-	padding: 60px 20px;
+	height: 380px;
+	overflow-y: scroll;
+	padding: 10px 20px;
 }
 .ent-dishonesty{
 	text-align:left;
@@ -557,6 +571,10 @@ hr.list{
 }
 
 /*搜索首页*/
+#case2 a{
+	color:#3399FF;
+	text-decoration: underline;
+}
 .index-bodybg{
 	color:#FFF;
 	background:url('/images/entbg.png') no-repeat left top;

core/src/web/staticres/js/entcommunity.js

@@ -69,6 +69,7 @@ mCommunity.prototype={
 			$("#city").append(ulchild);
 		}
 		
+		
 		for(var i=0;i<c_zb.length;i++){
 			var li=$("<li></li>");
 			li.text(c_zb[i][0]);
@@ -95,8 +96,22 @@ mCommunity.prototype={
 			}
 			if(target.is(":visible")){
 				target.hide();
+				$(".bottom").show();
 			}else{
 				target.show();
+				if (target.attr("id")=="location"){
+					var index=$("#province li.hover").index()-1;
+					if (index>9){
+						$("#province").scrollTop(index*34);
+					}
+					var index=$("#city li.hover").index()-1;
+					if(index>9){
+						$("#city").scrollTop(index*34);
+					}else{
+						$("#city").scrollTop(10);
+					}
+				}
+				$(".bottom").hide();
 			}
 		});
 		$("#city li").on("click",function(i){
@@ -108,6 +123,10 @@ mCommunity.prototype={
 		});
 		$("#province ul li").on("click",function(i){
 			var node=$(i.target);
+			if(node.text()=="全国" || node.text()==""){
+				$("#citys").val("0");
+				$("#queryform").submit();
+			}
 			$("#province ul li[class='hover']").attr("class","");
 			node.attr("class","hover");
 			target=$("#city #city_"+node.attr("data-id"));
@@ -128,6 +147,22 @@ mCommunity.prototype={
 			$("#c_zb").val(node.attr("value"));
 			$("#queryform").submit();
 		});
+		//初始化筛选状态
+		var citycode=$("#citys").val();
+		var c_hflx=$("#c_hfl").val();
+		var c_zbx=$("#c_zb").val();
+		$("#category li[value="+c_hflx+"]").css("background","#FFF");
+		$("#reg li[value="+c_zbx+"]").css("background","#FFF");
+		if(citycode=="0" || citycode==""){
+			$("#province li[data-id="+citycode+"]").addClass("hover");
+		}else{
+			var  p=$("#province li[data-id="+citycode.substr(0,2)+"]");
+			if(p){
+				p.addClass("hover");
+				$("#city li[data-id="+citycode+"]").parent().addClass("shows");
+				$("#city li[data-id="+citycode+"]").addClass("hover");
+			}
+		}
 		return this;
 	},
 	initmemer:function(){
@@ -277,21 +312,21 @@ var relationFlag=false;
 
 //加载关系网
 function initRelation(){
-	$("#entrelation").height(500);
 	$.ajax({
 		url: "/member/getRelation",
 		method: "post",
 		data: {regNo:regNo,entName:entName},
 		success: function(r){
+			console.log(r);
 			if(!r || !r.flag || !r.relation || !r.relation.links || r.relation.links.length == 0 || !r.relation.nodes || r.relation.nodes.length <= 1){
-				alert("没有关系数据！");
+				
 			}else{
 				$(".entrelation").height($(".ent-tab-content").height());
 				loadJS(cdn+"/js/d3.v3.min.js",function(){
 					loadJS(cdn+"/js/geometry.js",function(){
 						loadJS(cdn+"/js/provinceData.min.js",function(){
 							loadJS(cdn+"/js/relation.js",function(){
-								relationEntity = new Relation(legcerNo,regNo,regCapCurName,r.relation);
+								relationEntity = new Relation(legcerNo,regNo,regCapCurName,r.relation,true);
 								relationEntity.init();
 							});
 						});
@@ -300,9 +335,7 @@ function initRelation(){
 			}
 		},
 		error: function(){
-			alert("没有关系数据！");
+			$("div[data-id=c_relation]").addClass("disabled");
 		}
 	});
 }
-
-

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

@@ -156,7 +156,7 @@ function b_afterLogin(flag,result){
 	if(typeof(result) != "undefined"){
 		identWayFlag = result.identWay == 1;
 	}
-	//identWayFlag = true;//暂时把认证权限放开
+	identWayFlag = true;//暂时把认证权限放开
 	relationFlag = flag && identWayFlag && !relFlag;
 	if(!$(".ent-tab>li:eq(1)").hasClass("ent-active") && relationFlag){
 		$(".ent-tab>li:eq(1)").addClass("disabled");
@@ -195,7 +195,7 @@ function initRelation(){
 								loadJS(cdn+"/js/geometry.js",function(){
 									loadJS(cdn+"/js/provinceData.min.js",function(){
 										loadJS(cdn+"/js/relation.js",function(){
-											relationEntity = new Relation(legcerNo,regNo,regCapCurName,r.relation);
+											relationEntity = new Relation(legcerNo,regNo,regCapCurName,r.relation,r.relation.nodes.length>15);
 											relationEntity.init();
 										});
 									});

core/src/web/staticres/js/relation.js

@@ -1,9 +1,9 @@
-function Relation(legcerNo,regNo,regCapCurName,data){
+function Relation(legcerNo,regNo,regCapCurName,data,modleFlag){
 	this.legcerNo = legcerNo;
 	this.regNo = regNo;
 	this.regCapCurName = regCapCurName;
 	this.data = data;
-	this.modleFlag = data.nodes.length>15;
+	this.modleFlag = modleFlag;
 	this.defaultIsPattern = this.modleFlag;
 	this.zoomlevel = 1;
 	this.w = 0;
@@ -93,10 +93,10 @@ Relation.prototype.init = function(){
 	$("#entrelation-fullscreen").attr("title","进入全屏视图"+((!!window.ActiveXObject || "ActiveXObject" in window)?"":" (F11)"));
 	///////////////////////关系网实例////////////////////////////
 	var htmls="<div style='position:absolute;top:0px;' class='legend'>";
-	htmls= htmls+ "<div class='legend-text-bg' style='margin-top: 10px;'><div style='background-color: #ff9800;opacity: 0.8;'></div><span style='margin-left: 20px;color: #ffffff;'>本企业</span></div>";
-	htmls= htmls+ "<div class='legend-text-bg' style='margin-top: 10px;'><div style='background-color: #ABE6DB;'></div><span style='margin-left: 12px;color: #056351;'>其他企业</span></div>";
-	htmls= htmls+ "<div class='legend-text-bg' style='margin-top: 10px;'><div style='background-color: #2196f3;'></div><span style='margin-left: 25px;color: #ffffff;'>个人</span></div>";
-	htmls= htmls+ "<div class='legend-text-bg' style='margin-top: 10px;margin-bottom: 10px;'><div style='background-color: #afafaf;'></div><span style='margin-left: 5px;color: #ffffff;'>注吊销企业</span></div>";
+	htmls= htmls+ "<div class='legend-text-bg' style='margin-top: 10px;'><div style='background-color: #ff9800;opacity: 0.8;'></div><span style='margin-left: 35px;color: #ffffff;'>本企业</span></div>";
+	htmls= htmls+ "<div class='legend-text-bg' style='margin-top: 10px;'><div style='background-color: #ABE6DB;'></div><span style='margin-left: 27px;color: #056351;'>其他企业</span></div>";
+	htmls= htmls+ "<div class='legend-text-bg' style='margin-top: 10px;'><div style='background-color: #2196f3;'></div><span style='margin-left: 7px;color: #ffffff;'>其他单位和个人</span></div>";
+	htmls= htmls+ "<div class='legend-text-bg' style='margin-top: 10px;margin-bottom: 10px;'><div style='background-color: #afafaf;'></div><span style='margin-left: 20px;color: #ffffff;'>注吊销企业</span></div>";
 	htmls= htmls+ "<div style='position: relative;'><span style='position: absolute;top: 7.5px;width: 25px;height: 5px;background-color: #e2e2e2;'></span><span style='position: absolute;left: 25px;top: 4px;border-top: 6px solid transparent;border-bottom: 6px solid transparent;border-left: 12px solid #e2e2e2;'></span><span style='margin-left: 45px;'>投资关系（股东→企业）</span></div>";
 	htmls= htmls+ "<div style='position: relative;'><span style='position: absolute;top: 7.5px;width: 25px;height: 5px;background-color: #cd93d7;'></span><span style='position: absolute;left: 25px;top: 4px;border-top: 6px solid transparent;border-bottom: 6px solid transparent;border-left: 12px solid #cd93d7;'></span><span style='margin-left: 45px;'>法定代表人</span></div>";
 	//htmls= htmls+ "<div style='margin:10px 0px;' class='hidden-sm hidden-xs'><span class='text-muted'>提示：点击鼠标右键可以删除不想看的节点。</span></div>";
@@ -763,7 +763,7 @@ Relation.prototype.makeRelation = function(){
 		}
 	})
 	.style("cursor",function (d,i){
-		if(d.type == "e"){
+		if(d.type == "e" && d.haslink){
 			return "pointer";
 		}else{
 			return "auto";
@@ -783,8 +783,8 @@ Relation.prototype.makeRelation = function(){
     	return p.type=="p"?"#ffffff":p.type=="ce"?"#ffffff":"#056351";
 	})
 	.on("click",function (d,i){
-		if(!dragstatus && d.type == "e"){
-			window.open("/enterpriseInfoByRegNO/"+d.name+".html");
+		if(!dragstatus && d.type == "e" && d.haslink){
+			window.open("/enterprise/"+d.entmid+".html");
 		}
 	});
 	thisClass.makeTextBg();

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

@@ -1,6 +1,6 @@
 <div class="comnav">
-	<center><span class="glyphicon bofangjilu"></span>&nbsp;&nbsp;变更信息</center>
-	<span style="float:left;font-size:11px;padding-right:10px;margin-top:-19px;" data="c_alter" onclick="childrenshow(this);">&lt;&nbsp;企业信息</span>
+	<center><span class="glyphicon biangengxinxi"></span>&nbsp;&nbsp;变更信息</center>
+	<span class="header" data="c_alter" onclick="childrenshow(this);">&lt;&nbsp;企业信息</span>
 </div>
 <div class="ent-alterinfo">
 	<div class="ent-layout-up">
@@ -14,7 +14,7 @@
 						<div>
 							<span onclick="viewcontent(this);">查看详情</span>
 							<div class="hides content">
-							变更前：{{$v.AltBe}}<br>变更后：{{$v.AltAf}}
+							变更前：{{$v.AltBe}}打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方打发第三方<br>变更后：{{$v.AltAf}}
 							</div>
 						</div>
 						<a></a>

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

@@ -1,33 +1,33 @@
 <div class="comnav">
-	<center><span class="glyphicon qiyehuangye"></span>&nbsp;&nbsp;基本信息</center>
-	<span style="float:left;font-size:11px;padding-right:10px;margin-top:-19px;" data="c_baseinfo" onclick="childrenshow(this);">&lt;&nbsp;企业信息</span>
+	<center><span class="glyphicon qiyegaikuang"></span>&nbsp;&nbsp;企业概况</center>
+	<span class="header"  data="c_baseinfo" onclick="childrenshow(this);">&lt;&nbsp;企业信息</span>
 </div>
 <div class="combody baseinfo">
 	<ul>
 		<li>
 			<div class="col-xs-4">
-					<span class="glyphicon glyphicon-flag colorc"></span>
+					<img src="/images/entcommunity/zhucehao.png"   width=14 />
 					<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>
 		</li>
 		<li>
 			<div class="col-xs-4">
-				<span class="glyphicon glyphicon-flag colorc"></span>
+				<img src="/images/entcommunity/hangye.png"  width=14 />
 				<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>
 		</li>
 		<li>
 			<div class="col-xs-4">
-				<span class="glyphicon glyphicon-flag colorc"></span>
+				<img src="/images/entcommunity/chenglirizi.png"  width=14/>
 				<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>
 		</li>
 		<li>
 			<div class="col-xs-4">
-				<span class="glyphicon glyphicon-flag colorc"></span>
+				<img src="/images/entcommunity/shijian.png"  width=14 />
 				<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>
@@ -36,7 +36,7 @@
 		{{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">
-					<span class="glyphicon glyphicon-flag colorc"></span>
+					<img src="/images/entcommunity/ziben.png"  width=14 />
 					<span class="ent">注册资本</span>
 				</div>
 				<span class="col-xs-8 entvar">
@@ -44,7 +44,7 @@
 				</span>
 				{{else}}
 					<div class="col-xs-4">
-						<span class="glyphicon glyphicon-flag colorc"></span>
+						<img src="/images/entcommunity/ziben.png"  width=14 />
 						<span class="ent entnull">注册资本</span>
 					</div>
 					<span class="col-xs-8 entvar">
@@ -64,38 +64,38 @@
 		</li>
 		<li>
 			<div class="col-xs-4">
-				<span class="glyphicon glyphicon-flag colorc"></span>
+				<img src="/images/entcommunity/dizhi.png"  width=14 />
 				<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>
 		</li>
 		<li>
 			<div class="col-xs-4">
-				<span class="glyphicon glyphicon-flag colorc"></span>
+				<img src="/images/entcommunity/gongsileixing.png"  width=14 />
 				<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>
 		</li>
 		<li>
 			<div class="col-xs-4">
-				<span class="glyphicon glyphicon-flag colorc "></span>
+				<img src="/images/entcommunity/dengjijiguan.png"  width=14 />
 				<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>
 		</li>
-		<li>
+<!--		<li>
 			<div class="col-xs-4">
 				<span class="glyphicon glyphicon-flag colorc"></span>
 				<span class="ent entnull">公司规模</span>
 			</div>
 			<span class="col-xs-8 entvar">空</span>
-		</li>
+		</li>-->
 		<li>
 			<div class="col-xs-5">
-				<span class="glyphicon glyphicon-flag colorc"></span>
+				<img src="/images/entcommunity/ren.png"  width=14 />
 				<span class="ent {{if not .T.res.LeRep}} entnull {{end}}">法定代表人</span>
 			</div>
-			<div class="col-xs-6" style="margin-left:-8.33333334%;">
+			<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>
 		</li>

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

@@ -71,7 +71,7 @@
 			</div > 
 			<div class="col-xs-12" style="text-align:center;clear:both;">
 				<div  class="type">{{.T.res.EntTypeName}}</div>
-				<div class="taupe {{if eq .T.res.OpStateName "注销" "吊销"}}ent-status-r{{else}}ent-status-g{{end}}">
+				<div class="taupe {{if eq .T.res.OpStateName "注销" "吊销" "吊销未注销"}}ent-status-r{{else}}ent-status-g{{end}}">
 				<script>
 					var OpStateName = {{.T.res.OpStateName}};
 					if(OpStateName.length > 2){
@@ -94,10 +94,10 @@
 		<div class="col-xs-12 index-navtable">
 			<div class="col-xs-4 content" data-id="c_baseinfo" onclick="childrenshow(this);">
 				<div style="height:50%;padding-top:30%;">
-						<span class="glyphicon qiyehuangye" ></span>
+						<span class="glyphicon qiyegaikuang " ></span>
 					</div>
 					<div style="height:50%;" >
-						基本信息
+						企业概况
 					</div>
 			</div>
 			<div class="col-xs-4 content" data-id="c_relation" onclick="childrenshow(this);">
@@ -113,12 +113,12 @@
 						<span class="glyphicon zhuyaorenyuan " ></span>
 					</div>
 					<div style="height:50%;" >
-						主要人员
+						主要人员(<span class="count">0</span>)
 					</div>
 			</div>
 			<div class="col-xs-4 content" data-id="c_alter" onclick="childrenshow(this);">
 				<div style="height:50%;padding-top:30%;">
-					<span class="glyphicon bofangjilu" ></span>
+					<span class="glyphicon biangengxinxi" ></span>
 				</div>
 				<div style="height:50%;" >
 					变更信息(<span class="count">0</span>)
@@ -173,9 +173,10 @@
 <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();
-			initRelation();
 			DishonestyPaging();
 			setDisabled();
 	})
@@ -196,7 +197,13 @@
 		}else{
 			$("div[data-id='c_sx'] .count").text(dishonesty.count);
 		}
-			
+		//主要人员
+		var memberlength=$(".b-com-name").length;
+		if(memberlength==0){
+			$("div[data-id='c_member']").addClass("disabled");
+		}else{
+			$("div[data-id='c_member'] .count").text(memberlength);
+		}
 		//变更信息
 		var alterlength=$(".ent-alterinfo li").length-1;
 		if(alterlength<=0){
@@ -209,8 +216,12 @@
 		if(cardlength==0){
 			$(".yellowpage").addClass("disabled");
 		}
+		if(!relflag){
+			$("div[data-id=c_relation]").addClass("disabled");
+		}
 	}
 	function childrenshow(n){
+		
 		var node=$(n);
 		if(node.hasClass("disabled")){
 			return;
@@ -218,6 +229,9 @@
 		if (node.attr("data-id")){
 			$("#header").hide();
 			$("#"+node.attr("data-id")).show();
+			if (node.attr("data-id")=="c_relation" && $("svg").length==0){
+				initRelation();
+			}
 		}else{
 			$("#header").show();
 			$("#"+node.attr("data")).hide();
@@ -230,8 +244,14 @@
 	$(function(){
 		$(".date").each(function(i,n){
 				var i=parseFloat($(n).text());
-				$(n).text(new Date(i).Format("yyyy-mm-dd"));
-		})
+				var d=new Date(i).FormatEnhance("yyyy-mm-dd");
+				$(n).text	("");
+				$(n).append("<span>"+d+"</span>");
+		});
+		$(".newsInfo li").click(function(n){
+			var node=$(b.target);
+			window.location.href=node.find("a").attr("href");
+		});
 	})
 	function wgw(){
 		window.location.href='/ent/wsite/preview/'+entId;
@@ -252,5 +272,6 @@
 	var service = {{.T.service}};
 	var relation = {{.T.relation}};
 	var copyright = {{.T.copyright}};
+	var relflag={{.T.relflag}};
 </script>
 </html>

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

@@ -66,6 +66,7 @@ if(typeof(signature) != "undefined" && signature != null && signature.length ==
 						<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="" />
+							<input type="hidden" name="mingpian" id="mingpian" value="" />
 							<span class="glyphicon glyphicon-camera input-after" id="camera"></span>
 							<span class="input-group-addon"><span onclick="$('#search').submit();" class="glyphicon glyphicon-search"></span></span>
              		</div>
@@ -97,7 +98,6 @@ $("#camera").click(function(){
 	 	}
 	});
 })
-
 function uploadImage(localId){
 	wx.uploadImage({
 	    localId: localId, // 需要上传的图片的本地ID，由chooseImage接口获得
@@ -117,19 +117,25 @@ function getmpname(serverId){
         error: function(){return false;}, 
         success:function(obj){
 			if(obj["on"]=="y"){
-				if(obj["name"]==""){
+				if(obj["names"]==""){
 					alert("未匹配的对应的名称");
 				}else{
-					$("#query").val(obj["name"]);
-				 	$("#i_mingpian").val("1");
-				 	$("#search").submit();	
+					if (obj["names"].length>0){
+						$("#query").val(obj["names"][0]);
+						$("#i_mingpian").val("1");
+						$("#mingpian").val(obj.join(","));
+						$("#search").submit();	
+					}else{
+						alert("没有成功识别!");
+					}		 	
 				}
 			}else{
-				alert("功能调用太频繁，请稍后再试！");
+				alert("名片识别请求过多！请稍后再试，或者进入查询界面输入文字查询。");
 			}
         } 
     }); 
 }
+
 </script>
 
 </body>

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

@@ -15,14 +15,13 @@
 		<div class="containers">
 			<form  id="queryform" method="post">
 			<input type="text" id="query" name="words" value="{{.T.querymap.query}}" class="searchtext"/>
-			<input type="hidden" name="city" id="citys" value="">
-			<input type="hidden" name="cityNo" id="cityNo" value="1">
-			<input type="hidden" name="c_author" id="author" value="">
-			<input type="hidden" name="OpState" value="">
+			<input type="hidden" name="city" id="citys" value="{{.T.querymap.city}}">
+			<input type="hidden" name="cityNo" id="" value="1">
+			<input type="hidden" name="i_mingpian" id="i_mingpian" value="" />
 			<input type="hidden" name="c_hfl" id="c_hfl" value='{{.T.querymap.c_hfl}}'>
 			<input type="hidden" name="c_zb" id="c_zb" value='{{.T.querymap.c_zb}}'>
 			<a class="searchbtn1" id="camera"><b class="glyphicon glyphicon-camera"></b></a>
-			<a class="searchbtn"><b class="glyphicon glyphicon-search"></b></a>
+			<a class="searchbtn" onclick="$('#queryform').submit();"><b class="glyphicon glyphicon-search"></b></a>
 			<a href="javascript:" class="searchlink">高级搜索</a>
 				<div id="immediately" class="immediately">
 				</div>
@@ -39,13 +38,11 @@
 			<div id="province" class="left">
 				<ul >
 					<li></li>
-					<li data-id="0">不限</li>
+					<li data-id="0">全国</li>
 				</ul>
 			</div>
-			<div id="city" class="right">
+			<div id="city" class="right shows">
 				<ul id="city_0">
-					<li></li>
-					<li data-id="0">不限</li>
 				</ul>
 			</div>
 		</div>
@@ -64,7 +61,12 @@
 		<ul class="inclist">
 				
 		</ul>
-	<div class="text-center hides" style="margin:50% auto;" id="finderror"><img src="//cdn.qmx.top:9000/images/findnull.png" width=100><h6><strong class="text-muted">没有找到相关内容，换个关键词试试</strong></h6></div>
+	<div class="text-center hides" style="margin:20% auto;" id="finderror"><img src="//cdn.qmx.top:9000/images/findnull.png" width=150 style="margin-left:18px;">
+		<h6 id="case1" style="display:none;"><strong class="text-muted">没有找到相关内容，换个关键词试试</strong></h6>
+		<h6 id="case2" style="display:none;margin-top: -12px;"><strong class="text-muted">
+		
+		</strong></h6>
+	</div>
 	</div>
 	<center style="clear:both;"><a class="loadmore btn btn-link hides" style="display:inline-block;" onclick="loadData();">加载更多</a></center>
 	<center class="nomore hides"><div style="margin:20px;">没有搜索到？尝试更精确的搜索条件!</div></center>
@@ -86,10 +88,32 @@
 				data=[];
 				$(".loadmore").hide();
 				$("#finderror").show();
+				if (entcard&&entcard!=""){
+					var tip="<p>没有找到{ent0},</p><p> 如果这不是企业名称，请选择名片上的企业名称</p><p>{ent1}&nbsp;{ent2}&nbsp;{ent3}</p>"
+					var cards=entcard.split(",");
+					for(var i=0;i<4;i++){
+						var flag="{ent"+i+"}";
+						if (i>=cards.length){
+							tip=tip.replace(flag,"");
+						}else{
+							tip=tip.replace(flag,"”<a>"+cards[i]+"</a>”");
+						}
+					}
+					console.log(tip);
+				$("#case2 strong").append(tip);
+				$("#finderror a").click(function(n){
+					$("#query").val($(n.target).text());
+					$("#queryform").submit();
+				});
+				$("#case2").show();
+				}else{
+					$("#case1").show();
+				}
 			}
 		});
 		var i=0;
 		var data={{.T.data}}
+		var entcard={{.T.querymap.entcard}};
 		var strVar = "";
 		strVar += "<li class=\"col-xs-12\"><table align=\"center\"><caption><div class=\"left\"><a href=\"/enterprise/$Id.html\">$EntName</a><\/div><b class=\"$status\" style='float:right;margin-right:10px;'>$OpStateName<\/b><\/caption><tr><td class=\"left\">注册号：<span>$RegNo<\/span><\/td><td align='right'>法定代表人：<span>$LeRep<\/span><\/td><\/tr><tr><td class=\"left\">成立时间：<span>$EstDate<\/span><\/td><td align='right'>所在地：<span>$OpLocDistrict<\/span><\/td><\/tr><tr><td colspan=\"2\"><hr class=\"list\"><\/td><\/tr><\/table><\/li>";
 		
@@ -200,19 +224,25 @@
 		        error: function(){return false;}, 
 		        success:function(obj){
 					if(obj["on"]=="y"){
-						if(obj["name"]==""){
+						if(obj["names"]==""){
 							alert("未匹配的对应的名称");
 						}else{
-							$("#query").val(obj["name"]);
-						 	$("#i_mingpian").val("1");
-						 	$("#search").submit();	
+							if (obj["names"].length>0){
+								$("#query").val(obj["names"][0]);
+								$("#i_mingpian").val("1");
+								$("#mingpian").val(obj.join(","));
+								$("#search").submit();	
+							}else{
+								alert("没有成功识别!");
+							}		 	
 						}
 					}else{
-						alert("功能调用太频繁，请稍后再试！");
+						alert("名片识别请求过多！请稍后再试，或者进入查询界面输入文字查询。");
 					}
 		        } 
 		    }); 
 		}
+
 		</script>
 
  </body>

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

@@ -1,6 +1,6 @@
 <div class="comnav">
 	<center><span class="glyphicon zhuyaorenyuan "></span>&nbsp;&nbsp;主要人员</center>
-	<span style="float:left;font-size:11px;padding-right:10px;margin-top:-19px;" data="c_member" onclick="childrenshow(this);">&lt;&nbsp;企业信息</span>
+	<span class="header"  data="c_member" onclick="childrenshow(this);">&lt;&nbsp;企业信息</span>
 </div>
 <div>
 	<div class="ent-mainperson">

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

@@ -1,6 +1,6 @@
 <div class="comnav">
 	<center><span class="glyphicon qiyexinwen  "></span>&nbsp;&nbsp;企业新闻</center>
-	<span style="float:left;font-size:11px;padding-right:10px;margin-top:-19px;" data="c_news" onclick="childrenshow(this);">&lt;&nbsp;企业信息</span>
+	<span class="header"  data="c_news" onclick="childrenshow(this);">&lt;&nbsp;企业信息</span>
 </div>
 <div class="entinfo-page" style="background:#FFF;">
 	<div class="b-right"> 

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

@@ -1,6 +1,6 @@
 <div class="comnav">
 	<center><span class="glyphicon guanxiwang1"></span>&nbsp;&nbsp;关系网</center>
-	<span style="float:left;font-size:11px;padding-right:10px;margin-top:-19px;" data="c_relation" onclick="childrenshow(this);">&lt;&nbsp;企业信息</span>
+	<span class="header"  data="c_relation" onclick="childrenshow(this);">&lt;&nbsp;企业信息</span>
 </div>
 		<div class="entrelation" id="entrelation">
 			<div id="entrelation-infovis"></div>

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

@@ -1,6 +1,6 @@
 <div class="comnav">
 	<center><span class="glyphicon shixinxinxi "></span>&nbsp;&nbsp;失信信息</center>
-	<span style="float:left;font-size:11px;padding-right:10px;margin-top:-19px;" data="c_sx" onclick="childrenshow(this);">&lt;&nbsp;企业信息</span>
+	<span class="header" data="c_sx" onclick="childrenshow(this);">&lt;&nbsp;企业信息</span>
 </div>
 <div class="ent-dishonesty">
 	<table id="dishonestyList" class="table ent-table">

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

@@ -1,6 +1,6 @@
 <div class="comnav">
-	<center><span class="glyphicon zhuyaorenyuan "></span>&nbsp;&nbsp;企业名片</center>
-	<span style="float:left;font-size:11px;padding-right:10px;margin-top:-19px;" data="c_card" onclick="childrenshow(this);">&lt;&nbsp;企业信息</span>
+	<center><span class="glyphicon qiyemingpian"></span>&nbsp;&nbsp;企业名片</center>
+	<span class="header"  data="c_card" onclick="childrenshow(this);">&lt;&nbsp;企业信息</span>
 </div>
 <div class="combody baseinfo yellowpage">
 		<ul>
@@ -65,6 +65,13 @@
 						$("#location").text(a);
 			})	
 		</script>
+		{{else}}
+			<li>
+				<div class="col-xs-1 text-right">
+						<span class="glyphicon dizhi colorfont"></span>
+				</div>
+				<span class="col-xs-11 entvar" id="location">{{.T.res.Dom}}</span>
+			</li>
 		{{end}}
 		</ul>
 </div>

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

@@ -17,12 +17,23 @@
 		<div class="entinfo-cart">
 			<div class="b-com-first">
 				<font class="b-com-title">{{if .T.res.EntName}}{{.T.res.EntName}}{{end}}</font>
-				{{if .T.res.OpStateName}}
-				<span class="{{if eq .T.res.OpStateName "注销" "吊销"}}ent-status-r{{else}}ent-status-g{{end}}">
+				{{if .T.res.OpState}}
+				<span class="{{if eq .T.res.OpState "07" "08" "11"}}ent-status-r{{else}}ent-status-g{{end}}">
 				<script>
+					var OpState = {{.T.res.OpState}};
 					var OpStateName = {{.T.res.OpStateName}};
-					if(OpStateName.length > 2){
-						OpStateName = OpStateName.substring(0,2);
+					if(OpState == "07"){
+						OpStateName = "注销";
+					}else if(OpState == "08"){
+						OpStateName = "撤销";
+					}else if(OpState == "11"){
+						OpStateName = "吊销";
+					}else if(OpState == "06"){
+						OpStateName = "存续";
+					}else{
+						if(OpStateName.length > 2){
+							OpStateName = OpStateName.substring(0,2);
+						}
 					}
 					document.write(OpStateName);
 				</script>
@@ -476,12 +487,14 @@
 			<div class="b-adver-content">
 				<ul>
 				{{range $k,$v := .T.relevantEnts}}
+					{{if le $k 6}}
 					<li class="cursor-pointer{{if eq $k 0}} margin-0 border-t-0{{end}}" onclick="window.location.href='/enterprise/{{$v._id}}.html'">
 						<div>
 							<img src="{{if $v.s_avatar}}{{$v.s_avatar}}{{else}}null{{end}}" onerror="this.src='{{Msg "seo" "cdn"}}/images/ent-logo.png'">
 							<a href="/enterprise/{{$v._id}}.html">{{$v.EntName}}</a>
 						</div>
 					</li>
+					{{end}}
 				{{end}}
 				</ul>
 				<div class="clearfix"></div>