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

core/src/qfw/search/searchService.go

@@ -180,6 +180,7 @@ func (n *Search) Sim() error {
 		return nil
 	}
 	searchResult, err := client.Search().Index("enterprise").Type("enterprise").Source(query).Do()
+
 	if err != nil {
 		n.ServeJson(&res)
 		return nil

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

@@ -54,10 +54,6 @@ a{
 .text-small{
 	font-size:12px;
 }
-.bootstrap-glyphicon {
-	font-family: 'Glyphicons Halflings' !important;
-}
-
 .a-com-active {
 	background-color: #dd4814;
 }
@@ -72,7 +68,7 @@ a{
 	max-width: 1200px;
 	margin-left: auto;
 	margin-right: auto;
-	padding: 0px 5px;
+	padding: 0px;
 }
 
 .a-content .a-c-left,.a-content .a-c-right{
@@ -854,7 +850,7 @@ a{
 }
 
 .a-index-want li.a-com-last{
-	padding: 10px 5px 0px 5px;
+	padding: 10px 0px 0px 15px;
 }
 
 .a-index-want div{
@@ -926,7 +922,7 @@ a{
 	padding-left:10px;
 }
 .a-index-hd>img{
-	width: 295px;
+	width: 305px;
 	height: 130px;
 }
 /*扫码送红包活动 start*/
@@ -2048,6 +2044,9 @@ style="color:#D03102;margin-right:5px;"
 	width: 82px;
 }
 /*********b版网站顶部***********/
+.b-body{
+	background-color: #f0f0f0;
+}
 .logo{
 	width: 156px;
 	height: 55px;
@@ -2069,7 +2068,7 @@ style="color:#D03102;margin-right:5px;"
 	font-size: 12px;
 	font-family: "SimSun";
 }
-.b-top>div,.swordfish-content{
+.b-top>div,.b-content{
 	max-width: 1200px;
 	margin: auto;
 }
@@ -2210,10 +2209,10 @@ style="color:#D03102;margin-right:5px;"
 }
 .b-head .head-hideMenu i.ren1{
 	margin-left: 2px;
+	margin-right: 5px;
 }
 .b-head .head-hideMenu i.ren1,.b-head .head-hideMenu i.tuichu{
 	font-size: 16px;
-	margin-right: 15px !important;
 }
 .b-head .head-hideMenu li:hover{
 	color: #fff;
@@ -2227,6 +2226,56 @@ style="color:#D03102;margin-right:5px;"
 .b-head a{
 	text-decoration: none;
 }
+.b-head .b-h-search{
+	padding-top: 14px;
+}
+.b-head .b-h-search .input-group{
+	width: 300px;
+}
+.b-head .b-h-search .form-control{
+	border-radius: 50px !important;
+}
+.b-head .b-h-search form>span i {
+    position: absolute;
+    right: 10px;
+    top: 50%;
+    z-index: 10;
+    font-size: 14px;
+    margin-top: -7px;
+	color:#fff;
+}
+.b-head .b-h-search form>span{
+    position: absolute;
+    right: 10px;    
+	border-radius: 50px;
+    top: 50%;
+    z-index: 20;
+    margin-top: -19px;
+	margin-right:-10px;
+    display: inline-block;
+	width:38px;
+	height:38px;
+}
+.b-content{
+	padding: 15px 0px 15px 0px;
+}
+.b-left{
+	background-color: #FFFFFF;
+	padding: 15px;
+	width: 940px;
+	display: inline-block;
+	vertical-align: top;
+}
+.b-right{
+	background-color: #FFFFFF;
+	width: 250px;
+	display: inline-block;
+	vertical-align: top;
+	float: right;
+}
+.b-right-content{
+	padding: 10px;
+}
 /*认证完第一次登录 end*/
 /*分辨率小于1200的时候调整布局，算上滚动条1217*/
 @media (max-width: 1217px) {

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

@@ -0,0 +1,69 @@
+body{
+	background-color: #f0f0f0;
+}
+a:focus, a:hover{
+	color: #16a086;
+}
+.b-round-dot{
+	background-color: #16a086;
+}
+.b-nav{
+	border-top-color: #16a086;
+}
+.b-nav-main{
+	background-color: #16a086;
+}
+.b-h-search{
+	padding-left: 30px;
+}
+.b-round-dot{
+	background-color: #16a086;
+}
+.b-head .b-h-search form>span{
+	background-color: #16a086;
+}
+.b-head .b-com-third{
+	background-color: #16a086;
+}
+.b-head .head-hideMenu i{
+	color: #16a086;
+}
+.b-head .head-hideMenu li:hover{
+	background-color: #16a086;
+}
+.ttcon ul li:hover{
+	color: #16a086;
+}
+.text-primary{
+	color: #16a086 !important;
+}
+.entlist-page .nav-tabs{
+	background-color: #f0f0f0;
+	margin-top: 20px;
+	margin-left: -15px;
+	margin-right: -15px;
+	padding-left: 15px;
+	border: 0px;
+}
+.entlist-page .nav-tabs>li{
+	width: 100px;
+	border-radius: 0px;
+	text-align: center;
+	height: 45px;
+}
+.entlist-page .nav-tabs>li>a{
+	border-radius: 0px;
+	border-width: 0px !important;
+	margin-right: 0px;
+	padding: 11px 15px
+}
+.entlist-page .nav-tabs>li>a:hover{
+	border: none;
+	background: none;
+}
+.entlist-page .nav-tabs>.active{
+	border-top: 3px solid #16a086;
+}
+.entlist-page .nav-tabs>.active:hover{
+	background-color: #FFFFFF;
+}

core/src/web/staticres/css/enterprise.css

@@ -2,9 +2,7 @@
 .qfw-row { margin-left: 0px; margin-right: 0px;}
 #titleactionimgs  img{margin-left:15px;width:18px;height:18px;}
 #titleactionimgs  h3{font-family: "微软雅黑 Regular", "微软雅黑";font-weight: normal;}
-
-.qfw-p-margintoplist{margin-top:10px;background-color: #fff;}
-.qfw-p-margintop{margin-top:10px;background-color: #fff;filter: alpha(Opacity=95);-moz-opacity: 0.95;opacity: 0.95;}
+.qfw-p-margintop{margin-top:5px;background-color: #fff;}
 .qfw-row-marginbottom{margin-bottom:10px;}
 span.highlight {
     text-decoration: inherit;
@@ -24,7 +22,7 @@ span.highlight {
 .rowsolid-bottom{
 	border-bottom:1px solid #CCCCCC;	
 }
-.rowFltt .qfw-text-more{position:absolute;right:10px;top:7px;cursor:pointer;}
+.rowFltt .qfw-text-more{position:absolute;right:10px;top:7px;cursor:pointer;color: #16a086;}
 .tt{
 	width:90px;
 	padding-left: 15px;
@@ -55,20 +53,16 @@ span.highlight {
 	cursor:pointer;
 	margin-top:-2px;
 }
-.ttcon ul li:hover{
-	color:#DE5E4E
-}
 .sel{
-  width: 20%;
-  min-width:80px;
-  max-width:180px;
-  height: 25px;
-
-  font-size: 14px;
-  color: #555;
-  background-color: #fff;
-  border: 1px solid #ccc;
-  border-radius: 4px;
+	width: 20%;
+	min-width:80px;
+	max-width:180px;
+	height: 35px;
+	font-size: 14px;
+	color: #555;
+	background-color: #fff;
+	border: 1px solid #ccc;
+	margin-right: 15px;
 }
 
 /******注册资本、认证*******/
@@ -329,4 +323,4 @@ form{margin-bottom: 0px;}
 	.identactionType{
 		color: #dd4814 ;
 	}
-}
+}

core/src/web/staticres/css/index-new.css

@@ -1,3 +1,6 @@
+body{
+	background-color: #f0f0f0;
+}
 /****indexhead*****/
 .b-nav{
     border-top-color: #FF5A5F;
@@ -16,41 +19,13 @@
 a:focus, a:hover{
 	color: #FF5A5F;
 }
-.index-new-nva .a-h-search{
-    width: 25%;
-	float:right;
-	padding-top:18px;
-}
-.index-new-nva .a-h-search span i {
-    position: absolute;
-    right: 10px;
-    top: 50%;
-    z-index: 10;
-    font-size: 14px;
-    margin-top: -7px;
-	color:#fff;
-}
-.index-new-nva .a-h-search span{
-    position: absolute;
-    right: 10px;    
-	border-radius: 50px;
-    top: 50%;
-    z-index: 20;
-    margin-top: -19px;
-	margin-right:-10px;
-    display: inline-block;
-	width:38px;
-	height:38px;
-	border:1px solid #FF5A5F;
+.b-head .b-h-search span{
 	background-color:#FF5A5F;
 }
 .index-new-nva .a-h-search .input-group {
     width: 100%;
     height: inherit;
 }
-.index-new-nva #header-searchInput{
-	border-radius: 50px;
-}
 .index-new-head .head-hideMenu li:hover {
     background-color: #FF5A5F;
 }
@@ -60,36 +35,6 @@ a:focus, a:hover{
 .index-new-head .head-hideMenu i {
     color: #FF5A5F;
 }
-.index-new-head .head-hideMenu i.ren1, .index-new-head .head-hideMenu i.tuichu {
-    font-size: 16px;
-    margin-right: 15px !important;
-}
-.index-new-head .head-hideMenu i.ren1 {
-    margin-left: 2px;
-}
-.index-new-head .loginStatus>span .round-dot {
-    right: 5px;
-    width: 8px;
-    height: 8px;
-}
-.index-new-head .round-dot {
-    background-color: #FF5A5F;
-    width: 6px;
-    height: 6px;
-    border-radius: 50%;
-    position: absolute;
-    display: block;
-    top: 0px;
-	padding:0px;
-	margin-right:2px;
-}
-.index-new-head .head-hideMenu li:hover .round-dot {
-    background-color: #FFFFFF;
-}
-.index-new-head .head-hideMenu li .round-dot {
-    right: 15px;
-	top:10px;
-}
 /*****index****/
 
 .a-index-head .a-i-h-right .a-index-want {
@@ -294,10 +239,6 @@ a:focus, a:hover{
     color: #4E5051;	
 	padding-left:10px;
 }
-
-.index-new-head .a-i-h-right .a-index-hd img{
-	width:292px;
-}
 .a-index .a-index-want .a-com-two {
     margin: 20px 0px 40px;
 }
@@ -320,9 +261,6 @@ a:focus, a:hover{
 	padding-left:10px;
 	border:1px solid rgb(240, 240, 240);
 }
-.index-new-body {
-	background-color:#f0f0f0;
-}
 .a-index-head .a-i-h-right, .a-rmfw,.a-rmxq,.a-qysq,.a-xwzx,.index-new-wgw{
 	background-color:#fff;
 }
@@ -382,11 +320,6 @@ a:focus, a:hover{
 .a-index .index-new-head{
 	margin-bottom:-10px;
 }
-.index-new-head .a-i-h-right{
-	margin-left:10px;
-	padding-left:0px;
-	width:293px;
-}
 .a-index .a-index-head .a-i-h-right {
 	padding-left:0px;
 	margin-left:10px;

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

@@ -463,6 +463,9 @@ a.new_red:hover, a.new_red:active {
 }
 
 /*==========覆盖bootstrap样式 start===========*/
+.bootstrap-glyphicon {
+	font-family: 'Glyphicons Halflings' !important;
+}
 [class*="col-"] {
 	padding-left: 0px !important;
 }
@@ -513,6 +516,9 @@ a.new_red:hover, a.new_red:active {
 .modal-header .close:focus, .modal-header .close:hover{
 	opacity: 1;
 }
+.form-control{
+	border-radius: 0px;
+}
 /*==========覆盖bootstrap样式 end===========*/
 .lineb {
 	display: inline-block;

core/src/web/staticres/css/swordfish.css

@@ -1,6 +1,6 @@
 /********可以共用********/
 body{
-	background-color: #F0F0F0;
+	background-color: #f0f0f0;
 }
 a:focus, a:hover{
 	color: #37C6DA;
@@ -8,6 +8,12 @@ a:focus, a:hover{
 .b-round-dot{
 	background-color: #37C6DA;
 }
+.b-head .head-hideMenu i{
+	color: #37C6DA;
+}
+.b-head .head-hideMenu li:hover{
+	background-color: #37C6DA;
+}
 /********剑鱼********/
 .b-head .b-top li:hover>i{
 	background-color: #37C6DA !important;
@@ -24,30 +30,6 @@ a:focus, a:hover{
 .b-nav-other>a:hover,.b-nav-active>a{
 	color: #37C6DA !important;
 }
-.b-head .head-hideMenu i{
-	color: #37C6DA;
-}
-.b-head .head-hideMenu li:hover{
-	background-color: #37C6DA;
-}
-.swordfish-content{
-	padding: 15px 0px 15px 0px;
-}
-.swordfish-left{
-	background-color: #FFFFFF;
-	padding: 15px;
-	width: 940px;
-	display: inline-block;
-	vertical-align: top;
-}
-.swordfish-right{
-	padding-right: 0px;
-	background-color: #FFFFFF;
-	width: 250px;
-	display: inline-block;
-	vertical-align: top;
-	float: right;
-}
 .swordfish-page-title{
 	padding-bottom: 10px;
 	border-bottom: 1px solid #ddd;
@@ -74,7 +56,7 @@ a:focus, a:hover{
 .swordfish-rssset .btn>span{
 	margin-right: 5px;
 }
-.swordfish-rssset .swordfish-left>div{
+.swordfish-rssset .b-left>div{
 	margin-bottom: 15px;
 }
 .swordfish-qrcode{
@@ -226,7 +208,7 @@ a:focus, a:hover{
 	margin-bottom: 20px;
 }
 /*******剑鱼首页*******/
-.swordfish-index .swordfish-right>div{
+.swordfish-index .b-right>div{
 	padding-left: 10px;
 }
 .swordfish-index .swordfish-right-title{
@@ -326,10 +308,10 @@ a:focus, a:hover{
 	margin-right: 10px;
 }
 @media (max-width: 1200px) {
-	.swordfish-left{
+	.b-left{
 		width: 100%;
 	}
-	.swordfish-right{
+	.b-right{
 		display: none;
 	}
 }

core/src/web/staticres/js/enterprise.js

@@ -37,7 +37,6 @@ 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")
@@ -57,10 +56,6 @@ function reloadData(obj,name){
 			}
 		}
 		
-	}else if(name=="c_author"){
-		if(!obj.prop("checked")){
-			val="";
-		}
 	}
 	//调整value 值
 	if(val==10){

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

@@ -8,6 +8,8 @@ var isLogined = false;
 var loginBackType = null;
 //登录完之后强制刷新
 var compulsoryreRresh = false;
+//顶部是否加载完毕
+var topLoadOver = false;
 //表单验证的参数
 var cssctlObj = null;
 var ValidDatatype = {
@@ -547,19 +549,19 @@ function b_loadTop(){
 					html += '<a class="b-round-dot"></a>';
 				}
 				html += '</span></li>'
-						+'<li onclick="window.location.href=\'/member/show/memberindex\'"><i class="glyphicon ren1">&nbsp;</i>用户中心</li>'
-						+'<li onclick="window.location.href=\'/front/logout\'" class="border-b-0"><i class="glyphicon tuichu">&nbsp;</i>退出</li>';
+						+'<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)
 				.mouseover(function(){
 					$("#head-hideMenu").show();
 				}).mouseleave(function(){
-					//$("#head-hideMenu").hide();
+					$("#head-hideMenu").hide();
 				});
 				$("#head-hideMenu").mouseover(function(){
 					$(this).show();
 				}).mouseleave(function(){
-					//$(this).hide();
+					$(this).hide();
 				});
 				//处理公用底部扫码登录按钮
 				$("#bottom-bar>li:first").addClass("invisible");

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

@@ -0,0 +1,73 @@
+<!---->
+<div class="index-new-head b-head">
+	{{include "/common/top.html"}}
+	<div class="b-nav index-new-nva">
+		<ul>
+			<li class="b-nav-logo"><a href="/"><img src="/images/logo.png" class="logo"></a></li>
+			<li class="b-nav-link b-nav-main"><a href="/search/enterprise/ent.html">企业社区</a></li>
+			<li class="b-h-search">
+				<div class="input-group">
+			        <div class="input-group-btn hide">
+			        	<button type="button" id="header-searchBtn" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><font>服务</font><span class="hide caret margin-l-10"></span></button>
+			        </div> <!--/btn-group -->
+					<form method="post" id="searchForm" action="/search/enterprise/ent.html">
+						<span id="searchFormBtn"><i class="glyphicon sousuo"></i></span>
+				        <input type="text" name="words" class="form-control" id="header-searchInput" placeholder="找企业" value="{{if .T.querymap}}{{index .T.querymap "query"}}{{end}}">
+						<input type="hidden" name="city" id="city" value="{{index .T.querymap "city"}}">
+						<input type="hidden" name="cityNo" id="cityNo" value="{{index .T.querymap "cityNo"}}">
+						<input type="hidden" name="c_author" id="hauthor" value="{{index .T.querymap "c_author"}}">
+						<input type="hidden" name="c_hfl" id="hfl" value="{{index .T.querymap "c_hfl"}}">
+						<input type="hidden" name="c_zb" id="zb" value="{{index .T.querymap "c_zb"}}">
+					</form>
+	       		</div><!-- /input-group -->
+			</li>
+			<li class="pull-right b-loginStatus" id="b-loginStatus"></li>
+		</ul>
+	</div>
+</div>
+<script type="text/javascript">
+//顶部是否加载完毕
+var topLoadOver = false;
+var keyCode=0;
+document.onkeydown=function(event){
+    var e = event || window.event || arguments.callee.caller.arguments[0];
+    if(e && e.keyCode==13){ // enter 键
+        keyCode=13
+    }
+};
+$(function (){
+	b_loadTop();
+	$("#searchFormBtn").click(function(){
+		keyCode = 13;
+		$("form#searchForm").submit();
+	});
+	$("form#searchForm").submit(function(){
+		var input_val = $(this).children("[type='text']").val().replace(/^\s+|\s+$/g,"");
+		if(input_val==""){
+			input_val = $("#header-searchInput").attr('placeholder');
+		}
+		if (keyCode==13){
+	 		if(input_val==""||input_val=="请输入关键字"){
+				keyCode=0;
+				return false;
+			}else {
+				$("input[name='words']").val(input_val);
+				keyCode=0;
+				return true;
+			}
+		}
+	});
+	//设置即时下拉
+	$("#header-searchInput,#words").attr("autocomplete","off").keyup(function(){
+		imFind(this)
+	}).focus(function(){
+		imFind(this)
+	})
+	$("body").mouseout(function(e){
+		e=e||window.event
+		if(e.target == this){
+			$("#immediately").hide();
+		}
+	});
+});
+</script>

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

@@ -55,8 +55,6 @@
 	</table>
 </div>
 <script text="text/javascript">
-//顶部是否加载完毕
-var topLoadOver = false;
 var isMobile = false;
 var keyCode=0;
 document.onkeydown=function(event){

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

@@ -7,40 +7,31 @@
 			<li class="b-nav-link b-nav-main index-new-nva-c a-com-active fwsc"><a href="/market/0/list.html">服务市场</a></li>
 			<li class="b-nav-link b-nav-other index-new-nva-c"><a class="setserver"  id="releaseService">发服务</a><a class="b-nav-s"></a></li>
 			<li class="b-nav-link b-nav-other index-new-nva-c"><a id="setdemand"  href="/market/demand/add.html">发需求</a></li>
-			<li class="pull-right b-loginStatus" id="b-loginStatus"></li>
-			<li class="a-h-search">
-					<div class="input-group">
-				        <div class="input-group-btn hide">
-				        	<button type="button" id="header-searchBtn" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><font>服务</font><span class="hide caret margin-l-10"></span></button>
-				        </div> <!--/btn-group -->
-						<form method="post" id="searchForm" action="/market/0/list.html">
-							<span><i class="glyphicon sousuo" id="searchFormBtn"></i></span>
-					        <input type="text" name="words" class="form-control" id="header-searchInput" placeholder="{{if .T.hotword}}{{.T.hotword}}{{else}}找服务{{end}}">
-							<input type="hidden" name="city" id="city" value="">
-							<input type="hidden" name="cityNo" id="cityNo" value="">
-							<!-- 服务市场 -->
-							<input type="hidden" name="c_searchtype" id="c_searchtype" value="">
-							<input type="hidden" name="c_fwtype" id="c_fwtype" value="">
-							<input type="hidden" name="c_fbtime" id="c_fbtime" value="">
-							<input type="hidden" name="c_rztype" id="c_rztype" value="">
-							<input type="hidden" name="c_xqtype" id="c_xqtype" value="">
-							<input type="hidden" name="c_sorttype" value="">
-							<!-- 企业社区 -->
-							<input type="hidden" name="c_author" id="hauthor" value="">
-							<input type="hidden" name="c_hfl" id="hfl" value="">
-							<input type="hidden" name="c_zb" id="zb" value="">
-						</form>
-		       		</div><!-- /input-group -->
-				<div class="a-h-nav-btn">
-					<img src="/images/nav-btn.png" class="visible-xs-inline" id="nvaBtn">
-				</div>
+			<li class="b-h-search">
+				<div class="input-group">
+			        <div class="input-group-btn hide">
+			        	<button type="button" id="header-searchBtn" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><font>服务</font><span class="hide caret margin-l-10"></span></button>
+			        </div> <!--/btn-group -->
+					<form method="post" id="searchForm" action="/market/0/list.html">
+						<span id="searchFormBtn"><i class="glyphicon sousuo"></i></span>
+				        <input type="text" name="words" class="form-control" id="header-searchInput" placeholder="找服务" value="{{if .T.querymap}}{{index .T.querymap "query"}}{{end}}">
+						<input type="hidden" name="city" id="city" value="">
+						<input type="hidden" name="cityNo" id="cityNo" value="">
+						<!-- 服务市场 -->
+						<input type="hidden" name="c_searchtype" id="c_searchtype" value="">
+						<input type="hidden" name="c_fwtype" id="c_fwtype" value="">
+						<input type="hidden" name="c_fbtime" id="c_fbtime" value="">
+						<input type="hidden" name="c_rztype" id="c_rztype" value="">
+						<input type="hidden" name="c_xqtype" id="c_xqtype" value="">
+						<input type="hidden" name="c_sorttype" value="">
+					</form>
+	       		</div>
 			</li>
+			<li class="pull-right b-loginStatus" id="b-loginStatus"></li>
 		</ul>
 	</div>
 </div>
 <script type="text/javascript">
-//顶部是否加载完毕
-var topLoadOver = false;
 var isMobile = false;
 var keyCode=0;
 document.onkeydown=function(event){
@@ -72,11 +63,6 @@ $(function (){
 			}	
 		}
 	});
-	$("#header-searchInput").bind("focus blur",function(){
-		//$(".a-h-search").toggleClass("a-com-focus");
-		$(this).prev("i").toggleClass("text-primary");
-		//$("#loginStatus").toggleClass("hide");
-	});
 	//
 	$("[id='releaseService']").click(function(){
 		if(isLogined){
@@ -85,20 +71,5 @@ $(function (){
 			loginModalShow(6);
 		}
 	});
-	//手机版
-	$("#nvaBtn").click(function(){
-		if($(this).attr("src") == "/images/nav-btn.png"){
-			$(this).attr("src","/images/nav-btn-a.png");
-		}else{
-			$(this).attr("src","/images/nav-btn.png");
-		}
-		$("#head-navbar").toggleClass("hidden-xs");
-	});
-	$("body").click(function(e){
-		if(isMobile && e.target.id != "head-navbar-ul" && e.target.id != "nvaBtn"){
-			$("#head-navbar").addClass("hidden-xs");
-		}
-	});
 });
-
 </script>

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

@@ -46,7 +46,7 @@ function b_loadTopCallBack(result){
 }
 function swordfishLayoutInit(){
 	if(document.body.scrollHeight <= document.body.clientHeight){
-		$(".swordfish-left").height(document.body.clientHeight-$(".swordfish-head").height() - $("#qfw-bottom").height());
+		$(".b-left").height(document.body.clientHeight-$(".swordfish-head").height() - $("#qfw-bottom").height());
 		webSiteInit();
 	}
 }

core/src/web/templates/index.html

@@ -7,7 +7,7 @@
 <meta name="Description" content="{{Msg "seo" "qfw.homepage.description"}}"/>
 <link href="/css/index-new.css" rel="stylesheet">
 </head>
-<body class="index-new-body">
+<body>
 {{include "/common/login.html"}}
 {{include "/common/indexhead.html"}}
 <div class="a-content a-index">	

core/src/web/templates/search/enterpriseList.html

@@ -5,155 +5,151 @@
 {{include "/common/inc.html"}}
 <script src="/js/jquery.cxselect.js"></script>
 <link href="/css/enterprise.css" rel="stylesheet">
+<link href="/css/entcommunity.css" rel="stylesheet">
 <meta name="Keywords" content="{{Msg "seo" "qfw.enterprise.key"}}"/>
 <meta name="Description" content="{{Msg "seo" "qfw.enterprise.description"}}"/>
 </head>
-<body>
-{{include "/common/head.html"}}
-<div class="a-content">
-	<!--中间内容开始-->
-	<div class="row qfw-row">
-		<!--左边显示区开始-->
-		<div class="col-lg-9">
-		<div class="borderB text-primary fontb frontS hidden-sm hidden-xs">所有分类</div>
-			<!--查询条件-->
-			<div class="border container-fluid hidden-sm hidden-xs qfw-p-margintoplist" >
-				<div class="rowFl rowFltt">
-					<div class="tt lineb qfw-p-margintop" >&nbsp;所&nbsp;在&nbsp;地：</div>
-					<div id="city_china" class="lineb ttcon qfw-p-margintoplist" >
-						<select class="sel province cxselect yselect" disabled="disabled" id="c_province" name="province"></select>
-						<select class="sel city cxselect yselect" disabled="disabled" id="c_city" name="city"></select>
-						<select class="sel area cxselect yselect" disabled="disabled" id="c_area" name="area"></select>
-					</div>
-					<!--<div class="rowFlTip"><span class="text-primary lineb marginLeft qfw-p-margintoplist"><span class="glyphicon biaojidizhi icon_default text-primary" style="width:20px;"></span><small style="color:#999999;">目前系统有河南、广西、黑龙江、青海、西藏、安徽、山西和湖北的官方企业数据，更多数据持续加入中...</small></span></div>-->
-				</div>
-				<div class="rowFl rowFltt" >
-					<div class="tt lineb">行业类别：</div>
-					<div class="lineb ttcon less" id="c_hfl"></div>
-					<div class="text-muted qfw-text-more" onClick="less(this)"><small>更多></small></div>
-				</div>
-				<div class="rowFl ">
-					<div class="tt lineb">注册资本：</div>
-					<div class="lineb ttcon less" id="c_zb"></div>
+<body class="entlist-page">
+{{include "/common/enthead.html"}}
+<div class="b-content container-fluid">
+	<!--左边显示区开始-->
+	<div class="b-left">
+		<!--查询条件-->
+		<div class="border container-fluid hidden-sm hidden-xs" >
+			<div class="rowFl rowFltt">
+				<div class="tt lineb qfw-p-margintop" >&nbsp;所&nbsp;在&nbsp;地：</div>
+				<div id="city_china" class="lineb ttcon" >
+					<select class="sel province cxselect yselect" disabled="disabled" id="c_province" name="province"></select>
+					<select class="sel city cxselect yselect" disabled="disabled" id="c_city" name="city"></select>
+					<select class="sel area cxselect yselect" disabled="disabled" id="c_area" name="area"></select>
 				</div>
+				<!--<div class="rowFlTip"><span class="text-primary lineb marginLeft qfw-p-margintoplist"><span class="glyphicon biaojidizhi icon_default text-primary" style="width:20px;"></span><small style="color:#999999;">目前系统有河南、广西、黑龙江、青海、西藏、安徽、山西和湖北的官方企业数据，更多数据持续加入中...</small></span></div>-->
 			</div>
-			<!--查询条件结束-->
-			<!--注册资本、认证-->
-			<ul id="navs" class="nav nav-tabs  hidden-sm hidden-md hidden-xs qfw-p-margintoplist ">
-				<li class="active" id="c_all" name="all" value="0"><a href="#home" data-toggle="tab">全部</a></li>
-               	<span  class=" hidden-sm hidden-md hidden-xs renzheng" ><input type="checkbox" name="c_author" id="c_author" value="Y" {{if .T.querymap.c_author}}checked{{end}}/>认证</span>
-	        </ul>
-			<!--注册资本、认证结束-->
-			
-			<!--列表详细信息开始-->
-			<div>
-				{{if gt (len .T.data) 0}}
-					{{range $k,$v:=.T.data}}
-						<div class="borderB">
-							<div class="qfw-entcontent-padding">
-								<div class="lineb " >
-									<a target="_blank" href="/enterprise/{{index $v "_id"}}.html">
-										{{$lens:=len (index $v "EntName")}}									 
-										{{if eq $lens 0}}
-											{{index $v "LeRep"}}
-										{{else}}
-											{{index $v "EntName"}}
-										{{end}}
-									</a>
-									
-									{{ if index $v "s_action"}}
-										{{ if eq (index $v "s_action") "01"}}
-											<span class="glyphicon qyrz   margin-l-10 jhtb"></span><span class="lineb " ><small>　已认证企业　</small></span>
-											{{ if $v.i_comauthenttype }}
-													{{ if eq $v.i_comauthenttype 2}}
-														<span class="glyphicon mprz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-right:5px;">名片认证</small></span>					
-													{{else if eq $v.i_comauthenttype 1}}
-														<span class="glyphicon yyzzrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-left:3px;margin-right:5px;">营业执照认证</small></span>
-													{{else if eq $v.i_comauthenttype 3}}
-														<span class="glyphicon yjrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-right:5px;">年报邮箱认证</small></span>
-													{{end}}
-											{{else}}
-													<span class="glyphicon yyzzrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-left:3px;margin-right:5px;">营业执照认证</small></span>
-											{{end}}
-										{{else if eq (index $v "s_action") "02"}}
-											<span class="glyphicon grrz   margin-l-10 jhtb"></span><span class="lineb " ><small>　已认证个人</small></span>
-										{{else if eq (index $v "s_action") "03"}}
-											<span class="glyphicon jgrz   margin-l-10 jhtb"></span><span class="lineb " ><small>　已认证机构</small></span>
-										{{end}}
+			<div class="rowFl rowFltt" >
+				<div class="tt lineb">行业类别：</div>
+				<div class="lineb ttcon less" id="c_hfl"></div>
+				<div class="qfw-text-more" onClick="less(this)"><small>更多></small></div>
+			</div>
+			<div class="rowFl ">
+				<div class="tt lineb">注册资本：</div>
+				<div class="lineb ttcon less" id="c_zb"></div>
+			</div>
+		</div>
+		<!--查询条件结束-->
+		<!--注册资本、认证-->
+		<ul id="navs" class="nav nav-tabs  hidden-sm hidden-md hidden-xs">
+			<li {{if not .T.querymap.c_author}}class="active"{{end}} id="c_author" name="c_author" value=""><a href="#home" data-toggle="tab">全部</a></li>
+			<li {{if .T.querymap.c_author}}class="active"{{end}} name="c_author" id="c_author" value="Y"><a href="#home" data-toggle="tab">认证</a></li>
+        </ul>
+		<!--注册资本、认证结束-->
+		
+		<!--列表详细信息开始-->
+		<div>
+			{{if gt (len .T.data) 0}}
+				{{range $k,$v:=.T.data}}
+					<div class="borderB">
+						<div class="qfw-entcontent-padding">
+							<div class="lineb " >
+								<a target="_blank" href="/enterprise/{{index $v "_id"}}.html">
+									{{$lens:=len (index $v "EntName")}}									 
+									{{if eq $lens 0}}
+										{{index $v "LeRep"}}
+									{{else}}
+										{{index $v "EntName"}}
 									{{end}}
-								</div>
+								</a>
 								
-								<div>
-									<span>注册号：<small  class="lineb " >{{index $v "RegNo"}}</small></span>
-									{{if index $v "EntType"}}
-										{{if eq $v.EntType "9600"}}
-											<span>经营者：<small  class="lineb " >{{index $v "LeRep"}}</small></span>
-										{{else if eq $v.EntType "5810"}}
-											<span>负责人：<small  class="lineb " >{{index $v "LeRep"}}</small></span>
+								{{ if index $v "s_action"}}
+									{{ if eq (index $v "s_action") "01"}}
+										<span class="glyphicon qyrz   margin-l-10 jhtb"></span><span class="lineb " ><small>　已认证企业　</small></span>
+										{{ if $v.i_comauthenttype }}
+												{{ if eq $v.i_comauthenttype 2}}
+													<span class="glyphicon mprz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-right:5px;">名片认证</small></span>					
+												{{else if eq $v.i_comauthenttype 1}}
+													<span class="glyphicon yyzzrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-left:3px;margin-right:5px;">营业执照认证</small></span>
+												{{else if eq $v.i_comauthenttype 3}}
+													<span class="glyphicon yjrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-right:5px;">年报邮箱认证</small></span>
+												{{end}}
 										{{else}}
-											<span>法定代表人：<small  class="lineb " >{{index $v "LeRep"}}</small></span>
+												<span class="glyphicon yyzzrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-left:3px;margin-right:5px;">营业执照认证</small></span>
 										{{end}}
+									{{else if eq (index $v "s_action") "02"}}
+										<span class="glyphicon grrz   margin-l-10 jhtb"></span><span class="lineb " ><small>　已认证个人</small></span>
+									{{else if eq (index $v "s_action") "03"}}
+										<span class="glyphicon jgrz   margin-l-10 jhtb"></span><span class="lineb " ><small>　已认证机构</small></span>
 									{{end}}
-									<span>经营状态：<small  class="lineb " >{{index $v "OpStateName"}}</small></span>
-									<span>成立日期：<small  class="lineb " >{{index $v "EstDate"}}</small></span>
-									<span>所在地：<small  class="lineb " >{{index $v "OpLocDistrictName"}}</small></span>
-								</div>
-								{{if $v.s_servicenames}}<div>产品服务：<small  class="lineb ">{{Html (Replace $v.s_servicenames "," "" 1)}}</small></div>{{end}}
-								{{if $v.stock }}<div>股东：<small  class="lineb ">{{index $v "stock"}}</small></div>{{end}}
-								{{if $v.OpScope }}<div>经营范围：<small  class="lineb ">{{index $v "OpScope"}}</small></div>{{end}}
+								{{end}}
 							</div>
+							
+							<div>
+								<span>注册号：<small  class="lineb " >{{index $v "RegNo"}}</small></span>
+								{{if index $v "EntType"}}
+									{{if eq $v.EntType "9600"}}
+										<span>经营者：<small  class="lineb " >{{index $v "LeRep"}}</small></span>
+									{{else if eq $v.EntType "5810"}}
+										<span>负责人：<small  class="lineb " >{{index $v "LeRep"}}</small></span>
+									{{else}}
+										<span>法定代表人：<small  class="lineb " >{{index $v "LeRep"}}</small></span>
+									{{end}}
+								{{end}}
+								<span>经营状态：<small  class="lineb " >{{index $v "OpStateName"}}</small></span>
+								<span>成立日期：<small  class="lineb " >{{index $v "EstDate"}}</small></span>
+								<span>所在地：<small  class="lineb " >{{index $v "OpLocDistrictName"}}</small></span>
+							</div>
+							{{if $v.s_servicenames}}<div>产品服务：<small  class="lineb ">{{Html (Replace $v.s_servicenames "," "" 1)}}</small></div>{{end}}
+							{{if $v.stock }}<div>股东：<small  class="lineb ">{{index $v "stock"}}</small></div>{{end}}
+							{{if $v.OpScope }}<div>经营范围：<small  class="lineb ">{{index $v "OpScope"}}</small></div>{{end}}
 						</div>
+					</div>
+				{{end}}
+				<!--页码信息-->
+				<div class="text-center  hidden-sm hidden-md hidden-xs">
+					<ul class="pagination pagination-md ">
+					{{range $k,$v:=.T.pagination}}
+						<li {{if index $v "iscurrent"}}class="disabled active"{{end}}>
+						<a {{if index $v "iscurrent"}}  style="background-color:#f5f5f5" href="#"{{else}}href="{{index $v "url"}}"{{end}}>{{index $v "page"}}</a>
+						
+						</li>
 					{{end}}
-					<!--页码信息-->
-					<div class="text-center  hidden-sm hidden-md hidden-xs">
-						<ul class="pagination pagination-md ">
-						{{range $k,$v:=.T.pagination}}
+					</ul>
+				</div>
+				<!--页码信息结束-->
+				
+				<!--页码信息-->
+				<div class="text-center hidden-lg">
+					<ul class="pagination pagination-md ">
+					{{range $k,$v:=.T.pagination}}
+						
+						{{if eq $k 6}}
+						{{else if eq $k 7}}
+						{{else if eq $k 8}}
+						{{else}}
 							<li {{if index $v "iscurrent"}}class="disabled active"{{end}}>
-							<a {{if index $v "iscurrent"}}  style="background-color:#f5f5f5" href="#"{{else}}href="{{index $v "url"}}"{{end}}>{{index $v "page"}}</a>
-							
+							<a {{if index $v "iscurrent"}}  style="background-color:#f5f5f5" href="#"{{else}}href="{{index $v "url"}}"{{end}}>
+							{{index $v "page"}}
+							</a>
 							</li>
 						{{end}}
-						</ul>
-					</div>
-					<!--页码信息结束-->
-					
-					<!--页码信息-->
-					<div class="text-center hidden-lg">
-						<ul class="pagination pagination-md ">
-						{{range $k,$v:=.T.pagination}}
-							
-							{{if eq $k 6}}
-							{{else if eq $k 7}}
-							{{else if eq $k 8}}
-							{{else}}
-								<li {{if index $v "iscurrent"}}class="disabled active"{{end}}>
-								<a {{if index $v "iscurrent"}}  style="background-color:#f5f5f5" href="#"{{else}}href="{{index $v "url"}}"{{end}}>
-								{{index $v "page"}}
-								</a>
-								</li>
-							{{end}}
-							
-						{{end}}
-						</ul>
-					</div>
-					<!--页码信息结束-->
-				
-				{{else}}
-					<div class="alert alert-error "><div class="text-center" style="margin:20px auto;"><img src="/images/u20.png"><h4><span class="glyphicon biaojidizhi icon_default text-primary"></span>&nbsp;<strong class="text-muted">没有找到相关内容，换个关键词试试</strong></h4></div></div>
-				{{end}}
-			</div>
-			<!--列表详细信息结束-->	
-		</div>
-		<!--左边显示区结束-->
-		
-		<!--右边显示区开始-->
-		<div class="col-lg-3 hidden-sm hidden-md hidden-xs collg3_width">
-			<div class="borderB text-muted fontb frontS">推荐企业</div>
-			<div id="tjqy "><img style="width:100%;" class="qfw-p-margintop" src="/images/right_ad.png"></div>
+						
+					{{end}}
+					</ul>
+				</div>
+				<!--页码信息结束-->
+			
+			{{else}}
+				<div class="alert alert-error "><div class="text-center" style="margin:20px auto;"><img src="/images/u20.png"><h4><span class="glyphicon biaojidizhi icon_default text-primary"></span>&nbsp;<strong class="text-muted">没有找到相关内容，换个关键词试试</strong></h4></div></div>
+			{{end}}
 		</div>
-		<!--右边显示区结束-->
+		<!--列表详细信息结束-->	
+	</div>
+	<!--左边显示区结束-->
+	
+	<!--右边显示区开始-->
+	<div class="b-right hidden-sm hidden-md hidden-xs b-right-content">
+		<div class="borderB text-muted fontb frontS">推荐企业</div>
+		<div id="tjqy "><img style="width:100%;" class="qfw-p-margintop" src="/images/right_ad.png"></div>
 	</div>
-	<!--中间内容结束-->
+	<!--右边显示区结束-->
 </div>
 {{include "/common/bottom.html"}}
 
@@ -165,7 +161,6 @@ var btempwords={{.T.words}}
 var chf1= {{index .T.querymap "c_hfl"}};
 var czb= '{{index .T.querymap "c_zb"}}';
 var $chiancity= true,$listent=true;
-setNavbarActive(2);
 </script>
 <script src="/js/enterprise.js"></script>
 

core/src/web/templates/search/enterpriseList_copy.html

@@ -0,0 +1,173 @@
+<html>
+<head>
+<title>{{Msg "seo" "qfw.enterprise.title"}}</title>
+<meta name="msvalidate.01" content="D5F3ADC7EB4E65FFB8BF943AD56DD1F7" />
+{{include "/common/inc.html"}}
+<script src="/js/jquery.cxselect.js"></script>
+<link href="/css/enterprise.css" rel="stylesheet">
+<meta name="Keywords" content="{{Msg "seo" "qfw.enterprise.key"}}"/>
+<meta name="Description" content="{{Msg "seo" "qfw.enterprise.description"}}"/>
+</head>
+<body>
+{{include "/common/head.html"}}
+<div class="a-content">
+	<!--中间内容开始-->
+	<div class="row qfw-row">
+		<!--左边显示区开始-->
+		<div class="col-lg-9">
+		<div class="borderB text-primary fontb frontS hidden-sm hidden-xs">所有分类</div>
+			<!--查询条件-->
+			<div class="border container-fluid hidden-sm hidden-xs qfw-p-margintoplist" >
+				<div class="rowFl rowFltt">
+					<div class="tt lineb qfw-p-margintop" >&nbsp;所&nbsp;在&nbsp;地：</div>
+					<div id="city_china" class="lineb ttcon qfw-p-margintoplist" >
+						<select class="sel province cxselect yselect" disabled="disabled" id="c_province" name="province"></select>
+						<select class="sel city cxselect yselect" disabled="disabled" id="c_city" name="city"></select>
+						<select class="sel area cxselect yselect" disabled="disabled" id="c_area" name="area"></select>
+					</div>
+					<!--<div class="rowFlTip"><span class="text-primary lineb marginLeft qfw-p-margintoplist"><span class="glyphicon biaojidizhi icon_default text-primary" style="width:20px;"></span><small style="color:#999999;">目前系统有河南、广西、黑龙江、青海、西藏、安徽、山西和湖北的官方企业数据，更多数据持续加入中...</small></span></div>-->
+				</div>
+				<div class="rowFl rowFltt" >
+					<div class="tt lineb">行业类别：</div>
+					<div class="lineb ttcon less" id="c_hfl"></div>
+					<div class="text-muted qfw-text-more" onClick="less(this)"><small>更多></small></div>
+				</div>
+				<div class="rowFl ">
+					<div class="tt lineb">注册资本：</div>
+					<div class="lineb ttcon less" id="c_zb"></div>
+				</div>
+			</div>
+			<!--查询条件结束-->
+			<!--注册资本、认证-->
+			<ul id="navs" class="nav nav-tabs  hidden-sm hidden-md hidden-xs qfw-p-margintoplist ">
+				<li class="active" id="c_all" name="all" value="0"><a href="#home" data-toggle="tab">全部</a></li>
+               	<span  class=" hidden-sm hidden-md hidden-xs renzheng" ><input type="checkbox" name="c_author" id="c_author" value="Y" {{if .T.querymap.c_author}}checked{{end}}/>认证</span>
+	        </ul>
+			<!--注册资本、认证结束-->
+			
+			<!--列表详细信息开始-->
+			<div>
+				{{if gt (len .T.data) 0}}
+					{{range $k,$v:=.T.data}}
+						<div class="borderB">
+							<div class="qfw-entcontent-padding">
+								<div class="lineb " >
+									<a target="_blank" href="/enterprise/{{index $v "_id"}}.html">
+										{{$lens:=len (index $v "EntName")}}									 
+										{{if eq $lens 0}}
+											{{index $v "LeRep"}}
+										{{else}}
+											{{index $v "EntName"}}
+										{{end}}
+									</a>
+									
+									{{ if index $v "s_action"}}
+										{{ if eq (index $v "s_action") "01"}}
+											<span class="glyphicon qyrz   margin-l-10 jhtb"></span><span class="lineb " ><small>　已认证企业　</small></span>
+											{{ if $v.i_comauthenttype }}
+													{{ if eq $v.i_comauthenttype 2}}
+														<span class="glyphicon mprz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-right:5px;">名片认证</small></span>					
+													{{else if eq $v.i_comauthenttype 1}}
+														<span class="glyphicon yyzzrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-left:3px;margin-right:5px;">营业执照认证</small></span>
+													{{else if eq $v.i_comauthenttype 3}}
+														<span class="glyphicon yjrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-right:5px;">年报邮箱认证</small></span>
+													{{end}}
+											{{else}}
+													<span class="glyphicon yyzzrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-left:3px;margin-right:5px;">营业执照认证</small></span>
+											{{end}}
+										{{else if eq (index $v "s_action") "02"}}
+											<span class="glyphicon grrz   margin-l-10 jhtb"></span><span class="lineb " ><small>　已认证个人</small></span>
+										{{else if eq (index $v "s_action") "03"}}
+											<span class="glyphicon jgrz   margin-l-10 jhtb"></span><span class="lineb " ><small>　已认证机构</small></span>
+										{{end}}
+									{{end}}
+								</div>
+								
+								<div>
+									<span>注册号：<small  class="lineb " >{{index $v "RegNo"}}</small></span>
+									{{if index $v "EntType"}}
+										{{if eq $v.EntType "9600"}}
+											<span>经营者：<small  class="lineb " >{{index $v "LeRep"}}</small></span>
+										{{else if eq $v.EntType "5810"}}
+											<span>负责人：<small  class="lineb " >{{index $v "LeRep"}}</small></span>
+										{{else}}
+											<span>法定代表人：<small  class="lineb " >{{index $v "LeRep"}}</small></span>
+										{{end}}
+									{{end}}
+									<span>经营状态：<small  class="lineb " >{{index $v "OpStateName"}}</small></span>
+									<span>成立日期：<small  class="lineb " >{{index $v "EstDate"}}</small></span>
+									<span>所在地：<small  class="lineb " >{{index $v "OpLocDistrictName"}}</small></span>
+								</div>
+								{{if $v.s_servicenames}}<div>产品服务：<small  class="lineb ">{{Html (Replace $v.s_servicenames "," "" 1)}}</small></div>{{end}}
+								{{if $v.stock }}<div>股东：<small  class="lineb ">{{index $v "stock"}}</small></div>{{end}}
+								{{if $v.OpScope }}<div>经营范围：<small  class="lineb ">{{index $v "OpScope"}}</small></div>{{end}}
+							</div>
+						</div>
+					{{end}}
+					<!--页码信息-->
+					<div class="text-center  hidden-sm hidden-md hidden-xs">
+						<ul class="pagination pagination-md ">
+						{{range $k,$v:=.T.pagination}}
+							<li {{if index $v "iscurrent"}}class="disabled active"{{end}}>
+							<a {{if index $v "iscurrent"}}  style="background-color:#f5f5f5" href="#"{{else}}href="{{index $v "url"}}"{{end}}>{{index $v "page"}}</a>
+							
+							</li>
+						{{end}}
+						</ul>
+					</div>
+					<!--页码信息结束-->
+					
+					<!--页码信息-->
+					<div class="text-center hidden-lg">
+						<ul class="pagination pagination-md ">
+						{{range $k,$v:=.T.pagination}}
+							
+							{{if eq $k 6}}
+							{{else if eq $k 7}}
+							{{else if eq $k 8}}
+							{{else}}
+								<li {{if index $v "iscurrent"}}class="disabled active"{{end}}>
+								<a {{if index $v "iscurrent"}}  style="background-color:#f5f5f5" href="#"{{else}}href="{{index $v "url"}}"{{end}}>
+								{{index $v "page"}}
+								</a>
+								</li>
+							{{end}}
+							
+						{{end}}
+						</ul>
+					</div>
+					<!--页码信息结束-->
+				
+				{{else}}
+					<div class="alert alert-error "><div class="text-center" style="margin:20px auto;"><img src="/images/u20.png"><h4><span class="glyphicon biaojidizhi icon_default text-primary"></span>&nbsp;<strong class="text-muted">没有找到相关内容，换个关键词试试</strong></h4></div></div>
+				{{end}}
+			</div>
+			<!--列表详细信息结束-->	
+		</div>
+		<!--左边显示区结束-->
+		
+		<!--右边显示区开始-->
+		<div class="col-lg-3 hidden-sm hidden-md hidden-xs collg3_width">
+			<div class="borderB text-muted fontb frontS">推荐企业</div>
+			<div id="tjqy "><img style="width:100%;" class="qfw-p-margintop" src="/images/right_ad.png"></div>
+		</div>
+		<!--右边显示区结束-->
+	</div>
+	<!--中间内容结束-->
+</div>
+{{include "/common/bottom.html"}}
+
+
+<script>
+var entsel = {{index .T.querymap "city"}}
+
+var btempwords={{.T.words}}
+var chf1= {{index .T.querymap "c_hfl"}};
+var czb= '{{index .T.querymap "c_zb"}}';
+var $chiancity= true,$listent=true;
+setNavbarActive(2);
+</script>
+<script src="/js/enterprise.js"></script>
+
+</body>
+</html>

core/src/web/templates/swordfish/index.html

@@ -9,8 +9,8 @@
 <!-- 头部 -->
 {{include "/common/swordfishhead.html"}}
 <!-- 中间 -->
-<div class="swordfish-content container-fluid swordfish-index">
-	<div class="swordfish-left">
+<div class="b-content container-fluid swordfish-index">
+	<div class="b-left">
 		<div id="swordfish-guide" class="swordfish-guide carousel slide" data-ride="carousel">
 		    <div class="swordfish-guide-left">
 				<i class="bootstrap-glyphicon glyphicon glyphicon-menu-left" href="#swordfish-guide" data-slide="prev"></i>
@@ -53,7 +53,7 @@
 			</span>
 		</div>
 	</div>
-	<div class="swordfish-right">
+	<div class="b-right">
 		<div class="swordfish-right-title">
 			剑鱼最新消息
 		</div>
@@ -80,8 +80,7 @@ $(function(){
 		}
 		$("#list").html(html);
 	}else{
-		$(".swordfish-index").find(".swordfish-left").removeClass("col-xs-9");
-		$(".swordfish-index").find(".swordfish-right").remove();
+		$(".swordfish-index").find(".b-right").remove();
 	}
 });
 </script>

core/src/web/templates/swordfish/infolist.html

@@ -319,8 +319,8 @@ function loadMore(){
 <!-- 头部 -->
 {{include "/common/swordfishhead.html"}}
 <!-- 中间 -->
-<div class="swordfish-content container-fluid">
-	<div class="swordfish-left">
+<div class="b-content container-fluid">
+	<div class="b-left">
 		<div class="swordfish-page-title">
 			<i class="img-circle glyphicon jianyu"></i>推送记录
 		</div>
@@ -338,7 +338,7 @@ function loadMore(){
 			</div>
 		</div>
 	</div>
-	<div class="swordfish-right swordfish-qrcode text-center">
+	<div class="b-right swordfish-qrcode text-center">
 		<img src="/images/swordfish/qrcode.png">
 		<br>关注微信公众号：企明星
 	</div>

core/src/web/templates/swordfish/rssset.html

@@ -7,8 +7,8 @@
 <!-- 头部 -->
 {{include "/common/swordfishhead.html"}}
 <!-- 中间 -->
-<div class="swordfish-content container-fluid swordfish-rssset">
-	<div class="swordfish-left">
+<div class="b-content container-fluid swordfish-rssset">
+	<div class="b-left">
 		<div class="swordfish-page-title">
 			<i class="img-circle glyphicon jianyu"></i>订阅设置
 		</div>
@@ -77,7 +77,7 @@
 			<div class="swordfish-panel-c">开发中，敬请期待！</div>
 		</div>
 	</div>
-	<div class="swordfish-right swordfish-qrcode text-center">
+	<div class="b-right swordfish-qrcode text-center">
 		<img src="/images/swordfish/qrcode.png">
 		<br>关注微信公众号：企明星
 	</div>