企业社区

core/src/qfw/search/searchService.go

@@ -100,7 +100,7 @@ func (search *Search) FindServiceByEntId() error {
 		    }
 		  }}`
 		//需要查到的字段信息
-		fields = `"_id","s_name","s_introduction","s_images","s_enterpriseid","s_isshow","i_status"`
+		fields = `"_id","s_name","s_introduction","s_images","s_enterpriseid","s_isshow","i_status","s_pricemy","i_comments","f_price"`
 		if currentPage == 1 {
 			count = elastic.Count("service", collection, query)
 		}

core/src/qfw/yellowpage/yellowpagemanager.go

@@ -3,6 +3,7 @@ package yellowpage
 //企业黄页的操作类
 import (
 	"container/list"
+	"encoding/json"
 	"fmt"
 	_ "github.com/go-xweb/xweb"
 	mgo "gopkg.in/mgo.v2"
@@ -40,7 +41,7 @@ func FormatDate(src *interface{}) string {
 }
 
 func GetEntInfo(id string) interface{} {
-	res := FindById("enterprise", id, `{"RegNo":1, "EntName":1, "EntType":1, "EntTypeName":1, "OpLocDistrict":1, "LeRep":1, "LegCerNO":1, "Tel":1, "Dom":1, "OpScope":1, "OpFrom":1, "OpTo":1, "RegCap":1, "EstDate":1, "CompForm":1, "CompFormName":1, "OpState":1, "OpStateName":1, "RegOrgName":1, "IssBLicDate":1, "Timestamp":1, "s_synopsis":1, "SourceType":1, "NB_email":1,"IndustryPhyName":1,"investor":1, "s_enturl, "i_province":1, "i_city":1, "i_area":1,"s_action":1,"s_persion":1,"s_mobile":1,"s_address":1,"s_avatar":1,"s_microwebsite":1,"s_qq":1,"s_submitid":1,"s_email":1}`)
+	res := FindById("enterprise", id, `{"RegNo":1, "EntName":1, "EntType":1, "EntTypeName":1, "OpLocDistrict":1, "LeRep":1, "LegCerNO":1, "Tel":1, "Dom":1, "OpScope":1, "OpFrom":1, "OpTo":1, "RegCap":1, "EstDate":1, "CompForm":1, "CompFormName":1, "OpState":1, "OpStateName":1, "RegOrgName":1, "IssBLicDate":1, "Timestamp":1, "s_synopsis":1, "SourceType":1, "NB_email":1,"IndustryPhyName":1,"investor":1,"alterInfo":1, "s_enturl, "i_province":1, "i_city":1, "i_area":1,"s_action":1,"s_persion":1,"s_mobile":1,"s_address":1,"s_avatar":1,"s_microwebsite":1,"s_qq":1,"s_submitid":1,"s_email":1}`)
 	if res != nil {
 		id := (*res)["s_submitid"]
 		if id != nil {
@@ -81,10 +82,6 @@ func GetEntInfo(id string) interface{} {
 		if OpFrom != nil {
 			(*res)["EstDate"] = FormatDate(&EstDate)
 		}
-		//查询企业关系
-		//relation := Find("entrelation", &map[string]interface{}{
-		//	"aid": ObjectIdHex(id),
-		//}, nil, nil, false, -1, -1)
 		EntType, _ := (*res)["EntType"].(string)
 		//处理分公司
 		if EntType != "" {
@@ -102,8 +99,27 @@ func GetEntInfo(id string) interface{} {
 		}
 		//
 		(*res)["EntTypeLabel"] = (mobile.GetDiffName(EntType))[0]
-
 		(*res)["entid"] = id
+		//企业变更排序
+		var alterInfo []map[string]interface{}
+		if d, err := json.Marshal((*res)["alterInfo"]); err == nil {
+			json.Unmarshal(d, &alterInfo)
+		}
+		for x, _ := range alterInfo {
+			for y := 0; y < len(alterInfo)-x-1; y++ {
+				dt1, xok := alterInfo[y]["AltDate"].(float64)
+				dt2, yok := alterInfo[y+1]["AltDate"].(float64)
+				if xok && yok && dt1 < dt2 {
+					temp := alterInfo[y]
+					alterInfo[y] = alterInfo[y+1]
+					alterInfo[y+1] = temp
+				}
+			}
+		}
+		for _, v := range alterInfo {
+			log.Println(v["AltAf"])
+		}
+		(*res)["alterInfo"] = alterInfo
 		return *res
 	}
 	return nil
@@ -118,7 +134,7 @@ func (yp *Yellowpage) EnterpriseInfo(id string) error {
 		yp.T["res"] = GetEntInfo(id)
 		contentuser, erruser := yp.Render4Cache("/yellowpage/enterpriseinfo.html", &yp.T)
 		if erruser == nil {
-			redis.PutBytes("enterprise", id, &contentuser, ONEDAY)
+			redis.PutBytes("enterprise", id, &contentuser, 7*ONEDAY)
 		}
 		return yp.SetBody(contentuser)
 	}
@@ -250,10 +266,12 @@ func (yp *Yellowpage) GetRelation() error {
 		if regNo == "" || entName == "" {
 			return nil
 		}
-		relation := makeRelation(regNo, entName)
-		if relation != nil {
-			yp.ServeJson(M{"flag": true, "relation": relation})
+		relation := redis.Get("other", "relation-"+regNo)
+		if relation == nil {
+			relation = makeRelation(regNo, entName)
+			redis.Put("other", "relation-"+regNo, relation, 7*ONEDAY)
 		}
+		yp.ServeJson(M{"flag": true, "relation": relation})
 	} else {
 		yp.ServeJson(M{"flag": false})
 	}

core/src/web/staticres/css/dev-qfw.css

@@ -2175,9 +2175,10 @@ style="color:#D03102;margin-right:5px;"
 .b-nav-logo{
 	padding-right: 40px;
 }
-.b-nav-link{
+.b-nav-main{
 	width: 120px;
 	text-align: center;
+	margin-right: 16px;
 }
 .b-nav-main a{
 	font-size: 18px;
@@ -2189,12 +2190,28 @@ style="color:#D03102;margin-right:5px;"
 	height: 20px;
 	margin-top: 25px;
 	border-left: 1px solid #e5e6e9;
-	border-right: 1px solid #ffffff;
-	float: right;
+	position: absolute;
+	right: 0px;
+	top: 50%;
+	margin-top: -10px;
+}
+.b-nav-other{
+	padding-left: 21px;
+	padding-right: 21px;
+	position: relative;
+}
+.b-nav-other a{
+	color: #4e5051;
 }
 .b-nav-other>a:hover,.b-nav-active>a{
 	font-weight: bold;
 }
+.b-head .b-loginbtn{
+	width: 40px;
+	height: 40px;
+	margin-top: 13px;
+	margin-right: 30px;
+}
 .b-head .headimg{
 	width: 40px;
 	height: 40px;
@@ -2204,7 +2221,7 @@ style="color:#D03102;margin-right:5px;"
 	padding: 0px 15px;
 	position: relative;
 }
-.b-head .b-loginStatus:hover{
+.b-head .b-logined:hover{
 	background-color: #F7F9FB;
 }
 .b-head .b-loginStatus:hover>a{
@@ -2277,12 +2294,17 @@ style="color:#D03102;margin-right:5px;"
 }
 .b-head .b-h-search{
 	padding-top: 14px;
+	padding-left: 17px;
 }
 .b-head .b-h-search .input-group{
 	width: 300px;
 }
 .b-head .b-h-search .form-control{
 	border-radius: 50px !important;
+	color: #a0a0a0;
+	box-shadow: none;
+	border-color: #e5e6e9;
+	padding-left: 21px;
 }
 .b-head .b-h-search form>span i {
     position: absolute;
@@ -2295,15 +2317,15 @@ style="color:#D03102;margin-right:5px;"
 }
 .b-head .b-h-search form>span{
     position: absolute;
-    right: 10px;    
+	right: 10px;
 	border-radius: 50px;
-    top: 50%;
-    z-index: 20;
-    margin-top: -19px;
-	margin-right:-10px;
-    display: inline-block;
-	width:38px;
-	height:38px;
+	top: 50%;
+	z-index: 20;
+	margin-top: -17px;
+	margin-right: -11px;
+	display: inline-block;
+	width: 35px;
+	height: 35px;
 }
 .b-content{
 	padding: 15px 0px 15px 0px;

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

@@ -34,9 +34,6 @@ a:focus, a:hover{
 .ttcon ul li:hover{
 	color: #16a086;
 }
-.text-primary{
-	color: #16a086 !important;
-}
 .entlist-page .nav-tabs{
 	background-color: #f7f8fa;
 	margin-top: 20px;
@@ -543,10 +540,67 @@ a:focus, a:hover{
 .ent-service{
 	padding: 0px 20px;
 }
-.ent-service img{
+.ent-service td img{
 	width: 110px;
 	height: 101px;
 }
+/**************变更信息**********************/
+.ent-alterinfo li{
+	width: 100%;
+	display: table;
+}
+.ent-alterinfo li>div{
+	position: relative;
+	display: table-cell;
+	width: 50%;
+	padding-bottom: 20px;
+}
+.ent-alterinfo li:last-of-type>div{
+	padding: 0px;
+}
+.ent-alterinfo ul li:nth-child(odd)>div:first-child{
+	visibility: hidden;
+}
+.ent-alterinfo ul li:nth-child(odd)>div:last-child{
+	border-left: 1px solid #16a086;
+	padding-left: 20px;
+	left: -1px;
+}
+.ent-alterinfo ul li:nth-child(odd) a{
+	left: -6px;
+}
+.ent-alterinfo ul li:nth-child(even) a{
+	right: -6px;
+}
+.ent-alterinfo ul li:nth-child(even)>div:first-child{
+	border-right: 1px solid #16a086;
+	text-align: right;
+	padding-right: 20px;
+}
+.ent-alterinfo ul li:nth-child(even)>div:last-child{
+	visibility: hidden;
+}
+.ent-alterinfo li a{
+	display: block;
+	width: 11px;
+	height: 11px;
+	border-radius: 50%;
+	background-color: #16a086;
+	position: absolute;
+	top: 0px;
+}
+.ent-alterinfo li>div>div{
+	margin-bottom: 10px;
+	margin-top: -5px;
+}
+.ent-alterinfo li>div>div:first-of-type{
+	font-size: 16px;
+	color: #16a086;
+	font-weight: bold;
+}
+.ent-alterinfo li>div>div:last-of-type{
+	color: #A0A0A0;
+}
 /************公用****************/
 .ent-layout-up{
 	padding: 0px 20px;
@@ -596,10 +650,10 @@ a:focus, a:hover{
 }
 .ent-table tr:nth-child(2n+1){
 	border-top: 1px solid #e5e6e9;
+	font-size: 16px;
 }
 .ent-table .b-com-name{
 	font-weight: bold;
-	font-size: 16px;
 	word-wrap: break-word;
 	word-break: normal;
 }

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

@@ -40,7 +40,7 @@ $(function(){
 		$(".ent-tab-content>div").addClass("hide");
 		$(".ent-tab-content>div:eq("+$(this).index()+")").removeClass("hide");
 		if($(this).index() == 1){
-			initRelation();
+			b_afterLogin();
 		}else if($(this).index() == 5 && serviceList == null){
 			//加载服务列表
 			serviceList = new ServiceList();
@@ -75,7 +75,8 @@ function initRelation(){
 				$("#entrelation-nologin").addClass("hide");
 				$("#entrelation-limit,#entrelation-noauthe").removeClass("hide");
 				$("#entrelation-infovis").hide();
-			}else if(r.flag == true && (typeof(r) == "undefined" || r == null || r == "")){
+			}else if(r.flag == true && (r == null || typeof(r) == "undefined" || typeof(r.links) == "undefined" || r.links.length == 0 || typeof(r.nodes) == "undefined" || r.nodes.length <= 1)){
+				relation = "";
 				$("#entrelation-infovis").hide();
 				$("#entrelation-findnull").removeClass("hide");
 			}else{
@@ -98,12 +99,17 @@ function initRelation(){
 //服务列表
 function ServiceList(){
 	loadJS("/js/paging.js",function(){
-		paging = new Paging("serviceList","/front/findServiceByEntId",{entId:entId},6,function(r){
+		paging = new Paging("serviceListPaging","/front/findServiceByEntId",{entId:entId},6,function(r){
+			if(r.length == 0){
+				$("#serviceList").next(".ent-findnull").removeClass("hide");
+			}
 			var html = '';
 			for(var i=0;i<r.length;i++){
 				html += '<tr>'
-						+'<td rowspan="2" width="120"><img src="/images/services/default.png"></td>'
-						+'<td class="b-com-name">'+r[i].s_name+'</td>'
+						+'<td rowspan="2" width="120"><img src="'+(r[i].s_images==""?"null":r[i].s_images)+'" onerror="this.src=\'/images/services/default.png\'"></td>'
+						+'<td class="b-com-name"><a href="/market/detail/'+r[i]._id+'.html">'+r[i].s_name+'</a></td>'
+						+'<td width="100" class="text-center">报价：<font class="text-primary">'+(r[i].s_pricemy==0?"面议":r[i].f_price+"元")+'</font></td>'
+						+'<td width="100" class="text-center">评价：<font class="text-primary">'+r[i].i_comments+'</font></td>'
 						+'<tr>'
 						+'<td>'+r[i].s_introduction+'</td>'
 						+'</tr>';
@@ -111,377 +117,4 @@ function ServiceList(){
 			$("#serviceList").html(html);
 		});
 	});
-}
-
-
-
-
-
-
-
-
-
-
-
-/*
-function getCityN(code){
-	if(code){
-		var n=code.substring(0,2)
-		for(var i=0;i<citySim.length;i++){
-			if (citySim[i].k==n) {
-				return citySim[i].n;
-			}
-		}
-	}
-	return "";	
-}
-
-
-function reloadData(obj,name){
-	name=name||obj.attr("name")
-	var val=(obj.attr("value")||obj.val());
-	
-	if (val==0) val=""
-	if(name=="city"&&!val){
-		var pids=obj.attr("id")
-		if(pids=="c_area"){
-			var v=obj.prev("select").val()
-			if(!v){
-				v=obj.prev("select").prev("select").val()
-			}
-			if(v){
-				val=v
-			}
-			
-		}else if(pids=="c_city"){
-			var v=obj.prev("select").val()
-			if(v){
-				val=v
-			}
-		}
-		
-	}else if(name=="c_author"){
-		if(!obj.prop("checked")){
-			val="";
-		}
-	}
-	//调整value 值
-	if(val==10){
-		val = "10-100"
-	}else if(val ==100){
-		val = "100-1000"
-	}else if(val ==1000){
-		val = "1000-10000"
-	}
-	//搜索表单提交
-	$("#searchForm input[name="+name+"]").val(val);
-    document.forms['searchForm'].submit();
-}
-
-function setLocation(entsel,serviceloc){
-	//所在地处理
-	var le  =  entsel.length
-	var sel1 = "";
-	var sel2 = "";
-	var sel3 = "";
-	if (le == 2) {
-	 sel1 = entsel.substring(0,2);
-	 sel2 = 0;
-	 sel3 = 0;
-	}else if (le == 4){
-	 sel1 = entsel.substring(0,2);
-	 sel2 = entsel.substring(0,4);
-	 sel3 = 0;
-	}else{	
-	 sel1 = entsel.substring(0,2);
-	 sel2 = entsel.substring(0,4);
-	 sel3 = entsel.substring(0,6);
-	}
-	$.cxSelect.setVal(sel1,sel2,sel3);
-	if(serviceloc){	
-		//添加编辑服务中的省
-		$("#servicecity_china .province option").each(function(){
-			if(sel1 == $(this).val()){					
-				$(this).attr("selected","selected");
-			}
-		});
-		//添加编辑服务中的市
-		$("#servicecity_china .city option").each(function(){
-			if(sel2 == $(this).val()){					
-				$(this).attr("selected","selected");
-			}
-		});
-		//添加编辑服务中的县
-		$("#servicecity_china .area option").each(function(){
-			if(sel3 == $(this).val()){					
-				$(this).attr("selected","selected");
-			}
-		});
-	}
-}	
-cityMouse="";
-$(function(){
-	
-	////推荐企业
-	loadImg(1);
-	//行业类别  注册资本 加载
-	makeFl();
-	//所在地信息加载
-	if($chiancity){
-		$('#city_china').cxSelect({
-			selects: ['province', 'city', 'area'],
-			required:0,
-			somep:true,
-			someps:[41,45]
-		});
-		setLocation(entsel)
-	}
-	
-	
-	//处理点击重新加载
-	$("div[id^=c_] li,li[id^=c_],input[id^=c_]").click(function(){
-		
-		if(this.id=="c_words"){
-			reloadData($("#header-searchInputs"))	
-		}else{
-			reloadData($(this))	
-		}	
-	})
-	
-	$("select[id^=c_]").click(function(){
-		cityMouse=this.id
-	}).change(function(){
-		if(this.id==cityMouse){
-			reloadData($(this),"city")			
-		}
-	})	
-
-	//处理选择样式
-	$("div[id^=c_] li").click(function(){
-		$("li",$(this).closest("div")).removeClass("text-primary");
-		$(this).addClass("text-primary");
-	})
-	//搜索关键字
-	var words=""
-	
-	if(btempwords){
-		words=btempwords
-		$("#header-searchInput").val(words);
-	}
-	
-	
-})
-function makeFl(){
-	//行业类别
-	$(["c_hfl"]).each(function(i,ad){
-		var str="<ul>";
-		var tmp=eval(ad)
-		for(var i=0;i<tmp.length;i++){
-		    var val = chf1;
-			if (val !=""){
-			if (val == tmp[i][1]){
-			str+="<li name='"+ad+"' value='"+tmp[i][1]+"' class='text-primary'>"+tmp[i][0]+"</li>"
-			var j ="J"
-			if (val > j || val == "D" || val == "E" || val == "F" || val == "G"  ){
-			$("#c_hfl").next().find("small").text("收起<")
-			$("#c_hfl").removeClass("less")
-			
-			}
-			}else{
-			str+="<li name='"+ad+"' value='"+tmp[i][1]+"'>"+tmp[i][0]+"</li>"
-			}
-			}else{
-			str+="<li name='"+ad+"' value='"+tmp[i][1]+"' "+(i==0?"class='text-primary'":"")+">"+tmp[i][0]+"</li>"
-			}
-			
-		}
-		str+="</ul>"
-		$("#"+ad).html(str)
-	})
-	//注册资本
-	$(["c_zb"]).each(function(i,ad){
-		var str="<ul>";
-		var tmp=eval(ad)
-		for(var i=0;i<tmp.length;i++){
-		    var val = czb;
-			if (val !=""){
-			if (val == tmp[i][1]){
-			str+="<li name='"+ad+"' value='"+tmp[i][1]+"' class='text-primary'>"+tmp[i][0]+"</li>"
-			}else{
-			str+="<li name='"+ad+"' value='"+tmp[i][1]+"'>"+tmp[i][0]+"</li>"
-			}
-			}else{
-			str+="<li name='"+ad+"' value='"+tmp[i][1]+"' "+(i==0?"class='text-primary'":"")+">"+tmp[i][0]+"</li>"
-			}
-			
-		}
-		str+="</ul>"
-		$("#"+ad).html(str)
-	})
-}
-function less(obj){
-	pred=$(obj).prev()
-	obj=$(obj).find("small")
-	var text=obj.text()
-	if(text=="更多>"){
-		obj.text("收起<")
-		pred.removeClass("less")
-	}else{
-		obj.text("更多>")
-		pred.addClass("less")
-	}
-	
-}
-//推荐企业
-function loadImg(n){
-	var str=""
-	for(var i=0;i<n;i++){
-		str+="<img src='/images/right_ad.png'>"
-	}
-	$("#tjqy").html(str)
-}
-
-function GetDiffName(i)  {
-	ret=["法定代表人"]
-	//ret=["法定代表人","住所","成立日期"]
-	switch (i) {
-		case  "9600":
-		{
-			ret[0] = "经营者"
-			//ret[1] = "经营场所"
-			//ret[2] = "注册日期"
-			break;
-		}
-		case "4500":
-		case "6800":
-		case "6810":
-		case "6820":
-		case "7100":
-		case "7110":
-		case "7120":
-		case "7130":
-		case "7190":
-		case "9200":
-		case "6840":
-		case "2100":
-		case "2110":
-		case "2120":
-		case "2121":
-		case "2122":
-		case "2123":
-		case "2130":
-		case "2140":
-		case "2150":
-		case "2151":
-		case "2152":
-		case "2190":
-		case "2200":
-		case "2210":
-		case "2211":
-		case "2212":
-		case "2213":
-		case "2219":
-		case "2220":
-		case "2221":
-		case "2222":
-		case "2223":
-		case "2229":
-		case "4000":
-		case "4300":
-		case "4310":
-		case "4320":
-		case "4330":
-		case "4340":
-		case "4550":
-		case "4551":
-		case "4552":
-		case "4553":
-		case "4560":
-		case "5800":
-		case "5810":
-		case "5820":{
-			ret[0] = "负责人"
-			//ret[1] = "营业场所"
-			//ret[2] = "成立日期"
-			break;
-		}
-	}
-	return ret
-}
-//公式信息是否显示
-if(!$gs){
-	$("#ags").parent().hide();
-	$("#gs").hide();
-}
-*/
-
-
-var perPage=5,currentPage=1
-
-//点击服务标题展示服务信息
-function clickservicename(id,isshow){
-	if(isshow.indexOf("3")>-1){
-		window.location.href="/market/detail/"+id+".html"
-	}else{
-		window.location.href="/market/showservice/"+id+".html"
-	}
-}
-
-
-
-//显示二维码图片
-function viewBarCode(bcpath){
-	if(bcpath){
-		$('#myModal').modal({
-      		keyboard: true
-   		})
-		$("#viewImgs").html("<img style='width:300px;height:300px;' src='"+bcpath+"'/>")
-	}
-}
-
-
-function analyList(rowHtml, rowData) {
-	var t="";
-	if(rowData.i_status==1){
-		t=template_content.replace("<a class='text-primary' value='${_id}' data-id='${s_isEdit}' onclick='removeservice(this)'>下架</a>","");
-	}else{
-		t=template_content.replace("已下架","");
-	}
-	return t.replace(/\$\{(.*?)\}/g,
-	function(a, b, c) {
-		var res = rowData[b]||"";
-		//去掉后台服务列表中的图片
-		var data = res.replace(/<img.*>.*<\/img>/ig,"");   //过滤如<img></img>形式的图片元素
-		res = data.replace(/<img.*\/>/ig, "");   //过滤如<img />形式的元素
-		if (!res&&b=="s_images"){
-			res="/images/services/default.png"
-		}else{
-			res = res.replace(/\n/g,"");
-		}
-		return res;
-	});
-}
-//加载更多
-function loadMore(){
-	$.post('/searchEntSer/'+entId ,{currentPage:currentPage+1,perPage:perPage},function(data){
-		if(data){
-			var res=data["data"]
-			if(!res || res === undefined || res.length == 0) {
-				$("#loadMore").hide();
-				return;
-			}else if(data.totalRows<=(perPage*data.currentPage)){
-				$("#loadMore").hide();
-			}else{
-				$("#loadMore").show();
-			}
-			currentPage=data["currentPage"];
-			var str="";
-			
-			for(var i=0;i<res.length;i++){
-				var temp=res[i];
-				str+=analyList("",temp)
-			}
-			$("#service_list table tbody").append(str);
-		}
-	})
 }

core/src/web/staticres/js/qfw.js

@@ -44,6 +44,21 @@ var ValidDatatype = {
 		return true;
 	}
 }
+Date.prototype.Format = function (fmt) { //author: meizz 
+    var o = {
+        "M+": this.getMonth() + 1, //月份 
+        "d+": this.getDate(), //日 
+        "h+": this.getHours(), //小时 
+        "m+": this.getMinutes(), //分 
+        "s+": this.getSeconds(), //秒 
+        "q+": Math.floor((this.getMonth() + 3) / 3), //季度 
+        "S": this.getMilliseconds() //毫秒 
+    };
+    if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
+    for (var k in o)
+    if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+    return fmt;
+}
 //浏览器窗口大小变化重新加载
 window.onresize=webSiteInit;
 serializeObject = function(form) {
@@ -60,21 +75,6 @@ $(function(){
 	if(webSiteInitFlag){
 		webSiteInit();
 	}
-	Date.prototype.Format = function (fmt) { //author: meizz 
-	    var o = {
-	        "M+": this.getMonth() + 1, //月份 
-	        "d+": this.getDate(), //日 
-	        "h+": this.getHours(), //小时 
-	        "m+": this.getMinutes(), //分 
-	        "s+": this.getSeconds(), //秒 
-	        "q+": Math.floor((this.getMonth() + 3) / 3), //季度 
-	        "S": this.getMilliseconds() //毫秒 
-	    };
-	    if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
-	    for (var k in o)
-	    if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
-	    return fmt;
-	}
 });
 
 function makeData(d,_this,b){

core/src/web/templates/common/top.html

@@ -77,7 +77,7 @@ function b_loadTop(){
 						+'<li onclick="window.location.href=\'/member/show/memberindex\'"><i class="glyphicon ren1"></i>用户中心</li>'
 						+'<li onclick="window.location.href=\'/front/logout\'" class="border-b-0"><i class="glyphicon tuichu"></i>退出</li>';
 						+'</ul></div>';
-				$("#b-loginStatus").html(html)
+				$("#b-loginStatus").addClass("b-logined").html(html)
 				.mouseover(function(){
 					$("#head-hideMenu").show();
 				}).mouseleave(function(){
@@ -96,7 +96,7 @@ function b_loadTop(){
 				}
 			}else{
 				isLogined = false;
-				var html = '<a onclick="loginModalShow();">登录/注册</a>';
+				var html = '<img class="b-loginbtn cursor-pointer" onclick="loginModalShow();" src="/images/swordfish/headimg.png">';
 				$("#b-loginStatus").html(html);
 				$("#bottom-bar>li").removeClass("invisible");
 				//登录

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

@@ -107,7 +107,7 @@
 		<li class="border-r-0">招聘</li>
 	</ul>
 	<div class="ent-tab-content">
-		<div class='hide'>
+		<div>
 			{{if .T.res.gs}}
 			<div class="entinfo-basicinfo ent-layout-up">
 				<div class="b-com-title">
@@ -277,7 +277,7 @@
 				</div>
 				<img src="/images/entcommunity/relation.png">
 			</div>
-			<div id="entrelation-findnull" class="entrelation-findnull hide">
+			<div id="entrelation-findnull" class="ent-findnull hide">
 				<img src="/images/findnull.png" class="b-findnull">
 				<h4>抱歉，未找到相关数据！</h4>
 			</div>
@@ -304,8 +304,46 @@
 				{{end}}
 			</div>
 		</div>
-		<div class="hide">
-		
+		<div class="ent-alterinfo hide">
+			<div class="ent-layout-up">
+				<div class="b-com-title">
+					<span class="glyphicon jianzhu"></span>变更信息
+				</div>
+				<div class="b-com-content">
+				{{if gt (len .T.res.alterInfo) 0}}
+					<ul>
+					{{range $k,$v := .T.res.alterInfo}}
+						<li>
+							<div>
+								<div><script>document.write(new Date(Number({{$v.AltDate}})).Format("yyyy-MM-dd hh:mm:ss"));</script></div>
+								<div>{{$v.AltItemName}}</div>
+								<div>变更前：{{$v.AltBe}}<br>变更后：{{$v.AltAf}}</div>
+								<a></a>
+							</div>
+							<div>
+								<div><script>document.write(new Date(Number({{$v.AltDate}})).Format("yyyy-MM-dd hh:mm:ss"));</script></div>
+								<div>{{$v.AltItemName}}</div>
+								<div>变更前：{{$v.AltBe}}<br>变更后：{{$v.AltAf}}</div>
+								<a></a>
+							</div>
+						</li>
+					{{end}}
+						<li>
+							<div></div>
+							<div>
+								<a></a>
+							</div>
+						</li>
+						<div class="clearfix"></div>
+					</ul>
+				{{else}}
+					<div class="ent-findnull">
+						<img src="/images/findnull.png" class="b-findnull">
+						<h4>抱歉，未找到相关数据！</h4>
+					</div>
+				{{end}}
+				</div>
+			</div>
 		</div>
 		<div class="hide">
 			<div class="ent-findnull">
@@ -313,12 +351,16 @@
 				<h4>抱歉，未找到相关数据！</h4>
 			</div>
 		</div>
-		<div class="ent-service">
+		<div class="hide ent-service">
 			<table class="table ent-table" id="serviceList">
 				<tr>
-					<td colspan="5" class="text-center" id="myAppointmentPaging"></td>
+					<td colspan="4" class="text-center" id="serviceListPaging"></td>
 				</tr>
 			</table>
+			<div class="ent-findnull hide">
+				<img src="/images/findnull.png" class="b-findnull">
+				<h4>抱歉，未找到相关数据！</h4>
+			</div>
 		</div>
 		<div class="hide">
 			<div class="ent-findnull">