wangchuanjin 9 жил өмнө
parent
commit
513284554d

+ 3 - 4
core/src/qfw/yellowpage/yellowpagemanager.go

@@ -282,7 +282,6 @@ func (yp *Yellowpage) EnterpriseInfo(id string) error {
 						if relevantEnts != nil && len(*relevantEnts) > 0 {
 							for _, relevantEnt := range *relevantEnts {
 								relevantEnt["_id"] = util.BsonIdToSId(relevantEnt["_id"])
-								break
 							}
 							yp.T["relevantEnts"] = relevantEnts
 						}
@@ -293,7 +292,6 @@ func (yp *Yellowpage) EnterpriseInfo(id string) error {
 			yp.T["dishonesty"] = getDishonesty(util.If(info["LegCerNO"] != nil, info["LegCerNO"], "").(string), 1)
 			//服务列表第一页数据
 			yp.T["service"] = findServiceByEntId(id, 1, yp.Session())
-			log.Println(yp.T["service"])
 			//关系网数据
 			yp.T["relation"] = relation
 			contentuser, erruser := yp.Render4Cache("/yellowpage/enterpriseinfo.html", &yp.T)
@@ -571,8 +569,9 @@ func getDishonesty(legcerNo string, currentPage int) map[string]interface{} {
 		start := (currentPage - 1) * limit
 		count := Count("laolai", `{"s_cardnum":"`+legcerNo+`"}`)
 		r := Find("laolai", `{"s_cardnum":"`+legcerNo+`"}`, `{"l_date":-1}`, `{"l_date":1,"iname":1,"court_name":1,"case_code":1,"performance":1}`, false, start, limit)
-		redis.Put("enterprise", "dishonesty-"+legcerNo+"-"+fmt.Sprint(currentPage), r, 7*24*60*60)
-		return map[string]interface{}{"list": r, "count": count, "pageSize": limit}
+		ret := map[string]interface{}{"list": r, "count": count, "pageSize": limit}
+		redis.Put("enterprise", "dishonesty-"+legcerNo+"-"+fmt.Sprint(currentPage), ret, 7*24*60*60)
+		return ret
 	}
 }
 func (yp *Yellowpage) FindServiceByEntId() error {

+ 7 - 8
core/src/web/templates/search/entcommunity.html

@@ -19,7 +19,7 @@
 				<span class="input-group-addon" id="search-btn"><span class="glyphicon sousuo"></span>查询</span>
 			</div>
 			<div class="b-com-fourth" id="hotsearchwords">
-				热搜词:{{$s:=(Ad "ent-hotsearchwords" 15)}}{{range $k,$v := $s}}<a>{{$v.s_remark}}</a>{{end}}
+				热搜词:{{$s:=(Ad "ent-hotsearchwords" 15)}}{{range $k,$v := $s}}<a href="/enterprise/{{$v.s_id}}.html">{{$v.s_remark}}</a>{{end}}
 			</div>
 		</div>
 		<div class="ent-index-recommend">
@@ -37,7 +37,7 @@
 			<div class="b-adver-content">
 				<ul>
 				{{range $k,$v := .T.newIndentEnts}}
-					<li{{if eq $k 0}} class="border-t-0"{{end}}>
+					<li class="cursor-pointer{{if eq $k 0}} border-t-0{{end}}" onclick="window.location.href='/enterprise/{{$v.s_enterpriseid}}.html'">
 						<div>
 							<img src="{{if $v.s_avatar}}{{$v.s_avatar}}{{else}}null{{end}}" onerror="this.src='/images/ent-logo.png'">
 							<a href="/enterprise/{{$v.s_enterpriseid}}.html">{{$v.s_enterprisename}}</a>
@@ -67,10 +67,6 @@ $(function(){
 		$("input[name='words']").val($("input[name='entIndexSearch']").val());
 		$("form#searchForm").submit();
 	});
-	$("#hotsearchwords a").click(function(){
-		$("input[name='words']").val($(this).text());
-		$("form#searchForm").submit();
-	});
 	var ents = {{Ad "ent-recommend" 48}};
 	if(typeof(ents) != "undefined" && ents != null && ents.length > 0){
 		var tmp = 0;
@@ -94,10 +90,13 @@ $(function(){
 				}
 			    html += '"><ul>';
 			}
-			html += '<li>'
+			html += '<a href="/enterprise/'+ents[i].s_id+'.html"><li>'
 						+'<img src="'+ents[i].s_pic+'" onerror="this.src=\'/images/ent-logo.png\'">'
 						+'<a href="/enterprise/'+ents[i].s_id+'.html">'+ents[i].s_remark+'</a>'
-					+'</li>';
+					+'</li></a>';
+			if(tmp == 4){
+				html += '<div class="clearfix"></div>';
+			}
 			if(tmp == 8 || i == ents.length-1){
 				tmp = 0;
 				html += '</ul><div class="clearfix"></div></div>';

+ 2 - 6
core/src/web/templates/search/enterpriseList.html

@@ -179,7 +179,7 @@
 			<div class="b-adver-content">
 				{{$s:=(Ad "ent-hotsearchwords" 15)}}
 				{{range $k,$v := $s}}
-					<a{{if $v.o_extend.fontsize}}{{if eq $v.o_extend.fontsize "large"}} style="font-size: 20px;"{{else if eq $v.o_extend.fontsize "larger"}} style="font-size: 20px;"{{end}}{{end}}>{{$v.s_remark}}</a>
+					<a{{if $v.o_extend.fontsize}}{{if eq $v.o_extend.fontsize "large"}} style="font-size: 20px;"{{else if eq $v.o_extend.fontsize "larger"}} style="font-size: 20px;"{{end}}{{end}} href="/enterprise/{{$v.s_id}}.html">{{$v.s_remark}}</a>
 				{{end}}
 			</div>
 		</div>
@@ -189,7 +189,7 @@
 				{{$s:=(Ad "ent-recommend" 15)}}
 				<ul>
 				{{range $k,$v := $s}}
-					<li{{if eq $k 0}} class="border-t-0"{{end}}>
+					<li class="cursor-pointer{{if eq $k 0}} border-t-0{{end}}" onclick="window.location.href='/enterprise/{{$v.s_id}}.html'">
 						<div>
 							<img src="{{if $v.s_pic}}{{$v.s_pic}}{{else}}null{{end}}" onerror="this.src='/images/ent-logo.png'">
 							<a href="/enterprise/{{$v.s_id}}.html">{{$v.s_remark}}</a>
@@ -214,10 +214,6 @@ var chf1= {{index .T.querymap "c_hfl"}};
 var czb= '{{index .T.querymap "c_zb"}}';
 var $chiancity= true,$listent=true;
 $(function(){
-	$(".entlist-hotsearchwords a").click(function(){
-		$("input[name='words']").val($(this).text());
-		$("form#searchForm").submit();
-	});
 	scrollUp("entlist-recommend");
 });
 </script>

+ 2 - 2
core/src/web/templates/yellowpage/enterpriseinfo.html

@@ -424,10 +424,10 @@
 			<div class="b-adver-content">
 				<ul>
 				{{range $k,$v := .T.relevantEnts}}
-					<li{{if eq $k 0}} class="margin-0 border-t-0"{{end}}>
+					<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='/images/ent-logo.png'">
-							<a href="/enterprise/{{$v._id}}.html">{{$v.EntName}}</a>
+							<script style="display: none;">var _id = {{$v._id}};document.write('<a href="/enterprise/'+_id+'.html">{{$v.EntName}}</a>');</script>
 						</div>
 					</li>
 				{{end}}