Эхлэл Бүгдийг харах Тусламж
Нэвтрэх
qmx
/
jy
14
0
Салаа 0
Файлууд Асуудлууд 2 Хуулах хүсэлтүүд 0 Мэдлэгийн сан
Эх сурвалжийг харах

Merge branch 'dev2.3.1' of ssh://192.168.3.207:10022/qmx/jy into dev2.3.1

wangchuanjin 7 жил өмнө
parent
e81a78863b ffb12586ec
commit
94ff518a1c
5 өөрчлөгдсөн 161 нэмэгдсэн , 191 устгасан
Өөрчлөллтийг нэгтгэж харах Өөрчлөлтийн статистик харах
  1. 2 2
      src/web/staticres/js/public-nav.js
  2. 106 98
      src/web/templates/_error.html
  3. 47 73
      src/web/templates/active/topics.html
  4. 4 16
      src/web/templates/common/pcbottom.html
  5. 2 2
      src/web/templates/pc/subscribe.html

+ 2 - 2
src/web/staticres/js/public-nav.js
Файл харах 

@@ -9,7 +9,7 @@ $(function () {
 
 		    $thisWidth = $(this).width(),
 
 		    $thisWidth = $(this).width(),
 
 		    //当前宽度
 
 		    //当前宽度
 
 		$thisIndex = $(this).index();
 
 		$thisIndex = $(this).index();
 
-		if($href.indexOf("supsearch")>-1||$href.indexOf("bidsearchforent")>-1||$href.indexOf("list")>-1||$href.indexOf("article/content")>-1||$href.indexOf("jyblog")>-1){
 
+		if($href.indexOf("supsearch")>-1||$href.indexOf("bidsearchforent")>-1||$href.indexOf("promotional/topics")>-1||$href.indexOf("list")>-1||$href.indexOf("article/content")>-1||$href.indexOf("jyblog")>-1){
 
 			$navLi.find("a").css({"color":"#252627"});
 
 			$navLi.find("a").css({"color":"#252627"});
 
 		}else{
 
 		}else{
 
 			$navLi.find("a").css({"color":"#fff"});
 
 			$navLi.find("a").css({"color":"#fff"});
 
@@ -39,7 +39,7 @@ function seclectNavLi(el, $index) {
 
 	var $slider = $(".public-nav .jynav .slider");
 
 	var $slider = $(".public-nav .jynav .slider");
 
 	/*获取当前这个元素的css*/
 
 	/*获取当前这个元素的css*/
 
 	var $thisCss = el.eq($index).width();
 
 	var $thisCss = el.eq($index).width();
 
-	if($href.indexOf("supsearch")>-1||$href.indexOf("bidsearchforent")>-1||$href.indexOf("list")>-1||$href.indexOf("article/content")>-1||$href.indexOf("jyblog")>-1){
 
+	if($href.indexOf("supsearch")>-1||$href.indexOf("bidsearchforent")>-1||$href.indexOf("promotional/topics")>-1||$href.indexOf("list")>-1||$href.indexOf("article/content")>-1||$href.indexOf("jyblog")>-1){
 
 		el.find("a").css({"color":"#252627"});
 
 		el.find("a").css({"color":"#252627"});
 
 	}else{
 
 	}else{
 
 		el.find("a").css({"color":"#fff"});
 
 		el.find("a").css({"color":"#fff"});

+ 106 - 98
src/web/templates/_error.html
Файл харах 

@@ -23,12 +23,26 @@
 
 <script src="/js/common.js"></script>
 
 <script src="/js/common.js"></script>
 
 <script src="/js/login.js"></script>
 
 <script src="/js/login.js"></script>
 
 <link href="/css/pc.css" rel="stylesheet">
 
 <link href="/css/pc.css" rel="stylesheet">
 
+<link rel="stylesheet" type="text/css" href="/pccss/public-nav-1200.css" />
 
 <style>
 
 <style>
 
+.public-nav{
 
+	border-bottom: 1px solid #e0e0e0 !important;
 
+}
 
+.fr{
 
+	float:right;
 
+}
 
+.logo img{
 
+	width:74px;
 
+}
 
+.indexpage-content{
 
+	padding-top:76px;
 
+}
 
 .error-body{
 
 .error-body{
 
 	width:100%;
 
 	width:100%;
 
 	margin:0;
 
 	margin:0;
 
 	padding:0;
 
 	padding:0;
 
 	text-align:center;
 
 	text-align:center;
 
+	padding-top: 76px;
 
 }
 
 }
 
 .back{
 
 .back{
 
 	text-decoration:none;
 
 	text-decoration:none;
 
@@ -139,6 +153,14 @@
 
 <script>
 
 <script>
 
 var s="%d,%s,%d,%s,%s,%s";
 
 var s="%d,%s,%d,%s,%s,%s";
 
 $(function(){
 
 $(function(){
 
+	$(".logo img").attr("src","/images/swordfish/sf_01.png");
 
+	selcetIndexNav(8)
 
+	$("#bidLogin").on("show.bs.modal", function () {
 
+		$(".public-nav").css({"padding-right":"17px"});
 
+	})
 
+	$("#bidLogin").on("hidden.bs.modal", function () {
 
+		$(".public-nav").css({"padding-right":""});
 
+	})
 
 	var wid = window.screen.width;
 
 	var wid = window.screen.width;
 
 	if (wid < 720){
 
 	if (wid < 720){
 
 		window.location.href="/mob/err";
 
 		window.location.href="/mob/err";
 
@@ -146,77 +168,93 @@ $(function(){
 
 	}else{
 
 	}else{
 
 		$(".pc").removeClass("hidden");
 
 		$(".pc").removeClass("hidden");
 
 	}
 
 	}
 
-})
 
+
 
+	var $navLi = $(".public-nav .jynav li").not(".slider");
 
+	$href = window.location.href;
 
+	$navLi.hover(function () {
 
+		var $slider = $(".public-nav .jynav .slider"),
 
+		    $thisWidth = $(this).width(),
 
+		    //当前宽度
 
+		$thisIndex = $(this).index();
 
+		$navLi.find("a").css({"color":"#252627"});
 
+		$(this).find("a").css({
 
+			"color": "#2cb7ca"
 
+		});
 
+		$slider.css({
 
+			"width": $thisWidth + "px",
 
+			left: $thisIndex * $thisWidth + $thisIndex * 20 + "px", //20是，margin偏移
 
+			"background-color":"#2cb7ca"
 
+		});
 
+	});
 
+	
+});
 
+//
 
+function selcetIndexNav(number = 0) {
 
+	var $navLi = $(".public-nav .jynav li").not(".slider");
 
+	var $nav = $(".public-nav .jynav");
 
+	seclectNavLi($navLi, number)
 
+	$nav.mouseleave(function() {
 
+		seclectNavLi($navLi, number)
 
+	})
 
+}
 
+
 
+function seclectNavLi(el, $index) {
 
+	var $slider = $(".public-nav .jynav .slider");
 
+	/*获取当前这个元素的css*/
 
+	var $thisCss = el.eq($index).width();
 
+	el.find("a").css({"color":"#252627"});
 
+	el.eq($index).find("a").css("color", "#2cb7ca");
 
+	if(!$index) {
 
+		$index = 0;
 
+	} else {
 
+		if($index < 0) {
 
+			throw Error("dot pass -Number")
 
+		}
 
+	}
 
+	$slider.css({
 
+		"width": $thisCss + "px",
 
+		left: $index * $thisCss + $index * 20 + "px",
 
+		"background-color":""
 
+	})
 
+}
 
+
 
 </script>
 
 </script>
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
 <div class="pc hidden">
 
 <div class="pc hidden">
 
-	<div class="j-head">
 
-		<div class="j-nav">
 
-			<ul>
 
-				<li class="j-nav-logo" onclick="window.location.href='/'" style="width:120px;"><a><img src="/images/swordfish/sf_01.png"></a></li>
 
-				<li class="navigation">
 
-				<form method="post" action="/jylab/supsearch/index.html" id="zbSeatchIndex">
 
-	            <span style="position:relative" class="j-inputgroup">
 
-					<input style="width:350px; height:40px; border-radius:22px;" type="text" name="keywords" placeholder="请输入您要查询的招标信息" />
 
-	<!--				<img src="/images/pc_20.png" class="j-clearicon" id="t-clear">-->
 
-					<img class="j-searchicon" style="position:absolute; right:18px; top:0px" src="/images/pc_11.png" onclick="zbSeatch('zbSeatchIndex')">
 
-	<!--				<div style="background-image:/images/pc_11.png; position:absolute; width:50px; height:50px; padding-top:4px; padding-left:100px; z-index:99;"></div>-->
 
-				</span>
 
-				<input type="hidden" name="searchvalue">
 
-			</form>
 
-				</li>
 
-				
-				<li class="j-nav-link" style="cursor:default; width:1px; height:1px; margin-right:99px">
 
-					<div class='useronline' id="login"></div>
 
-				</li>
 
-	<!--			<li class="jy_scancode"  ><img src="/wxswordfish/images/QR.gif"/><a>微信扫一扫</a></li>-->
 
-	<!--			<li class="j-nav-link" id="jy_blog"><a href="/jyblog/index.html">剑鱼博客</a></li>-->
 
-				<li class="j-nav-link" data-toggle="modal" data-target="#bidcommunity"><a>招标社区</a></li>
 
-				<li class="j-nav-link" onclick="window.location.href='/swordfish/searchinfolist.html'">
 
-				<a class="newhead">招标搜索</a></li>
 
-				<li class="j-nav-link" onclick="window.location.href='/list/stype/NJ.html'"><a>拟建项目</a></li>
 
-				<li class="j-nav-link" onclick="window.location.href='/front/subscribe.html'"><a>招标订阅</a></li>
 
-				<li class="j-nav-link" onclick="window.location.href='/'"><a>首页</a></li>
 
-			</ul>
 
-		</div>
 
-		<div class="animatdiv">
 
-			<div  id="animationSandbox">
 
-				<div class="jyhead_saoma" style="display: none;">
 
-					<div class="jyhead_jytou"><img src="/wxswordfish/images/saoma.png"/></div>
 
-					<div class="jyhead_qr">
 
-					<img src="/front/share/RV8="/>
 
-					<div class="jyhead_qr_ts">
 
-						<font>一键订阅关键词</font><br>
 
-						<span>招标信息自动推送</span>
 
-					</div>
 
-					
-					</div>
 
-				</div>
 
+	<section class="public-nav">
 
+		<div class="iner clearfix">
 
+			<a class="logo" href="/"><img src="/images/pc/logo.png" /></a>
 
+			<div class="fr">
 
+				<ul class="jynav">
 
+					<li>
 
+						<a href="/">首页</a>
 
+					</li>
 
+					<li>
 
+						<a href="/front/subscribe.html">招标订阅</a>
 
+					</li>
 
+					<li>
 
+						<a href="/list/stype/NJ.html">拟建项目</a>
 
+					</li>
 
+					<li>
 
+						<a href="/jylab/supsearch/index.html">招标搜索</a>
 
+					</li>
 
+					<li>
 
+						<a href="#">开放平台</a>
 
+					</li>
 
+					<li class="slider"></li>
 
+				</ul>
 
+				<div class='useronline' id="login" style="float:left;"></div>
 
 			</div>
 
 			</div>
 
-		</div>
 
-		<div class="animatdiv">
 
-			<div id="animationSandbox">
 
-				<div class="QRLogin" style="display: none;">
 
-					<div class="jyhead_qr">
 
-					<img src="/front/share/RV8="/>
 
-					<div class="jyhead_qr_ts">
 
-						<span>微信扫描登录</span><br>
 
-						<span>新用户自动注册</span>
 
-					</div>
 
-					
-					</div>
 
-				</div>
 
+			<div class="search" style="display:none;">
 
+				<form method="post" action="/jylab/supsearch/index.html" id="zbSeatchIndex" style="position:relative;">
 
+					<input class="ser" autocomplete="off"  type="text" name="keywords" placeholder="请输入您要查询的招标信息 " id="" value="" />
 
+					<input type="hidden" name="searchvalue">
 
+					<input class="btn" type="button" onclick="zbSeatch('zbSeatchIndex')" />
 
+				</form>
 
 			</div>
 
 			</div>
 
 		</div>
 
 		</div>
 
-		<!--<div class="animatdiv">
 
-			<div class="userstatus" style="display: none;">
 
-				<ul class="userstatuslist">
 
-					<li class="userstatuschoice"><button onclick="signout()"><img src="/images/userexit.png">退出</button></li>
 
-				</ul>
 
-			</div>
 
-		</div>-->
 
-	</div>
 
+	</section>
 
 	<!-- 模态框（Modal） -->
 
 	<!-- 模态框（Modal） -->
 
 	<div class="modal fade deving j-modal-dialog" id="deving" tabindex="-1" role="dialog" aria-labelledby="deving" aria-hidden="true">
 
 	<div class="modal fade deving j-modal-dialog" id="deving" tabindex="-1" role="dialog" aria-labelledby="deving" aria-hidden="true">
 
 		<div class="modal-dialog">
 
 		<div class="modal-dialog">
 
@@ -233,42 +271,12 @@ $(function(){
 
 	      </div><!-- /.modal-content -->
 
 	      </div><!-- /.modal-content -->
 
 		</div><!-- /.modal -->
 
 		</div><!-- /.modal -->
 
 	</div>
 
 	</div>
 
-	<!-- 模态框（Modal） -->
 
-	<!--<div class="modal fade bidcommunity j-modal-dialog" id="bidcommunity" tabindex="-1" role="dialog" aria-labelledby="bidcommunity" aria-hidden="true">
 
-		<div class="modal-dialog">
 
-	      <div class="modal-content">
 
-	         <div class="modal-header">
 
-	            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
 
-	            <h4 class="modal-title">剑鱼</h4>
 
-	         </div>
 
-	         <div class="modal-body text-center" style="height: 270px;">
 
-				<img src="/front/share/RV8=" alt="剑鱼招标订阅微信公众号"><br/>
 
-				微信扫码关注剑鱼，进入招标社区参与互动
 
-	         </div>
 
-	      </div>
 
-		</div>
 
-	</div>-->
 
-<!-- 模态框（Modal）登录 -->
 
-<!--<div class="modal fade bidLogin" id="bidLogin" tabindex="-1" role="dialog" aria-labelledby="bidLogin" aria-hidden="true">
 
-	<div class="modal-dialog">
 
-      <div class="modal-content">
 
-         <div class="modal-header">
 
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
 
-            <h4 class="modal-title">剑鱼</h4>
 
-         </div>
 
-         <div class="modal-body text-center" style="height: 270px;">
 
-			<img src="/front/share/{{.T.shareid}}" alt="剑鱼用户登录"><br/>
 
-			微信扫描登录，新用户自动注册
 
-         </div>
 
-      </div>
 
-	</div>
 
-</div> -->
 
 <div class="modal fade bidLogin" id="bidLogin"  tabindex="-1" role="dialog" aria-labelledby="bidLogin" aria-hidden="true" >
 
 <div class="modal fade bidLogin" id="bidLogin"  tabindex="-1" role="dialog" aria-labelledby="bidLogin" aria-hidden="true" >
 
   <div class="modal-dialog" style="width:400px;border:0px;" >
 
   <div class="modal-dialog" style="width:400px;border:0px;" >
 
 		<div class="j-wx-code">
 
 		<div class="j-wx-code">
 
 			<img class="code-close" src="/images/j-wx-code-close.png" alt="" onclick="loginClose();"/>
 
 			<img class="code-close" src="/images/j-wx-code-close.png" alt="" onclick="loginClose();"/>
 
 			<div class="code-title"></div>
 
 			<div class="code-title"></div>
 
-			<div class="code-wxm"><img id="layerImg-login" src="/front/share/{{.T.shareid}}"/></div>
 
+			<div class="code-wxm"><img id="layerImg-login" src="/front/share/10"/></div>
 
 			<div class="code-text">
 
 			<div class="code-text">
 
 				<span><img id="wxpng" src="/images/wx1.png"/>微信扫码登录</span>
 
 				<span><img id="wxpng" src="/images/wx1.png"/>微信扫码登录</span>
 
 				<br/>
 
 				<br/>
 
@@ -285,7 +293,7 @@ $(function(){
 
 		<div class="j-wx-code">
 
 		<div class="j-wx-code">
 
 			<img class="code-close" src="/images/j-wx-code-close.png" alt="" onclick="zbsqClose();"/>
 
 			<img class="code-close" src="/images/j-wx-code-close.png" alt="" onclick="zbsqClose();"/>
 
 			<div class="code-title"></div>
 
 			<div class="code-title"></div>
 
-			<div class="code-wxm"><img id="layerImg-zbsq" src="/front/share/{{.T.shareid}}"/></div>
 
+			<div class="code-wxm"><img id="layerImg-zbsq" src="/front/share/10"/></div>
 
 			<div class="code-text">
 
 			<div class="code-text">
 
 				<span><img id="wxpng" src="/images/wx1.png"/>微信扫码关注</span>
 
 				<span><img id="wxpng" src="/images/wx1.png"/>微信扫码关注</span>
 
 				<br/>
 
 				<br/>
 
@@ -517,7 +525,7 @@ function infoListCss(){
 
 				</div>
 
 				</div>
 
 			</div>
 
 			</div>
 
 			<div class="jy_renzheng">
 
 			<div class="jy_renzheng">
 
-				<div class="jy_otherlink"><a href="/" target="_bank">剑鱼</a>|<a href="/swordfish/searchinfolist.html">招标搜索</a>|<a  data-toggle="modal" data-target="#bidcommunity">招标社区</a>|<a href="/jyblog/index.html" target="_bank">剑鱼博客</a>|<a href="/front/aboutus.html">关于我们</a>|<a href="http://www.qmx.top" target="_bank">企明星</a>|<a href="http://www.qmx.top/front/entCommunity.html" target="_bank">企业社区</a></div>
 
+				<div class="jy_otherlink"><a href="/" target="_bank">剑鱼</a>|<a href="/front/subscribe.html">招标订阅</a>|<a href="/jylab/supsearch/index.html">招标搜索</a>|<a  data-toggle="modal" data-target="#bidcommunity">招标社区</a>|<a href="/jyblog/index.html" target="_bank">剑鱼博客</a>|<a href="/front/busicooperation.html" target="_bank">商务合作</a>|<a href="/front/advservices.html" target="_bank">广告服务</a>|<a href="/front/aboutus.html">关于我们</a>|<a href="http://www.qmx.top" target="_bank">企明星</a>|<a href="http://www.qmx.top/front/entCommunity.html" target="_bank">企业社区</a></div>
 
 				<div style="color: #B9B9BB;" id="cpinfo">©2015-2018 jianyu360.com 版权所有 | 京ICP备14030217号-3</div>
 
 				<div style="color: #B9B9BB;" id="cpinfo">©2015-2018 jianyu360.com 版权所有 | 京ICP备14030217号-3</div>
 
 			</div>
 
 			</div>
 
 		</div>
 
 		</div>
 
@@ -539,7 +547,7 @@ function infoListCss(){
 
 					<img src="/images/pc_10.png">
 
 					<img src="/images/pc_10.png">
 
 				</span>
 
 				</span>
 
 			</form>
 
 			</form>
 
-			<div><a href="/" target="_bank">剑鱼</a>|<a href="/front/subscribe.html">招标订阅</a>|<a href="/jylab/supsearch/index.html">招标搜索</a>|<a  data-toggle="modal" data-target="#bidcommunity">招标社区</a>|<a href="/jyblog/index.html" target="_bank">剑鱼博客</a>|<a href="/front/busicooperation.html" target="_bank">商务合作</a>|<a href="/front/aboutus.html">关于我们</a>|<a href="http://www.qmx.top" target="_bank">企明星</a>|<a href="http://www.qmx.top/front/entCommunity.html" target="_bank">企业社区</a></div>
 
+			<div class="jy_otherlink"><a href="/" target="_bank">剑鱼</a>|<a href="/front/subscribe.html">招标订阅</a>|<a href="/jylab/supsearch/index.html">招标搜索</a>|<a  data-toggle="modal" data-target="#bidcommunity">招标社区</a>|<a href="/jyblog/index.html" target="_bank">剑鱼博客</a>|<a href="/front/busicooperation.html" target="_bank">商务合作</a>|<a href="/front/advservices.html" target="_bank">广告服务</a>|<a href="/front/aboutus.html">关于我们</a>|<a href="http://www.qmx.top" target="_bank">企明星</a>|<a href="http://www.qmx.top/front/entCommunity.html" target="_bank">企业社区</a></div>
 
 			<div>©2015-2018 jianyu360.com 版权所有 | 京ICP备14030217号-3</div>
 
 			<div>©2015-2018 jianyu360.com 版权所有 | 京ICP备14030217号-3</div>
 
 		</div>
 
 		</div>
 
 		<div class="j-bottom-b">
 
 		<div class="j-bottom-b">

+ 47 - 73
src/web/templates/active/topics.html
Файл харах 

@@ -14,9 +14,18 @@
 
 <link rel="stylesheet" type="text/css" href="/css/active/ground.css" />
 
 <link rel="stylesheet" type="text/css" href="/css/active/ground.css" />
 
 <script src="/js/pcindex.js?v={{Msg "seo" "version"}}"></script>
 
 <script src="/js/pcindex.js?v={{Msg "seo" "version"}}"></script>
 
 <script src="/js/jquery.lazyload.min.js"></script>
 
 <script src="/js/jquery.lazyload.min.js"></script>
 
+<link rel="stylesheet" type="text/css" href="/pccss/public-nav-1200.css" />
 
+<script type="text/javascript" src="/js/public-nav.js"></script>
 
 <script type="text/javascript">
 
 <script type="text/javascript">
 
 	$(function() {
 
 	$(function() {
 
-		
+		$(".logo img").attr("src","/images/swordfish/sf_01.png");
 
+		selcetIndexNav(8)
 
+		$("#bidLogin").on("show.bs.modal", function () {
 
+			$(".public-nav").css({"padding-right":"17px"});
 
+		})
 
+		$("#bidLogin").on("hidden.bs.modal", function () {
 
+			$(".public-nav").css({"padding-right":""});
 
+		})
 
 		/*判断第一屏幕是否大于浏览器窗口*/
 
 		/*判断第一屏幕是否大于浏览器窗口*/
 
 		isWindowHeightMoreFor_1();
 
 		isWindowHeightMoreFor_1();
 
 		function isWindowHeightMoreFor_1() {
 
 		function isWindowHeightMoreFor_1() {
 
@@ -128,6 +137,12 @@
 
 	})
 
 	})
 
 </script>
 
 </script>
 
 <style type="text/css">
 
 <style type="text/css">
 
+.logo img{
 
+	width:74px;
 
+}
 
+.indexpage-content{
 
+	padding-top:76px;
 
+}
 
 .j-com-1-1{
 
 .j-com-1-1{
 
     min-width: 1200px;
 
     min-width: 1200px;
 
     margin: 0 auto;
 
     margin: 0 auto;
 
@@ -555,81 +570,40 @@ _czc.push(["_setAccount", "1261815924"]);
 
 </script>
 
 </script>
 
 </head>
 
 </head>
 
 <body class="indexpage">
 
 <body class="indexpage">
 
-<div class="j-head">
 
-	<div class="j-nav">
 
-		<ul>
 
-			<li class="j-nav-logo" style="width:120px;"><a><img src="/images/swordfish/sf_01.png"></a></li>
 
-			<li class="navigation">
 
-			<form method="post" action="/jylab/supsearch/index.html" id="zbSeatchIndex" target="_blank" style="position:relative;">
 
-            <span class="j-inputgroup">
 
-				<input class="nav-search" type="text" name="keywords" placeholder="请输入您要查询的招标信息" value="{{.T.keywords}}" />
 
-<!--				<img src="/images/pc_20.png" class="j-clearicon" id="t-clear">-->
 
-				<img class="j-searchicon" style="position:absolute; width:18px; height:18px; right:18px; top:50%; margin-top:-10px; cursor:pointer;" src="/images/swordfish/search.png" onclick="zbSeatch('zbSeatchIndex')">
 
-<!--				<div style="background-image:/images/pc_11.png; position:absolute; width:50px; height:50px; padding-top:4px; padding-left:100px; z-index:99;"></div>-->
 
-			</span>
 
-			<input type="hidden" name="searchvalue">
 
-		</form>
 
-			</li>
 
-			<li class="j-nav-link" onclick="_czc.push(['_trackEvent', '头部导航条', '登录', 'j-head'])" style="cursor:default; width:1px; height:1px; margin-right:99px">
 
-				<div class='useronline' id="login"></div>
 
-			</li>			
-<!--			<li class="jy_scancode"  ><img src="/wxswordfish/images/QR.gif"/><a>微信扫一扫</a></li>-->
 
-<!--			<li class="j-nav-link" id="jy_blog"><a href="/jyblog/index.html">剑鱼博客</a></li>-->
 
-			<li class="j-nav-link" data-toggle="modal" data-target="#bidcommunity"><a>招标社区</a></li>
 
-			<li class="j-nav-link" onclick="window.open('/swordfish/searchinfolist.html')">
 
-			<a class="newhead">招标搜索</a></li>
 
-			<li class="j-nav-link" onclick="window.open('/list/stype/NJ.html')"><a>拟建项目</a></li>
 
-			<li class="j-nav-link" onclick="window.open('/front/subscribe.html')"><a>招标订阅</a></li>
 
-			<li class="j-nav-link" onclick="window.open('/')"><a>首页</a></li>
 
-		</ul>
 
-	</div>
 
-	<div class="animatdiv">
 
-		<div  id="animationSandbox">
 
-			<div class="jyhead_saoma" style="display: none;">
 
-				<div class="jyhead_jytou"><img src="/wxswordfish/images/saoma.png"/></div>
 
-				<div class="jyhead_qr">
 
-				<img src="/front/share/{{.T.shareid}}"/>
 
-				<div class="jyhead_qr_ts">
 
-					<font>一键订阅关键词</font><br>
 
-					<span>招标信息自动推送</span>
 
-				</div>
 
-				
-				</div>
 
-			</div>
 
+<section class="public-nav">
 
+	<div class="iner clearfix">
 
+		<a class="logo" href="/"><img src="/images/pc/logo.png" /></a>
 
+		<div class="fr">
 
+			<ul class="jynav">
 
+				<li>
 
+					<a href="/">首页</a>
 
+				</li>
 
+				<li>
 
+					<a href="/front/subscribe.html">招标订阅</a>
 
+				</li>
 
+				<li>
 
+					<a href="/list/stype/NJ.html">拟建项目</a>
 
+				</li>
 
+				<li>
 
+					<a href="/jylab/supsearch/index.html">招标搜索</a>
 
+				</li>
 
+				<li>
 
+					<a href="#">开放平台</a>
 
+				</li>
 
+				<li class="slider"></li>
 
+			</ul>
 
+			<div class='useronline' id="login" style="float:left;"></div>
 
+		</div>
 
+		<div class="search" style="display:none;">
 
+			<form method="post" action="/jylab/supsearch/index.html" id="zbSeatchIndex" style="position:relative;">
 
+				<input class="ser" autocomplete="off"  type="text" name="keywords" placeholder="请输入您要查询的招标信息 " id="" value="" />
 
+				<input type="hidden" name="searchvalue">
 
+				<input class="btn" type="button" onclick="zbSeatch('zbSeatchIndex')" />
 
+			</form>
 
 		</div>
 
 		</div>
 
 	</div>
 
 	</div>
 
-</div>
 
+</section>
 
 
 
-<!-- 模态框（Modal） -->
 
-<!--<div class="modal fade bidcommunity j-modal-dialog" id="bidcommunity" tabindex="-1" role="dialog" aria-labelledby="bidcommunity" aria-hidden="true">
 
-	<div class="modal-dialog">
 
-      <div class="modal-content">
 
-         <div class="modal-header">
 
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
 
-            <h4 class="modal-title">剑鱼</h4>
 
-         </div>
 
-         <div class="modal-body text-center" style="height: 270px;">
 
-			<img src="/front/share/{{.T.shareid}}" alt="剑鱼招标订阅微信公众号"><br/>
 
-			微信扫码关注剑鱼，进入招标社区参与互动
 
-         </div>
 
-      </div>
 
-	</div>
 
-</div>-->
 
-<!-- 模态框（Modal）登录 -->
 
-<!--<div class="modal fade bidLogin" id="bidLogin" tabindex="-1" role="dialog" aria-labelledby="bidLogin" aria-hidden="true">
 
-	<div class="modal-dialog">
 
-      <div class="modal-content">
 
-         <div class="modal-header">
 
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
 
-            <h4 class="modal-title">剑鱼</h4>
 
-         </div>
 
-         <div class="modal-body text-center" style="height: 270px;">
 
-			<img src="/front/share/{{.T.shareid}}" alt="剑鱼用户登录"><br/>
 
-			微信扫描登录，新用户自动注册
 
-         </div>
 
-      </div>
 
-	</div>
 
-</div>-->
 
 <div class="modal fade bidLogin" id="bidLogin"  tabindex="-1" role="dialog" aria-labelledby="bidLogin" aria-hidden="true" >
 
 <div class="modal fade bidLogin" id="bidLogin"  tabindex="-1" role="dialog" aria-labelledby="bidLogin" aria-hidden="true" >
 
   <div class="modal-dialog" style="width:400px;border:0px;" >
 
   <div class="modal-dialog" style="width:400px;border:0px;" >
 
 		<div class="j-active-code">
 
 		<div class="j-active-code">

+ 4 - 16
src/web/templates/common/pcbottom.html
Файл харах 

@@ -195,20 +195,8 @@ function backTopAdjust(){
 
 </script>
 
 </script>
 
 <script type="text/javascript">
 
 <script type="text/javascript">
 
 	var tjhost = location.host;
 
 	var tjhost = location.host;
 
-	if(tjhost.indexOf("jianyu360.com")>=0){
 
-		var cnzz_protocol = (("https:" == document.location.protocol) ? " https://" : " http://");document.write(unescape("%3Cspan id='cnzz_stat_icon_1261815924'%3E%3C/span%3E%3Cscript src='" + cnzz_protocol + "s11.cnzz.com/z_stat.php%3Fid%3D1261815924' type='text/javascript'%3E%3C/script%3E"));
 
-		setTimeout(function(){
 
-			$("#cnzz_stat_icon_1261815924 a").text("");
 
-		},1000)
 
-	}else if(tjhost.indexOf("jianyu360.cn")>=0){
 
-		var cnzz_protocol = (("https:" == document.location.protocol) ? " https://" : " http://");document.write(unescape("%3Cspan id='cnzz_stat_icon_1261815974'%3E%3C/span%3E%3Cscript src='" + cnzz_protocol + "s95.cnzz.com/z_stat.php%3Fid%3D1261815974' type='text/javascript'%3E%3C/script%3E"));
 
-		setTimeout(function(){
 
-			$("#cnzz_stat_icon_1261815974 a").text("");
 
-		},1000)
 
-	}else{
 
-		var cnzz_protocol = (("https:" == document.location.protocol) ? " https://" : " http://");document.write(unescape("%3Cspan id='cnzz_stat_icon_1261816007'%3E%3C/span%3E%3Cscript src='" + cnzz_protocol + "s4.cnzz.com/z_stat.php%3Fid%3D1261816007' type='text/javascript'%3E%3C/script%3E"));
 
-		setTimeout(function(){
 
-			$("#cnzz_stat_icon_1261816007 a").text("");
 
-		},1000)
 
-	}
 
+	var cnzz_protocol = (("https:" == document.location.protocol) ? " https://" : " http://");document.write(unescape("%3Cspan id='cnzz_stat_icon_1261815924'%3E%3C/span%3E%3Cscript src='" + cnzz_protocol + "s11.cnzz.com/z_stat.php%3Fid%3D1261815924' type='text/javascript'%3E%3C/script%3E"));
 
+	setTimeout(function(){
 
+		$("#cnzz_stat_icon_1261815924 a").text("");
 
+	},1000)
 
 </script>
 
 </script>

+ 2 - 2
src/web/templates/pc/subscribe.html
Файл харах 

@@ -10,11 +10,11 @@
 
 <link rel="stylesheet" type="text/css" href="/css/reset.css?v={{Msg "seo" "version"}}" />
 
 <link rel="stylesheet" type="text/css" href="/css/reset.css?v={{Msg "seo" "version"}}" />
 
 <link rel="stylesheet" type="text/css" href="/css/subcss.css?v={{Msg "seo" "version"}}" />
 
 <link rel="stylesheet" type="text/css" href="/css/subcss.css?v={{Msg "seo" "version"}}" />
 
 <link rel="stylesheet" type="text/css" href="/pccss/reset_pc.css" />
 
 <link rel="stylesheet" type="text/css" href="/pccss/reset_pc.css" />
 
-<link rel="stylesheet" type="text/css" href="/pccss/public-nav-1200.css" />
 
 <link rel="stylesheet" type="text/css" href="/pccss/zhaobiao.css" />
 
 <link rel="stylesheet" type="text/css" href="/pccss/zhaobiao.css" />
 
 <link href="/css/pc.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 
 <link href="/css/pc.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 
+<link rel="stylesheet" type="text/css" href="/pccss/public-nav-1200.css" />
 
+<script type="text/javascript" src="/js/public-nav.js"></script>
 
 <script src="/js/jquery.cookie.js"></script>
 
 <script src="/js/jquery.cookie.js"></script>
 
-		<script type="text/javascript" src="/js/public-nav.js"></script>
 
 <script>
 
 <script>
 
 $(function(){
 
 $(function(){
 
 	$(window).scroll(function(){
 
 	$(window).scroll(function(){