Selaa lähdekoodia

修改手机版企业社区

李广朋 9 vuotta sitten
vanhempi
commit
69f8fdcae5

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

@@ -34,10 +34,9 @@ type EntInfo struct {
 
 //企业社区首页
 func (search *Search) EntCommunity() error {
-
 	regex, _ := regexp.Compile("(Android|Mobile)")
 	ismobile := regex.FindAllString(search.Header("User-Agent"), -1)
-	if ismobile > 0 {
+	if len(ismobile) > 0 {
 		search.T["signature"] = mobile.GetSignature(search.Url())
 		search.Render("/member/incmobile/index.html", &search.T)
 		return nil

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

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

+ 27 - 48
core/src/qfw/yellowpage/yellowpagemanager.go

@@ -208,58 +208,25 @@ func WxGetEntInfo(id string, flag bool) interface{} {
 }
 
 //企业黄查询结果
-func (yp *Yellowpage) WxenterpriseInfo(id string) error {
-	//redisEnt := redis.Get("ent", "Key")
-	id = strings.Split(id, "#")[0]
-	//没有登录
-	key := "wx_enterpriseInfo_" + id
-	//登录并认证
-	keyuser := "wx_enterpriseInfo_user_" + id
-	//登录没有认证
-	keyunrzuser := "wx_enterpriseInfo_unrzuser_" + id
-	if yp.GetSession("userId") == nil {
-		//用户没有登录
-		if ret, err := redis.GetBytes("enterprise", key); err == nil {
-			return yp.SetBody(*ret)
-		} else {
-			yp.T["res"] = WxGetEntInfo(id, false)
-			content, err := yp.Render4Cache("/yellowpage/ungxenterpriseinfo.html", &yp.T)
-			if err == nil {
-				redis.PutBytes("enterprise", key, &content, ONEDAY)
-			}
-			return yp.SetBody(content)
-		}
-	} else if util.IntAll(yp.GetSession("identWay")) == 1 {
-		//已认证
-		if ret, err := redis.GetBytes("enterprise", keyuser); err == nil {
-			return yp.SetBody(*ret)
-		} else {
-			yp.T["res"] = WxGetEntInfo(id, true)
-			contentuser, erruser := yp.Render4Cache("/yellowpage/wxentinfo.html", &yp.T)
-			if erruser == nil {
-				redis.PutBytes("enterprise", keyuser, &contentuser, ONEDAY)
-			}
-			return yp.SetBody(contentuser)
-		}
-	} else {
-		//用户没有认证登录
-		if ret, err := redis.GetBytes("enterprise", keyunrzuser); err == nil {
-			return yp.SetBody(*ret)
-		} else {
-			yp.T["res"] = WxGetEntInfo(id, false)
-			contentuser, erruser := yp.Render4Cache("/yellowpage/unrzenterpriseinfo.html", &yp.T)
-			if erruser == nil {
-				redis.PutBytes("enterprise", keyunrzuser, &contentuser, ONEDAY)
-			}
-			return yp.SetBody(contentuser)
-		}
+func (yp *Yellowpage) WxenterpriseInfo(regNO string) error {
+	r := FindOne("enterprise", M{"RegNo": regNO})
+	if r == nil || len(*r) == 0 {
+		return yp.Render("/yellowpage/error.html")
 	}
+	id := strings.Split(fmt.Sprintf("%s", (*r)["_id"]), `"`)[1]
+	return yp.Redirect("/enterprise/" + id + ".html")
 }
 
 //企业黄查询结果
 func (yp *Yellowpage) EnterpriseInfo(id string) error {
 	id = strings.Split(id, "#")[0]
-	if ret, err := redis.GetBytes("enterprise", "enterpriseInfo_"+id); err == nil {
+	regex, _ := regexp.Compile("(Android|Mobile)")
+	ismobile := regex.FindAllString(yp.Header("User-Agent"), -1)
+	key := "enterpriseInfo_"
+	if len(ismobile) > 0 {
+		key = "menterpriseInfo_"
+	}
+	if ret, err := redis.GetBytes("enterprise", key+id); err == nil {
 		return yp.SetBody(*ret)
 	} else {
 		if info := GetEntInfo(id); info != nil {
@@ -319,9 +286,21 @@ func (yp *Yellowpage) EnterpriseInfo(id string) error {
 			yp.T["relation"] = relation
 			//著作权
 			yp.T["copyright"] = FindOne("enterprise_copyright", `{"EntId":"`+id+`"}`)
-			contentuser, erruser := yp.Render4Cache("/yellowpage/enterpriseinfo.html", &yp.T)
+
+			var contentuser []byte
+			var erruser error
+			if len(ismobile) > 0 {
+				contentuser, erruser = yp.Render4Cache("/member/incmobile/detailindex.html", &yp.T)
+			} else {
+				contentuser, erruser = yp.Render4Cache("/yellowpage/enterpriseinfo.html", &yp.T)
+			}
+
 			if erruser == nil {
-				redis.PutBytes("enterprise", "enterpriseInfo_"+id, &contentuser, 7*ONEDAY)
+				if len(ismobile) > 0 {
+					redis.PutBytes("enterprise", "menterpriseInfo_"+id, &contentuser, 7*ONEDAY)
+				} else {
+					redis.PutBytes("enterprise", "enterpriseInfo_"+id, &contentuser, 7*ONEDAY)
+				}
 			}
 			//过滤企业名
 			if ok && nodes != nil && len(*nodes) > 0 {

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

@@ -115,6 +115,15 @@ hr.list{
 	border:1px solid #16A086 !important;
 	color:#16A086
 }
+.loadmore:focus,.loadmore:hover{
+	background-color:#16A086;
+	color:#FFF;
+	text-decoration:none;
+}
+.nomore{
+	color:#B5B6BB;
+	font-size:11px;
+}
 .col-xs-12{
 	padding:0;	
 }
@@ -214,7 +223,9 @@ hr.list{
 	display:block;
 }
 /*首页*/
-
+#header div,.index span{
+	text-align:center;
+}
 .index-header{
 	height:185px;
 	width:100%;
@@ -259,10 +270,30 @@ hr.list{
 .index-middle div:first-child{
 	border-right:1px solid #16A086;
 }
-.index-navtable div{
+.index-navtable div.content{
 	border-right:1px solid #CCC;
 	border-bottom:1px solid #CCC;
 }
+.b-com-content>div {
+	margin-bottom: 20px;
+	margin-left:5px;
+	text-align: center;
+	word-wrap: break-word;
+	display: inline-block;
+	word-break: normal;
+	width: 90px;
+	vertical-align: top;
+}
+.b-com-content img {
+    width: 70px;
+    height: 70px;
+    border: 2px solid #16a086;
+    border-radius: 50%;
+    margin-bottom: 10px;
+}
+.b-com-content span{
+	display: block;
+}
 .index-navtable div:nth-child(3n+0)
 {
 	border-right:none;
@@ -319,6 +350,10 @@ hr.list{
 	min-width:70px;
 	text-align:center;
 }
+.baseinfo .entnull{
+	background:#DDD;
+	color:#7F7F7F;
+}
 .baseinfo .entvar{
 	display:inline-block;
 	padding-bottom:15px;
@@ -381,7 +416,7 @@ hr.list{
 	border-radius:70px;
 }
 .yellowpage{
-	padding-left:20px;
+	padding-left:15px;
 }
 .yellowpage li div.text-right{
 	padding-right:20px;
@@ -467,4 +502,47 @@ hr.list{
     /* color: #D5012C; */
     color: #dd4814 !important;
     font-weight: bold;
+}
+.creditrules div.title{
+	border-bottom: 1px solid #B2B2B2;
+	height: 40px;
+	line-height: 42px;
+	padding-left: 20px;
+	font-size: 13px;
+	color: #000;
+	background: #F6F7F8;
+}
+.creditrules div.content{
+	min-height: 170px;
+	padding: 20px 20px;
+}
+.ent-dishonesty{
+	text-align:left;
+	padding:20px;
+	padding-top:0px;
+}
+.ent-dishonesty .ent-table .b-com-first {
+    margin-bottom: 5px;
+    font-weight: bold;
+    font-size: 13px;
+}
+.ent-dishonesty .ent-table .b-com-second,.ent-dishonesty .ent-table .b-com-third {
+    margin-bottom: 5px;
+    color: #a0a0a0;
+	font-size:10px;
+}
+.ent-dishonesty .ent-table td {
+	text-align:left;
+	padding:0px !important;
+	margin-bottom:5px !important;
+}
+.ent-table tr:first-child {
+    border-top: none !important;
+}
+.entinfo-page .b-right{
+	margin-top:0px;
+}
+.colorfont{
+	font-size:13px;
+	color:#16A086;
 }

+ 221 - 10
core/src/web/staticres/js/entcommunity.js

@@ -58,7 +58,7 @@ mCommunity.prototype={
 			var child=obj[i].s;
 			var ulchild=$("<ul></ul>");
 			ulchild.attr("id","city_"+obj[i].k);
-			ulchild.append("<li></li>");
+			ulchild.append("<li></li><li data-id="+obj[i].k+">全部</li>");
 			ulchild.addClass("hides");
 			for(var k=0;k<child.length;k++){
 				var lichild=$("<li></li>")	
@@ -103,9 +103,11 @@ mCommunity.prototype={
 			var node=$(i.target);
 			$("#city li[class='hover']").attr("class","");
 			node.attr("class","hover");
+			$("#citys").val(node.attr("data-id"));
+			$("#queryform").submit();
 		});
 		$("#province ul li").on("click",function(i){
-		var node=$(i.target);
+			var node=$(i.target);
 			$("#province ul li[class='hover']").attr("class","");
 			node.attr("class","hover");
 			target=$("#city #city_"+node.attr("data-id"));
@@ -114,18 +116,227 @@ mCommunity.prototype={
 					target.attr("class","shows");
 			}
 		});
-		$("#city li").click(function(n){
-			//这里处理地区筛选事物
-		})
+		$("#category li").click(function(n){
+			//这里处理行业筛选
+			var node=$(n.target);
+			$("#c_hfl").val(node.attr("value"));
+			$("#queryform").submit();
+		});
+		$("#reg li").click(function(n){
+			//这里处理注册资本筛选
+			var node=$(n.target);
+			$("#c_zb").val(node.attr("value"));
+			$("#queryform").submit();
+		});
 		return this;
+	},
+	initmemer:function(){
+		if(typeof(staffinfo) != "undefined" && staffinfo != null && staffinfo.length > 0){
+			var staffinfos1 = [],staffinfos2 = [],staffinfos3 = [],staffinfos4 = [];
+			for(var i=0;i<staffinfo.length;i++){
+				switch(staffinfo[i].Position){
+					case "410A":
+					case "410B":
+					case "410C":
+					case "431A":
+					case "431B":
+						staffinfos1.push(staffinfo[i]);
+						break;
+					case "432A":
+					case "432K":
+						staffinfos2.push(staffinfo[i]);
+						break;
+					case "434Q":
+					case "434R":
+					case "436A":
+						staffinfos3.push(staffinfo[i]);
+						break;
+					default:
+						staffinfos4.push(staffinfo[i]);
+						break;
+				}
+			}
+			staffinfos1.sort(function(a,b){return a.Position-b.Position});
+			staffinfos2.sort(function(a,b){return a.Position-b.Position});
+			staffinfos3.sort(function(a,b){return a.Position-b.Position});
+			staffinfos4.sort(function(a,b){return a.Position-b.Position});
+			var hm = '<div class="ent-mainpersons">';
+			//计算出一行可以放几个
+			var maxCout = parseInt($(".ent-tab-content").width() / (207+20));
+			var verticalFlag = false;
+			var appendStaffinfo = function(obj,index){
+				var tmp = 0;
+				for(var i=0;i<obj.length;i++){
+					var positionName = obj[i].PositionName;
+					if(typeof(positionName) == "undefined" || positionName == null || positionName == ""){
+						positionName = "监事";
+					}
+					tmp++;
+					if(i==0){
+						hm+='<div class="staffinfo-level-'+index+'">';
+						if(verticalFlag){
+							hm+='<a class="staffinfo-vertical"></a>';
+						}
+					}
+					verticalFlag = true;
+					hm+='<div><img src="'+cdn+'/images/entcommunity/mainperson'+index+'.png">'
+						+'<span><font class="b-com-name">'+obj[i].Name+'</font><font class="ent-positionName">'+positionName+'</font></span></div>';
+					if (i%2==0){
+						hm+="<div class='sp'>&nbsp;</div>";
+					}
+					//竖线
+					if(tmp == maxCout && i != obj.length-1){
+						hm+='<a class="staffinfo-vertical"></a>';
+					}
+					//横线
+					if(i != obj.length-1){
+						if(tmp <= maxCout-1){
+							hm+='<a class="staffinfo-horizontal"></a>';
+						}else{
+							tmp = 0;
+						}
+					}
+					if(i==obj.length-1){
+						hm+='</div>';
+					}
+				}
+			}
+			appendStaffinfo(staffinfos1,1);
+			appendStaffinfo(staffinfos2,2);
+			appendStaffinfo(staffinfos3,3);
+			appendStaffinfo(staffinfos4,4);
+			hm+='</div>';
+			$(".ent-mainperson").html(hm);
+			for(var i=0;i<5;i++){
+				var node=$(".staffinfo-level-"+i).children().last();
+				var node1=$(".staffinfo-level-"+i).children().first();
+				if(node.attr("class")=="sp"){
+					node.remove();
+				}
+				node1.css("margin-bottom","-5px");
+			}
+		}
+		else{
+			$(".memberinfo").show();
+		}
 	}
 }
 
 mCommunity.prototype.init.prototype = mCommunity.prototype;
 
 function changeSearchBorder(){
-		var width=$("#query").css("width");
-		width=width.substr(0,width.indexOf("p"))-30+"px";
-		$("#immediately").css("width",width);
-		$("#immediately").css("margin-left",$("#query").offset().left+15);
-	}
+	var width=$("#query").css("width");
+	width=width.substr(0,width.indexOf("p"))-30+"px";
+	$("#immediately").css("width",width);
+	$("#immediately").css("margin-left",$("#query").offset().left+15);
+}
+
+function viewcontent(n){
+	var node=$(n);
+	$(".modal-backdrop").show();
+	$(".creditrules").show();
+	$(".creditrules .content").text(node.parent().find("div").text());
+}
+hasLoadPagingJs=false
+//失信信息
+function DishonestyPaging(){
+	this.initDishonesty = function(){
+		var paging = new Paging("dishonestyListPaging","/front/getDishonesty",{legcerNo:legcerNo},dishonesty.pageSize,function(r){
+			var html = '';
+			for(var i=0;i<r.length;i++){
+				html += '<tr><td>'
+					+'<div style="height:10px;"></div>'
+					+'<div class="b-com-first">'+r[i].iname+'</div>'
+					+'<div class="b-com-second"><span>案号:'+r[i].case_code+'</span>&nbsp;&nbsp;<span>法院:'+r[i].court_name+'</span>'+'</div>'
+					+'<div class="b-com-third">'
+						+'<span>状态:'+r[i].performance+'</span>'
+						+'<span>立案日期:'+new Date(Number(r[i].l_date+"000")).Format("yyyy-MM-dd")+'</span>'
+					+'</div>'
+					+'</td></tr>';;
+			}
+			$("#dishonestyListPaging").append(html);
+		},dishonesty);
+		paging.firstPageDatas = null;
+	}
+	if(hasLoadPagingJs){
+		this.initDishonesty();
+	}else{
+		var thisClass = this;
+		loadJS(cdn+"/js/paging.js",function(){
+			hasLoadPagingJs = true;
+			thisClass.initDishonesty();
+		});
+	}
+}
+var identWayFlag = true;
+var isLogined=true;
+var relationFlag=false;
+
+//加载关系网
+function initRelation(){
+	if(isLogined){
+		/*if($("#entrelation-limit").hasClass("hide")){
+			$(".entrelation").height($(".ent-tab-content").height());
+		}*/
+		var relationNoData = function(){
+			$("#entrelation-limit,#entrelation-nologin").addClass("hide");
+			relationEntity = "";
+			$("#entrelation-infovis").hide();
+			$("#entrelation-findnull").removeClass("hide");
+		}
+		if(identWayFlag){
+			if(relationFlag){
+				relationNoData();
+			}else{
+				$("#entrelation-limit,#entrelation-nologin").addClass("hide");
+				$(".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,relation);
+								relationEntity.init();
+							});
+						});
+					});
+				});
+			}
+		}else{
+			$("#entrelation-nologin").addClass("hide");
+			$("#entrelation-limit,#entrelation-noauthe").removeClass("hide");
+			$("#entrelation-infovis").hide();
+		}
+		/*$.ajax({
+			url: "/member/getRelation",
+			method: "post",
+			data: {regNo:regNo,entName:entName},
+			success: function(r){
+				if(r.flag == false){
+					$("#entrelation-nologin").addClass("hide");
+					$("#entrelation-limit,#entrelation-noauthe").removeClass("hide");
+					$("#entrelation-infovis").hide();
+				}else if(r.flag == true && (r == null || typeof(r) == "undefined" || typeof(r.relation.links) == "undefined" || r.relation.links.length == 0 || typeof(r.relation.nodes) == "undefined" || r.relation.nodes.length <= 1)){
+					relationNoData();
+				}else if(r.flag == true){
+					$("#entrelation-limit,#entrelation-nologin").addClass("hide");
+					$(".entrelation").height(500);
+					loadJS("/js/d3.v3.min.js",function(){
+						loadJS("/js/geometry.js",function(){
+							loadJS("/js/relation.js",function(){
+								relationEntity = new Relation(legcerNo,regNo,regCapCurName,r.relation);
+								relationEntity.init();
+							});
+						});
+					});
+				}else{
+					relationNoData();
+				}
+			},
+			error: function(){
+				relationNoData();
+			}
+		});*/
+	}else{
+		$("#entrelation-limit,#entrelation-nologin").removeClass("hide");
+	}
+}

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

@@ -0,0 +1,70 @@
+<div class="comnav">
+	<span></span>
+	变更信息
+	<span style="float:right;font-size:11px;padding-right:10px;" data="c_alter" onclick="childrenshow(this);">{{if .T.res.EntName}}{{.T.res.EntName}}{{end}}</span>
+</div>
+<div class="ent-alterinfo">
+	<div class="ent-layout-up">
+		<div class="b-com-content">
+			<ul>
+			{{range $k,$v := .T.res.alterInfo}}
+				<li>
+					<div>
+						<div class="date">{{$v.AltDate}}</div>
+						<div>{{$v.AltItemName}}</div>
+						<div>
+							<span onclick="viewcontent(this);">查看详情</span>
+							<div class="hides content">
+							变更前:{{$v.AltBe}}<br>变更后:{{$v.AltAf}}
+							</div>
+						</div>
+						<a></a>
+					</div>
+					<div>
+						<div class="date">{{$v.AltDate}}</div>
+						<div>{{$v.AltItemName}}</div>
+						<div>
+							<span onclick="viewcontent(this);">查看详情</span>
+							<div class="hides content">
+							变更前:{{$v.AltBe}}<br>变更后:{{$v.AltAf}}
+							</div>
+						</div>
+						
+						<a></a>
+					</div>
+				</li>
+			{{end}}
+				<li class="end">
+					<div>
+						<div></div>
+						<div></div>
+						<div></div>
+						<a></a>
+					</div>
+					<div>
+						<div></div>
+						<div></div>
+						<div></div>
+						<a></a>
+					</div>
+				</li>
+				<script>
+					if($(".end").prev().length==0){
+						$(".end").remove();
+					}
+					document.write("<center>暂无变更信息<center>");
+				</script>
+				<div class="clearfix"></div>
+			</ul>
+	</div>
+	</div>
+</div>
+<div style="position: absolute;width:100%;z-index:4410;background:#FFF;bottom: 0;min-height: 270px;display:none;font-size:12px;" class="creditrules">
+		<div class="title">
+			详细变更信息
+			<button class="btn btn-link navcolor " style="float:right;"onclick="$(this).parent().parent().hide();$('.modal-backdrop').hide()" >确定</button>
+		</div>
+		<div class="content">
+		
+		</div>
+	</div>

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

@@ -1,115 +1,136 @@
 <div class="comnav">
 	<span></span>
 	基本信息
+	<span style="float:right;font-size:11px;padding-right:10px;" data="c_baseinfo" onclick="childrenshow(this);">{{if .T.res.EntName}}{{.T.res.EntName}}{{end}}</span>
 </div>
 <div class="combody baseinfo">
 	<ul>
 		<li>
 			<div class="col-xs-4">
 					<span class="glyphicon glyphicon-flag colorc"></span>
-					<span class="ent">注册号</span>
+					<span class="ent {{if not .T.res.RegNo}}entnull{{end}}">注册号</span>
 			</div>
-			<span class="col-xs-8 entvar">1112012350545</span>
+			<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>
-				<span class="ent">行业</span>
+				<span class="ent {{if not .T.res.IndustryPhyName}}entnull{{end}}">行业</span>
 			</div>
-			<span class="col-xs-8 entvar">互联网-电子商务</span>
+			<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>
-				<span class="ent">成立日期</span>
+				<span class="ent {{if not .T.res.EstDate}}entnull{{end}}">成立日期</span>
 			</div>
-			<span class="col-xs-8 entvar">1999年8月4日</span>
+			<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>
-				<span class="ent">营业期限</span>
+				<span class="ent {{if and (not .T.res.OpFrom) (not .T.res.OpTo)}} entnull{{end}}">营业期限</span>
 			</div>
-			<span class="col-xs-8 entvar">1999年18月14日-1999年18月14日</span>
+			<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>
 		</li>
 		<li>
-			<div class="col-xs-4">
-				<span class="glyphicon glyphicon-flag colorc"></span>
-				<span class="ent">注册资本</span>
-			</div>
-			<span class="col-xs-8 entvar">无</span>
+		{{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>
+					<span class="ent">注册资本</span>
+				</div>
+				<span class="col-xs-8 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">
+						<span class="glyphicon glyphicon-flag colorc"></span>
+						<span class="ent entnull">注册资本</span>
+					</div>
+					<span class="col-xs-8 entvar">
+						空
+					</span>
+				{{end}}
+			{{else}}
+				<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>
+			{{end}}
+			
 		</li>
 		<li>
 			<div class="col-xs-4">
 				<span class="glyphicon glyphicon-flag colorc"></span>
-				<span class="ent">地址</span>
+				<span class="ent {{if not .T.res.Dom}}entnull{{end}}">地址</span>
 			</div>
-			<span class="col-xs-8 entvar">郑州市经三路财富广场</span>
+			<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>
-				<span class="ent">企业类型</span>
+				<span class="ent {{if not .T.res.EntTypeName}} entnull{{end}}">企业类型</span>
 			</div>
-			<span class="col-xs-8 entvar">其他股份制有限公司(上市)</span>
+			<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>
-				<span class="ent">登记机关</span>
+				<span class="glyphicon glyphicon-flag colorc "></span>
+				<span class="ent {{if not .T.res.RegOrgName}}entnull{{end}}">登记机关</span>
 			</div>
-			<span class="col-xs-8 entvar">北京市工商行政管理局</span>
+			<span class="col-xs-8 entvar ">{{if .T.res.RegOrgName}}{{.T.res.RegOrgName}}{{else}}空{{end}}</span>
 		</li>
 		<li>
 			<div class="col-xs-4">
 				<span class="glyphicon glyphicon-flag colorc"></span>
-				<span class="ent">公司规模</span>
+				<span class="ent entnull">公司规模</span>
 			</div>
-			<span class="col-xs-8 entvar">500-999人</span>
+			<span class="col-xs-8 entvar"></span>
 		</li>
 		<li>
 			<div class="col-xs-5">
 				<span class="glyphicon glyphicon-flag colorc"></span>
-				<span class="ent">法定代表人</span>
+				<span class="ent {{if not .T.res.LeRep}} entnull {{end}}">法定代表人</span>
 			</div>
-			<div class="col-xs-2">
-				<span class="col-xs-12 entvar">空</span>
+			<div class="col-xs-6" style="margin-left:-8.33333334%;">
+				<span class="col-xs-8 entvar">{{if not .T.res.LeRep}}空{{else}}{{.T.res.LeRep}}{{end}}</span>
 			</div>
 		</li>
 	</ul>
 </div>
+{{if .T.res.investor}}
 <div class="secnav navcolor">
 	<span class="navbg">&gt;</span>
 	股东信息
 </div>
-<div class="clear shareholder">
-	<div class="icon col-xs-4">				
-		<img src="/images/entcommunity/ziranren.png" width=70>
-		<div class="type" ><b>自然人</b></div>
-		<span class="name">陈国光</span>
-	</div>
-	<div class="icon col-xs-4">				
-		<img src="/images/entcommunity/ziranren.png" width=70>
-		<div class="type" ><b>自然人</b></div>
-		<span class="name">陈国光</span>
-	</div>
-	<div class="icon col-xs-4">				
-		<img src="/images/entcommunity/ziranren.png" width=70>
-		<div class="type" ><b>自然人</b></div>
-		<span class="name">陈国光</span>
-	</div>
-	<div class="icon col-xs-4">				
-		<img src="/images/entcommunity/ziranren.png" width=70>
-		<div class="type" ><b>自然人</b></div>
-		<span class="name">陈国光</span>
-	</div>
-	<div class="icon col-xs-4">				
-		<img src="/images/entcommunity/ziranren.png" width=70>
-		<div class="type" ><b>自然人</b></div>
-		<span class="name">陈国光</span>
+<div class="clear shareholder ">
+	<div class="b-com-content ">
+	{{range $k,$v := .T.res.investor}}
+		{{if $v.InvType}}
+		<div >
+			{{if eq $v.InvType "20" "21" "22"}}
+			<img src="{{Msg "seo" "cdn"}}/images/entcommunity/ziranren.png" width=70>
+			{{else}}
+			<img src="{{Msg "seo" "cdn"}}/images/entcommunity/faren.png" width=70>
+			{{end}}
+			<span><b>{{$v.InvTypeName}}</b></span>
+			<span><script>document.write({{$v.Inv}}.replace(/\s/gm,""));</script></span>
+		</div>
+		{{end}}
+		{{end}}
 	</div>
 </div>
+{{end}}
+{{if .T.res.OpScope}}
 <div class="secnav navcolor">
 	<span class="navbg">&gt;</span>
 	经营范围
-</div>
+</div>
+<div style="padding:0 15px;">
+{{.T.res.OpScope}}
+</div>
+{{end}}

+ 184 - 41
core/src/web/templates/member/incmobile/detailindex.html

@@ -5,65 +5,208 @@
 	<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/mobile/incmobile.css" rel="stylesheet">
+	<link href="/css/bootstrap.min.css" rel="stylesheet" />
+	<link href="/css/qfw.css" rel="stylesheet" />
+	<link href="/css/entcommunity.css" rel="stylesheet" />
+ 	<link href="/css/mobile/incmobile.css" rel="stylesheet" />
+	<style>
+		body{
+			background:#FFF;
+		}
+		.ent-mainpersons img{
+			width: 60px;
+		   height: 60px;
+		   display: inline-block;
+		   vertical-align: top;
+		}
+		.ent-mainpersons span{
+			display: inline-block;
+			vertical-align: top;
+			margin-top: 10px;
+			text-align: center;
+		}
+		.ent-mainpersons .b-com-name{
+			font-weight: bold;
+			font-size: 13px;
+			margin-bottom: 5px;
+		}
+		.ent-mainpersons font {
+			display: block;
+			text-overflow: ellipsis;
+			overflow: hidden;
+			white-space: nowrap;
+			width: 75px;
+		}
+		.ent-mainpersons>div>div{
+			margin-top:5px;
+		}
+		
+		.ent-mainpersons{
+			padding-left: 0px; 
+			margin:0px auto;
+			max-width:310px;
+		}
+		.sp{
+			border: none !important;
+			border-bottom: 1px solid #e5e6e9 !important;
+			border-radius: 0px !important;
+		}
+		.entrelation svg{
+			width:1000px;
+			height:1000px;
+		}
+	</style>
  </head>
  <body>
-	<div class="col-xs-12 index-header" style="text-align:center;">
-		<img src="	" height=85 width=85/>
-		<div class="col-xs-12 title"> 
-			新浪网技术(中国)有限公司
-		</div > 
-		<div class="col-xs-12" style="text-align:center;clear:both;">
-			<div  class="type">其他股份有限公司(上市)</div>
-			<div  class="note taupe"><span>续存</span></div>
-			<div  class="abn" >经营异常</div>
+<div class="modal-backdrop fade in" style="display:none;"></div>
+	<div id="header">
+		<div class="col-xs-12 index-header" style="text-align:center;">
+			<img src="{{if .T.res.s_avatar}}{{Msg "seo" "cdn"}}{{.T.res.s_avatar}}{{else}}null{{end}}" onerror="this.src='{{Msg "seo" "cdn"}}/images/ent-logo.png'" height=85 width=85>
+			<div class="col-xs-12 title"> 
+				{{if .T.res.EntName}}{{.T.res.EntName}}{{end}}
+			</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}}">
+				<script>
+					var OpStateName = {{.T.res.OpStateName}};
+					if(OpStateName.length > 2){
+						OpStateName = OpStateName.substring(0,2);
+					}
+					document.write(OpStateName);
+				</script>
+				</div>
+			<!--	<div  class="abn" >经营异常</div>-->
+			</div>
 		</div>
-	</div>
-	<div class="col-xs-12 index-middle">
-		<div class="col-xs-6">企业名片</div>
-		<div class="col-xs-6">微官网</div>
-	</div>
-	<div class="col-xs-12 index-navtable">
-		<div class="col-xs-4">
-			<span class="glyphicon glyphicon-flag"></span>
-			企业黄页
-		</div>
-		<div class="col-xs-4">
-			企业概况
-		</div>
-		<div class="col-xs-4">
-			关系网
-		</div>
-		<div class="col-xs-4">
-			主要人员
+		<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"><span class="glyphicon weiguanwang2"></span>&nbsp;微官网</div>
 		</div>
-		<div class="col-xs-4">
-			变更信息
-		</div>
-		<div class="col-xs-4">
-			失信信息
-		</div>
-		<div class="col-xs-4">
-			企业新闻
+		<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>
+					</div>
+					<div style="height:50%;" >
+						基本信息
+					</div>
+			</div>
+			<div class="col-xs-4 content" data-id="c_relation" onclick="childrenshow(this);">
+				<div style="height:50%;padding-top:30%;">
+						<span class="glyphicon guanxiwang1"></span>
+					</div>
+					<div style="height:50%;" >
+						关系网
+					</div>
+			</div>
+			<div class="col-xs-4 content" data-id="c_member" onclick="childrenshow(this);">
+				<div style="height:50%;padding-top:30%;">
+						<span class="glyphicon zhuyaorenyuan " ></span>
+					</div>
+					<div style="height:50%;" >
+						主要人员
+					</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>
+				</div>
+				<div style="height:50%;" >
+					变更信息
+				</div>
+			</div>
+			<div class="col-xs-4 content" data-id="c_sx" onclick="childrenshow(this);">
+				<div style="height:50%;padding-top:30%;">
+					<span class="glyphicon shixinxinxi " ></span>
+				</div>
+				<div style="height:50%;" >
+					失信信息
+				</div>
+			</div>
+			<div class="col-xs-4 content" data-id="c_news" onclick="childrenshow(this);">
+				<div style="height:50%;padding-top:30%;">
+					<span class="glyphicon qiyexinwen " ></span>
+				</div>
+				<div style="height:50%;" >
+					企业新闻
+				</div>
+			</div>
 		</div>
 	</div>
+	<script src="/js/jquery.js"></script>
+	<script src="/js/qfw.js"></script>
+	<div id="c_baseinfo" style="clear:both;display:none;">
+			{{include "/member/incmobile/baseinfo.html"}}
+	</div>
+	<div id="c_relation" style="clear:both;display:none;">
+			{{include "/member/incmobile/relation.html"}}
+	</div>
+	<div id="c_member" style="clear:both;display:none;">
+			{{include "/member/incmobile/member.html"}}
+	</div>
+	<div id="c_alter" style="clear:both;display:none;">
+			{{include "/member/incmobile/alter.html"}}
+	</div>
+	<div id="c_news" style="clear:both;display:none;">
+			{{include "/member/incmobile/news.html"}}
+	</div>
+	<div id="c_sx" style="clear:both;display:none;">
+			{{include "/member/incmobile/sx.html"}}
+	</div>
+	<div id="c_card" style="clear:both;display:none;">
+			{{include "/member/incmobile/yellowpage.html"}}
+	</div>
 <body>
-<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>
 <script>
 	$(function(){
 			 resize();
+			mCommunity().initmemer();
+			DishonestyPaging();
+			initRelation();
 	})
 	$(window).resize(function(){
 	 		resize();
 	});
+	function childrenshow(n){
+		var node=$(n);
+		if (node.attr("data-id")){
+			$("#header").hide();
+			$("#"+node.attr("data-id")).show();
+		}else{
+			$("#header").show();
+			$("#"+node.attr("data")).hide();
+		}
+		resize();
+	}
 	function resize(){
-			$(".index-navtable div").height($(".index-navtable div").width());
-			$(".index-navtable div").css("line-height",$(".index-navtable div").width()+"px");
+			$(".index-navtable div.content").height($(".index-navtable div.content").width());
 	}
+	$(function(){
+		$(".date").each(function(i,n){
+				var i=parseFloat($(n).text());
+				$(n).text(new Date(i).Format("yyyy-mm-dd"));
+		})
+	})
+   var cdn = {{Msg "seo" "cdn"}};
+	var entId = {{.T.res._id}};
+	var regNo = {{.T.res.RegNo}};
+	var regCapCurName = {{.T.res.RegCapCurName}};
+	var legcerNo = {{.T.res.LegCerNO}};
+	var entName = {{.T.res.EntName}};
+	var staffinfo = {{.T.res.staffinfo}};
+	var synopsis = {{.T.res.s_synopsis}};
+	var relevantEnts = {{.T.relevantEnts}};
+	var dishonesty = {{.T.dishonesty}};
+	var gs = {{.T.res.gs}};
+	var investor = {{.T.res.investor}};
+	var OpScope = {{.T.res.OpScope}};
+	var service = {{.T.service}};
+	var relation = {{.T.relation}};
+	var copyright = {{.T.copyright}};
 </script>
 </html>

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

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

+ 52 - 28
core/src/web/templates/member/incmobile/list.html

@@ -12,14 +12,14 @@
 	<div class="col-xs-12">
 	<div class="m-searchbar">
 		<div class="containers">
-			<form id="searchForm" method="post">
-			<input type="text" id="query" name="words" class="searchtext"/>
-			<input type="hidden" name="city" id="city" value="">
-			<input type="hidden" name="cityNo" id="cityNo" value="">
-			<input type="hidden" name="c_author" id="hauthor" value="">
+			<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="c_hfl" id="hfl" value="">
-			<input type="hidden" name="c_zb" id="zb" 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="searchbtn"><b class="glyphicon glyphicon-search"></b></a>
 			<a href="javascript:" class="searchlink">高级搜索</a>
 				<div id="immediately" class="immediately">
@@ -27,7 +27,7 @@
 			</form>
 		</div>
 	</div>
-	<div class="nav-bar hides">
+	<div class="nav-bar hides" style="text-align:center;">
 		<ul class="nav">
 			<li class="dropdown-toggle" id="t-location">所在地</li>
 			<li class="dropdown-toggle" id="t-category">行业类别</li>
@@ -58,12 +58,14 @@
 			</ul>
 		</div>
 	</div>
-	<div class="bottom" >
+	<div class="bottom" style="float:left;clear:both;" >
 		<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>
-	<center><a class="loadmore btn btn-link">加载更多</a></center>
+	<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>
 	</div>
 	<script src="/js/jquery.js"></script>
 	<script src="/js/qfw.js"></script>
@@ -74,29 +76,51 @@
 	<script>
 		$(function(){
 			mCommunity().initIndex();
+			if(data.length>10){
+				data=eval(data);
+				$(".loadmore").show();
+				loadData();
+			}else{
+				data=[];
+				$(".loadmore").hide();
+				$("#finderror").show();
+			}
 		});
+		var i=0;
 		var data={{.T.data}}
 		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\">$OpStateName<\/b><\/caption><tr><td class=\"left\">注册号:<span>$RegNo<\/span><\/td><td>法定代表人:<span>$LeRep<\/span><\/td><\/tr><tr><td class=\"left\">成立时间:<span>$EstDate<\/span><\/td><td>所在地:<span>$OpLocDistrict<\/span><\/td><\/tr><tr><td colspan=\"2\"><hr class=\"list\"><\/td><\/tr><\/table><\/li>";
-		if(data.length>10){
-			data=eval(data);
+		
+		function loadData(){
 			var li="";
-			for (var i=0;i<5;i++){
-				var tmp=strVar.replace("$EntName",data[i].EntName)
-										 .replace("$RegNo",data[i].RegNo)
-										 .replace("$LeRep",data[i].LeRep)
-										 .replace("$OpLocDistrict",data[i].OpLocDistrict)
-										 .replace("$EstDate",data[i].EstDate)
-										 .replace("$Id",data[i]["_id"])
-										 .replace("$OpStateName",data[i].OpStateName.substr(0,2));
-				if (data[i].OpStateName!="存续"&&data[i].OpStateName.indexOf("在营")==-1){
-					 tmp=tmp.replace("$status","ent-status-r");
-				}else{
-					tmp=tmp.replace("$status","ent-status-g");
+				var len=i+5;
+				if (data.length<5 || data.length-i<5){
+					len=data.length;
 				}
-				li=li+tmp;
-			}
-			$(".inclist").append($(li));
+				for (;i<len;i++){
+					data[i]["OpStateName"]=data[i]["OpStateName"]==""?"存续":data[i]["OpStateName"];
+					if (data[i]["OpStateName"].indexOf("在营")>-1){
+						data[i]["OpStateName"]="存续";
+					}
+					var tmp=strVar.replace("$EntName",data[i]["EntName"])
+											 .replace("$RegNo",data[i]["RegNo"])
+											 .replace("$LeRep",data[i]["LeRep"])
+											 .replace("$OpLocDistrict",data[i]["OpLocDistrict"])
+											 .replace("$EstDate",data[i]["EstDate"])
+											 .replace("$Id",data[i]["_id"])
+											 .replace("$OpStateName",data[i]["OpStateName"].substr(0,2));
+					if (data[i].OpStateName!="存续"&&data[i].OpStateName.indexOf("在营")==-1){
+						 tmp=tmp.replace("$status","ent-status-r");
+					}else{
+						tmp=tmp.replace("$status","ent-status-g");
+					}
+					li=li+tmp;
+				}
+				if(i==data.length){
+					$(".loadmore").hide();
+					$(".nomore").show();
+				}
+				$(".inclist").append($(li));
 		}
 	</script>
  </body>

+ 4 - 34
core/src/web/templates/member/incmobile/member.html

@@ -1,40 +1,10 @@
 <div class="comnav">
-	<span></span>
 	主要人员
+		<span style="float:right;font-size:11px;padding-right:10px;" data="c_member" onclick="childrenshow(this);">{{if .T.res.EntName}}{{.T.res.EntName}}{{end}}</span>
 </div>
 <div>
-	<div class="member">
-		<div class="row">
-			<div class="one">
-				<img src="https://ss1.baidu.com/6ONXsjip0QIZ8tyhnq/it/u=936799099,1721094993&fm=80" height=70 width=70 />
-				<div class="person">
-					<div>张三丰</div>
-					<div><small>董事长</small></div>
-				</div>
-			</div>
-		</div>	
-		<div class="row">
-			<div class="border-left splitver">
-				
-			</div>
-		</div>
-		<div class="row">
-			<div class="one">
-				<img src="https://ss1.baidu.com/6ONXsjip0QIZ8tyhnq/it/u=936799099,1721094993&fm=80" height=70 width=70 />
-				<div class="person">
-					<div>张三丰</div>
-					<div><small>董事长</small></div>
-				</div>
-			</div>
-			<div class="split"><hr/></div>
-			<div class="one">
-				<img src="https://ss1.baidu.com/6ONXsjip0QIZ8tyhnq/it/u=936799099,1721094993&fm=80" height=70 width=70 />
-				<div class="person">
-					<div>张三丰</div>
-					<div><small>董事长</small></div>
-				</div>
-			</div>
-		</div>	
-		
+	<div class="ent-mainperson">
+	</div>
+			<center class="memberinfo hides"><div >暂无主要成员信息</div></center>
 	</div>
 </div>

+ 17 - 6
core/src/web/templates/member/incmobile/news.html

@@ -1,16 +1,27 @@
 <div class="comnav">
-	<span></span>
-	主要人员
+	企业新闻
+		<span style="float:right;font-size:11px;padding-right:10px;" data="c_news" onclick="childrenshow(this);">{{if .T.res.EntName}}{{.T.res.EntName}}{{end}}</span>
 </div>
 <div class="entinfo-page" style="background:#FFF;">
 	<div class="b-right"> 
    <div class="margin-t-10 b-adver"> 
     <div class="b-adver-content newsInfo">
      <ul>
-      <li><span><img src="/images/swordfish/circle.png" />2016-03-17 11:02:41</span><br /><a href="/front/webcontent/56eb70b9af53745027000022.html">比Bigbang还火爆的郑州物联网大会门票我!们!有!</a></li>
-      <li><span><img src="/images/swordfish/circle.png" />2016-03-17 09:57:00</span><br /><a href="/front/webcontent/56ea800daf53745027000018.html">大白兔奶糖换了外衣就涨价!你还会买吗?</a></li>
-      <li><span><img src="/images/swordfish/circle.png" />2016-03-17 01:40:55</span><br /><a href="/front/webcontent/56ea088daf53745027000005.html">这种诡异的二维码千万别碰!</a></li>
-     </ul>
+			{{range $k,$v := .T.relevantNews}}
+				<li>
+					<script>
+						var l_comeintime = {{$v.l_comeintime}};
+						l_comeintime = new Date(Number(l_comeintime+"000")).Format("yyyy-MM-dd hh:mm:ss");
+						var s_link = {{$v.s_link}};
+						if(!s_link.startWith("http://") && !s_link.startWith("https://")){
+							s_link = "http://"+s_link;
+						}
+						document.write('<span><img src="{{Msg "seo" "cdn"}}/images/swordfish/circle.png">'+l_comeintime+'</span><br><a href="'+s_link+'" style="color:#222222;" target="_bank">{{$v.s_title}}</a></li>');
+					</script>
+				</li>
+			{{end}}
+			</ul>
+			<center class="newsinfo hides"><div >暂无主要成员信息</div></center>
      <div class="clearfix"></div>
     </div> 
    </div> 

+ 23 - 55
core/src/web/templates/member/incmobile/relation.html

@@ -1,59 +1,27 @@
 <div class="comnav">
-	<span></span>
 	关系网
+	<span style="float:right;font-size:11px;padding-right:10px;" data="c_relation" onclick="childrenshow(this);">{{if .T.res.EntName}}{{.T.res.EntName}}{{end}}</span>
 </div>
-<div class="ent-alterinfo">
-	<div class="ent-layout-up">
-		<div class="b-com-content">
-			<ul>		
-				<li>
-					<div>
-						<div>2015-07-15</div>
-						<div>注册资本(或外资中方认缴资本)</div>
-						<div>查看详情</div>
-						<div style="display:none;">变更前:50<br>变更后:2000.000000</div>
-						<a></a>
-					</div>
-					<div>
-						<div>2015-07-15</div>
-						<div>注册资本(或外资中方认缴资本)</div>
-						<div>查看详情</div>
-						<div style="display:none;">变更前:50<br>变更后:2000.000000</div>
-						<a></a>
-					</div>
-				</li>
-				<li>
-					<div>
-						<div>2015-07-15</div>
-						<div>注册资本(或外资中方认缴资本)</div>
-						<div>查看详情</div>
-						<div style="display:none;">变更前:50<br>变更后:2000.000000</div>
-						<a></a>
-					</div>
-					<div>
-						<div>2015-07-15</div>
-						<div>注册资本(或外资中方认缴资本)</div>
-						<div>查看详情</div>
-						<div style="display:none;">变更前:50<br>变更后:2000.000000</div>
-						<a></a>
-					</div>
-				</li>
-				<li>
-					<div>
-						<div></div>
-						<div></div>
-						<div></div>
-						<a></a>
-					</div>
-					<div>
-						<div></div>
-						<div></div>
-						<div></div>
-						<a></a>
-					</div>
-				</li>
-				<div class="clearfix"></div>
-			</ul>
+
+		<div class="entrelation" id="entrelation">
+			<div id="entrelation-infovis"></div>
+			<div id="entrelation-limit" class="hide entrelation-limit">
+				<div id="entrelation-nologin" class="hide text-center">
+					<img src="{{Msg "seo" "cdn"}}/images/findnull.png" class="b-findnull">
+					<h5>扫码登录认证后,即可查看企业股东信息,投资关系,公司关系脉络图等内容</h5>
+					<button class="btn btn-primary" onclick="loginModalShow();">扫码登录</button>
+				</div>
+				<div id="entrelation-noauthe" class="hide text-center">
+					<img src="{{Msg "seo" "cdn"}}/images/findnull.png" class="b-findnull">
+					<h5>认证后即可查看企业股东信息,投资关系,公司关系脉络图等内容</h5>
+					<a href="/member/accountset/index" class="btn btn-primary">认证</a>
+				</div>
+				<div class="dashed padding-0"></div>
+				<img src="{{Msg "seo" "cdn"}}/images/entcommunity/relation.png">
+			</div>
+			<div id="entrelation-findnull" class="ent-findnull hide">
+				<img src="{{Msg "seo" "cdn"}}/images/findnull.png" class="b-findnull">
+				<h4>抱歉,未找到相关数据!</h4>
+			</div>
 		</div>
-	</div>
-</div>
+	

+ 12 - 0
core/src/web/templates/member/incmobile/sx.html

@@ -0,0 +1,12 @@
+<div class="comnav">
+	失信信息
+		<span style="float:right;font-size:11px;padding-right:10px;" data="c_sx" onclick="childrenshow(this);">{{if .T.res.EntName}}{{.T.res.EntName}}{{end}}</span>
+</div>
+<div class="ent-dishonesty">
+	<table id="dishonestyList" class="table ent-table">
+		<tr>
+			<td class="text-center ent-dishonestypaging" id="dishonestyListPaging"></td>
+		</tr>
+	</table>
+	<center class="sxinfo hides"><div >暂无主要成员信息</div></center>
+</div>

+ 32 - 10
core/src/web/templates/member/incmobile/yellowpage.html

@@ -1,38 +1,60 @@
 <div class="comnav">
 	<span></span>
 	企业黄页
+	<span style="float:right;font-size:11px;padding-right:10px;" data="c_card" onclick="childrenshow(this);">{{if .T.res.EntName}}{{.T.res.EntName}}{{end}}</span>
 </div>
 <div class="combody baseinfo yellowpage">
 		<ul>
+		{{if .T.res.s_persion}}
 			<li>
 				<div class="col-xs-1 text-right">
-						<span class="glyphicon glyphicon-flag colorc"></span>
+						<span class="glyphicon ren2  colorfont"></span>
 				</div>
-				<span class="col-xs-11 entvar">宋经理</span>
+				<span class="col-xs-11 entvar">{{.T.res.s_persion}}</span>
 			</li>
+		{{end}}
+		{{if or .T.res.s_mobile .T.res.Tel}}
 			<li>
 				<div class="col-xs-1 text-right">
-						<span class="glyphicon glyphicon-flag colorc"></span>
+						<span class="glyphicon shouji colorfont"></span>
 				</div>
-				<span class="col-xs-11 entvar">010-58983018</span>
+				<span class="col-xs-11 entvar">{{if .T.res.s_mobile}}{{.T.res.s_mobile}}{{else if .T.res.Tel}}{{.T.res.Tel}}{{end}}</span>
 			</li>
+		{{end}}
+		{{if .T.res.s_email}}
 			<li>
 				<div class="col-xs-1 text-right">
-						<span class="glyphicon glyphicon-flag colorc"></span>
+						<span class="glyphicon youjian2 colorfont"></span>
 				</div>
-				<span class="col-xs-11 entvar">yumei@staff.sina.com.cn</span>
+				<span class="col-xs-11 entvar">{{.T.res.s_email}}</span>
 			</li>
+		{{else if .T.res.Nb_email}}
 			<li>
 				<div class="col-xs-1 text-right">
-						<span class="glyphicon glyphicon-flag colorc"></span>
+						<span class="glyphicon youjian2 colorfont"></span>
 				</div>
-				<span class="col-xs-11 entvar">www.sina.com</span>
+				<span class="col-xs-11 entvar">{{.T.res.Nb_email}}</span>
 			</li>
+		{{end}}
+		{{if .T.res.s_enturl}}
 			<li>
 				<div class="col-xs-1 text-right">
-						<span class="glyphicon glyphicon-flag colorc"></span>
+						<span class="glyphicon wangzhi1 colorfont"></span>
+				</div>
+				<span class="col-xs-11 entvar">{{.T.res.s_enturl}}</span>
+			</li>
+		{{end}}
+			<li>
+				<div class="col-xs-1 text-right">
+						<span class="glyphicon dizhi colorfont"></span>
 				</div>
 				<span class="col-xs-11 entvar">北京市海淀区北四环西路58号理想大厦1506室</span>
 			</li>
 		</ul>
-</div>
+</div>
+<script>
+var province="{{.T.res.i_province}}"
+var city="{{.T.res.i_city}}"
+var area="{{.T.res.i_area }}"
+var address="{{.T.res.s_address}}"
+</script>