소스 검색

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

zhangjinkun@topnet.net.cn 9 년 전
부모
커밋
9f48bf691a
3개의 변경된 파일28개의 추가작업 그리고 13개의 파일을 삭제
  1. 1 1
      core/src/qfw/yellowpage/yellowpagemanager.go
  2. 3 2
      core/src/web/staticres/js/entportrait.js
  3. 24 10
      core/src/web/templates/swordfish/infolist.html

+ 1 - 1
core/src/qfw/yellowpage/yellowpagemanager.go

@@ -126,7 +126,7 @@ func GetEntInfo(id string) interface{} {
 //企业黄查询结果
 func (yp *Yellowpage) EnterpriseInfo(id string) error {
 	id = strings.Split(id, "#")[0]
-	if ret, err := redis.GetBytes("enterprise", id); err == nil {
+	if ret, err := redis.GetBytes("enterprise", "enterpriseInfo_"+id); err == nil {
 		return yp.SetBody(*ret)
 	} else {
 		if info := GetEntInfo(id); info != nil {

+ 3 - 2
core/src/web/staticres/js/entportrait.js

@@ -69,12 +69,13 @@ function b_afterLogin(flag){
 //加载关系网
 function initRelation(){
 	if(isLogined){
-		$("#entrelation-limit,#entrelation-nologin").addClass("hide");
 		$.post("/member/getRelation",{regNo:regNo,entName:entName},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)){
+				$("#entrelation-limit,#entrelation-nologin").addClass("hide");
 				relation = "";
 				$("#entrelation-infovis").hide();
 				$("#entrelation-findnull").removeClass("hide");
@@ -82,7 +83,7 @@ function initRelation(){
 				loadJS("/js/d3.v3.min.js",function(){
 					loadJS("/js/geometry.js",function(){
 						loadJS("/js/relation.js",function(){
-							$("#entrelation-limit").addClass("hide");
+							$("#entrelation-limit,#entrelation-nologin").addClass("hide");
 							$(".entrelation").height(500);
 							relation = new Relation(legcerNo,regNo,r.relation);
 							relation.init();

+ 24 - 10
core/src/web/templates/swordfish/infolist.html

@@ -5,9 +5,7 @@
 </head>
 <body>
 <script type="text/javascript">
-	var lasttime=1,s_words,a_visitedindex,a_publishtime,le,f_id,a_interest;
-$(function(){
-	$(".b-nav>ul>li:eq(3)").addClass("b-nav-active");
+	var lasttime=1,a_visitedindex,a_publishtime,le,f_id;
 	var s_words = [];
 	var a_interest = [];
 	if({{.T.msgset.o_msgset.bid.a_key}}){
@@ -16,6 +14,8 @@ $(function(){
 	if({{.T.msgset.o_msgset.tender.a_key}}){
 		a_interest={{.T.msgset.o_msgset.tender.a_key}};
 	}
+$(function(){
+	$(".b-nav>ul>li:eq(3)").addClass("b-nav-active");
 	if(s_words.length!=0){
 		$("#okeywords").append(s_words.join(" ; ").replace(/\+/gm," "));
 	}else{
@@ -57,6 +57,16 @@ $(function(){
 			var str="";
 			for(var i=0;i<res.length;i++){
 				var temp=res[i];
+				var s_type = temp["s_type"];
+				s_type = "bid";
+				if(s_type == "bid"){
+					s_type = "中标";
+				}else if(s_type == "tender"){
+					s_type = "招标";
+				}
+				if(s_type != ""){
+					str+="<span style='display: none;' class='dataType'>【"+s_type+"】</span>";
+				}
 				str+=temp["s_content"];
 				a_visitedindex=temp["a_visitedindex"];
 				a_publishtime=temp["a_publishtime"];
@@ -177,17 +187,21 @@ function loadMore(){
 			var str="";
 			for(var i=0;i<res.length;i++){
 				var temp=res[i];
+				var s_type = temp["s_type"];
+				s_type = "bid";
+				if(s_type == "bid"){
+					s_type = "中标";
+				}else if(s_type == "tender"){
+					s_type = "招标";
+				}
+				if(s_type != ""){
+					str+="<span style='display: none;' class='dataType'>【"+s_type+"】</span>";
+				}
 				str+=temp["s_content"];
 				a_visitedindex=temp["a_visitedindex"];
 				a_publishtime=temp["a_publishtime"];
 				f_id=temp["_id"];
 			}
-			if({{.T.msgset.o_msgset.bid.a_key}}){
-				s_words={{.T.msgset.o_msgset.bid.a_key}};
-			}
-			if({{.T.msgset.o_msgset.tender.a_key}}){
-				a_interest={{.T.msgset.o_msgset.tender.a_key}};
-			}
 			
 			$("#conlist").append('<div id="ycwords">'+str+'</div>');
 			//
@@ -302,7 +316,7 @@ function loadMore(){
 }
 .tim{padding:21px 0px;}
 .row{margin-left:10px;margin-right:10px;}
-#ycwords>div:first-child{display:none;}
+#ycwords>div:first-of-type{display:none;}
 #forkw{margin-top: 15px;padding:10px 0px 10px 50px;background-color: #F7F8FA;color: #a0a0a0;}
 .xh{width: 10%;color:#35C5DA;font-size:15px;font-weight:bold;margin:0px 20px;float:left;display: inline-block; width:18px;text-align:right;}
 .tslist{border-bottom:1px solid #ccc;width:100%; padding:15px 0px;}