浏览代码

搜索页面

wangshan 7 年之前
父节点
当前提交
d3ae2e8349

+ 79 - 68
src/web/staticres/css/dev2/biddingSearch.css

@@ -15,7 +15,7 @@
 /*白色字体*/
 #searchInner .searchHeader {
   /*头部*/
-  height: 120px;
+  height: 110px;
   background-color: #f5f5fb;
   border-top: 1px solid #e0e0e0;
 }
@@ -33,15 +33,15 @@
 
 #searchInner .searchHeader .searchHeader-container .control-tabBtn a {
   display: inline-block;
-  padding: 7px 13px 7px 32px;
+  padding: 7px 30px 7px 23px;
   font-size: 14px;
   color: #252627;
-  background: transparent url("/images/biddingSearch/sea-header-btnImg.png") 12px center no-repeat;
+  background: transparent url("/images/biddingSearch/sea-header-btnImg_gray.png") 0px center no-repeat;
   background-size: 15px 16px;
 }
 
 #searchInner .searchHeader .searchHeader-container .control-tabBtn a.on {
-  background: url(/images/biddingSearch/sea-header-btnImg.png) 12px center no-repeat;
+  background: url(/images/biddingSearch/sea-header-btnImg.png) 0px center no-repeat;
   background-size: 15px 16px;
   color: #2cb7ca;
   text-decoration: none;
@@ -58,8 +58,8 @@
 
 #searchInner .searchHeader .searchHeader-container .searchInput form input[type='search'] {
   float: left;
-  width: 574px;
-  height: 46px;
+  width: 640px;
+  height: 42px;
   box-sizing: border-box;
   padding-left: 58px;
 padding-right:26px;
@@ -70,8 +70,8 @@ padding-right:26px;
 
 #searchInner .searchHeader .searchHeader-container .searchInput form input[type='submit'] {
   float: left;
-  width: 110px;
-  height: 46px;
+  width: 100px;
+  height: 42px;
   color: #ffffff;
   background-color: #2cb7ca;
   text-align: center;
@@ -83,8 +83,8 @@ padding-right:26px;
 
 #searchInner .searchHeader .searchHeader-container .searchInput form input[type='button'] {
   float: left;
-  width: 110px;
-  height: 46px;
+  width: 100px;
+  height: 42px;
   color: #ffffff;
   background-color: #2cb7ca;
   text-align: center;
@@ -129,36 +129,38 @@ padding-right:26px;
 #searchInner .searchHeader .searchHeader-container .searchInput .screen {
   /*筛选*/
   float: left;
-  padding: 0 46px 0 20px;
-  height: 46px;
-  line-height: 46px;
+  padding: 0 46px 0 15px;
+  height: 42px;
+  line-height: 42px;
   text-align: center;
-  color: #2cb7ca;
-  background: url("/images/biddingSearch/screen-down.png") 58px center no-repeat;
+  color: #252627;
+  background: url("/images/biddingSearch/more.png") 50px center no-repeat;
   cursor: pointer;
+	font-size:14px;
+	background-size: 13px 8px !important;
 }
 
 #searchInner .searchHeader .searchHeader-container .searchInput .screen.down {
-  background: url("/images/biddingSearch/screen-up.png") 58px center no-repeat;
+  background: url("/images/biddingSearch/moreup.png") 50px center no-repeat;
 }
 
 #searchInner .searchHeader .searchHeader-container .searchInput .superSearch {
   /*开启超级搜索*/
   float: left;
   width: 135px;
-  height: 46px;
-  line-height: 46px;
+  height: 42px;
+  line-height: 42px;
   text-align: center;
-  border: 1px solid #e0e0e0;
+  border: 1px solid #ebebeb;
   font-size: 14px;
   color: #252627;
   padding-left: 22px;
   box-sizing: border-box;
-  background: #ffffff url(/images/biddingSearch/sea-header-btnImg.png) 16px center no-repeat;
+  background: #ffffff url(/images/biddingSearch/sea-header-btnImg_gray.png) 16px center no-repeat;
   background-size: 15px 16px;
   cursor: pointer;
-border-radius:2px;
-margin-left: 115px;
+border-radius:4px;
+margin-left: 68px;
 }
 
 #searchInner .searchHeader .searchHeader-container .searchInput .superSearch.active {
@@ -171,12 +173,12 @@ margin-left: 115px;
 #searchInner .searchHeader .searchHeader-container .searchInput .search-right-wx {
   float: right;
   position: relative;
-  z-index: 999;
+/*  z-index: 999;*/
 }
 
 #searchInner .searchHeader .searchHeader-container .searchInput .search-right-wx > img {
-  width: 45px;
-  height: 45px;
+  width: 42px;
+  height: 42px;
   cursor: pointer;
 }
 
@@ -231,7 +233,7 @@ margin-left: 115px;
 
 #searchInner .searchControl .searchTender {
   /*招标搜索页面*/
-  padding: 0 14px;
+  padding: 0 15px;
   box-sizing: border-box;
   border: 1px solid #e0e0e0;
   margin-top: 25px;
@@ -243,7 +245,7 @@ margin-left: 115px;
   /*行业*/
   border-bottom: 1px dashed #e0e0e0;
   overflow: hidden;
-  padding: 20px 0px 12px;
+  padding: 18px 0px 10px;
   position: relative;
 }
 
@@ -316,15 +318,15 @@ margin-left: 115px;
 
 #searchInner .searchControl .searchTender .leftTitle {
   float: left;
-  width: 84px;
+  width: 94px;
   text-align: right;
   color: #686868;
-  padding: 4px 7px;
+  padding: 4px 15px 4px 0px;
 }
 
 #searchInner .searchControl .searchTender .Price {
   /*价格区间*/
-  padding: 20px 0px 14px;
+  padding: 17px 0px 10px;
   border-bottom: 1px dashed #e0e0e0;
 }
 
@@ -352,12 +354,12 @@ margin-left: 115px;
 
 #searchInner .searchControl .searchTender .Price .Price-content .PriceInput input[type="text"] {
   float: left;
-  width: 160px;
+  width: 162px;
   height: 28px;
   padding: 0 15px;
   box-sizing: border-box;
   border: 1px solid #e0e0e0;
-    border-radius: 0px;
+    border-radius: 2px;
 }
 
 #searchInner .searchControl .searchTender .Price .Price-content .PriceInput input[type="number"] {
@@ -387,11 +389,12 @@ margin-left: 115px;
   background-color: #2cb7ca;
   color: #ffffff;
   cursor: pointer;
+	border-radius:2px;
 }
 
 #searchInner .searchControl .searchTender .release-time {
   /*发布时间*/
-  padding: 20px 0 13px;
+  padding: 17px 0 10px;
   border-bottom: 1px dashed #e0e0e0;
 }
 
@@ -409,11 +412,11 @@ margin-left: 115px;
 }
 
 #searchInner .searchControl .searchTender .release-time .timerInput {
-  margin-top: -7px;
+  margin-top: -9px;
   margin-left: 40px;
 	border: 1px solid #fff;
 /*    background-color: #fff;*/
-    padding: 3px 5px;
+    padding: 5px 5px;
 }
 
 #searchInner .searchControl .searchTender .release-time .timerInput input[type="text"] {
@@ -423,7 +426,7 @@ margin-left: 115px;
   padding: 0 15px;
   box-sizing: border-box;
   border: 1px solid #e0e0e0;
-    border-radius: 0px;
+    border-radius: 2px;
 }
 
 #searchInner .searchControl .searchTender .release-time .timerInput span {
@@ -444,11 +447,12 @@ margin-left: 115px;
   background-color: #2cb7ca;
   color: #ffffff;
   cursor: pointer;
+border-radius:2px;
 }
 
 #searchInner .searchControl .searchTender .region {
   /*项目地区*/
-  padding: 20px 0px 12px;
+  padding: 18px 0px 10px;
   border-bottom: 1px dashed #e0e0e0;
 }
 
@@ -505,7 +509,7 @@ margin-left: 115px;
 
 #searchInner .searchControl .searchTender .information {
   /*信息类型*/
-  padding: 20px 0px 12px;
+  padding: 18px 0px 10px;
   position:relative;
 }
 
@@ -576,14 +580,14 @@ margin-left: 115px;
 
 #searchInner .searchControl .seaTender-inner {
   /*招标搜索列表内容*/
-  margin-top: 20px;
+  margin-top: 15px;
   background-color: #ffffff;
 /*  border: 1px solid #e0e0e0;*/
   border-bottom: none;
 }
 
 #searchInner .searchControl .seaTender-inner .tabTitle {
-  line-height: 50px;
+  line-height: 46px;
   border: 1px solid #e0e0e0;
 /*  background-color: #f5f4f9;*/
 }
@@ -595,6 +599,7 @@ margin-left: 115px;
   font-size: 16px;
 /*  border-right: 1px solid #e0e0e0;*/
   margin-left:15px;
+position:relative;
 }
 
 #searchInner .searchControl .seaTender-inner .tabTitle li a {
@@ -604,6 +609,9 @@ margin-left: 115px;
   font-size: 16px;
   color: #252627;
     text-decoration: none;
+position: absolute;
+    top: 1px;
+    height: 50px;
 }
 
 #searchInner .searchControl .seaTender-inner .tabTitle li a.active {
@@ -611,11 +619,14 @@ margin-left: 115px;
   background-color: #ffffff;
   color: #2cb7ca;
   box-sizing: border-box;
+position: absolute;
+    top: 1px;
+    height: 50px;
 }
 
 #searchInner .searchControl .seaTender-inner .tabTitle .right-tabBtn {
   float: right;
-  width: 173px;
+  width: 153px;
   height: 50px;
   line-height: 50px;
   background-color: transparent;
@@ -637,11 +648,11 @@ margin-left: 115px;
 #searchInner .searchControl .seaTender-inner .tabTitle .right-tabBtn button:nth-of-type(1) {
   background: transparent url("/images/biddingSearch/tab-icon4.png") 10px center no-repeat;
   background-size: 16px 14px;
-margin-right:20px;
+/*margin-right:20px;*/
 }
 
 #searchInner .searchControl .seaTender-inner .tabTitle .right-tabBtn button:nth-of-type(1).active {
-  background: #fff url("/images/biddingSearch/tab-icon4.png") 10px center no-repeat;
+  background: #fff url("/images/biddingSearch/tab-icon3.png") 10px center no-repeat;
   color: #2cb7ca;
   background-size: 16px 14px;
 }
@@ -652,7 +663,7 @@ margin-right:20px;
 }
 
 #searchInner .searchControl .seaTender-inner .tabTitle .right-tabBtn button:nth-of-type(2).active {
-  background: #fff url("/images/biddingSearch/tab-icon2.png") 10px center no-repeat;
+  background: #fff url("/images/biddingSearch/tab-icon1.png") 10px center no-repeat;
   color: #2cb7ca;
   background-size: 16px 14px;
 }
@@ -670,12 +681,12 @@ margin-right:20px;
 }
 
 #searchInner .searchControl .seaTender-inner .tabContainer .lucene li {
-  padding: 15px 15px 0;
+  padding: 15px 0px 0;
   overflow: hidden;
   font-size: 16px;
 }
 #searchInner .searchControl .seaTender-inner .tabContainer-2 .lucene li {
-  padding: 15px 15px 0;
+  padding: 15px 0px 0px;
   overflow: hidden;
   font-size: 16px;
 height:61px;
@@ -688,12 +699,12 @@ height:61px;
 #searchInner .searchControl .seaTender-inner .tabContainer .lucene li .liLuceneList {
   border-bottom: 1px solid #EBEBEB;
   overflow: hidden;
-  padding-bottom: 15px;
-width:1170px;
+  padding:0px 15px 15px;
+width:1200px;
 }
 
 #searchInner .searchControl .seaTender-inner .tabContainer-2 .lucene li .liLuceneList {
-	padding-bottom: 15px;
+	padding: 0px 15px 15px;
 }
 #searchInner .searchControl .seaTender-inner .tabContainer .lucene li .luce-left {
   float: left;
@@ -720,7 +731,7 @@ width:1170px;
 }
 
 #searchInner .searchControl .seaTender-inner .tabContainer .lucene li .luce-left .left-title a:hover {
-  text-decoration: underline;
+  text-decoration: none;
   color: #fe7379;
 }
 
@@ -749,11 +760,11 @@ width:1170px;
 }
 
 #searchInner .searchControl .seaTender-inner .tabContainer .lucene li .luce-right a {
-  padding: 3px 7px;
-  color: #FFFFFF;
-  font-size: 15px;
-	border-radius:3px;
-    margin-left: 8px;
+  padding: 0.5px 6px .5px;
+    color: #FFFFFF;
+    font-size: 14px;
+    border-radius: 3px;
+    margin-left: 5px;
 }
 
 #searchInner .searchControl .seaTender-inner .tabContainer .lucene li .luce-right a:nth-of-type(1) {
@@ -773,12 +784,11 @@ width:1170px;
 }
 
 #searchInner .searchControl .seaTender-inner .tabContainer .lucene li .luce-right span {
-  display: inline-block;
-  padding-left: 26px;
-  color: #888888;
-  background: transparent url("/images/biddingSearch/lists-timeImg.png") 6px center no-repeat;
-    color: #686868;
-    margin-left: 3px;
+      display: inline-block;
+    padding-left: 25px;
+    color: #888888;
+    background: transparent url(/images/biddingSearch/lists-timeImg.png) 5px center no-repeat;
+    font-size: 14px;
 }
 
 #searchInner .searchControl .seaTender-inner .tabContainer .lucene-table {
@@ -843,18 +853,18 @@ width:1170px;
 
 #searchInner .pagination {
   /*分页*/
-  margin-bottom: 60px;
+  margin-bottom: 40px;
   display:block;
 }
 
 #searchInner .pagination a {
   float: left;
-  padding: 7px 10px;
-  border: 1px solid #e0e0e0;
+  padding: 10px 9px;
+  border: 1px solid #EBEBEB;
   margin-left: 0;
   text-decoration: none;
-/*  border-bottom-left-radius: 4px;
-  border-top-left-radius: 4px;*/
+/*  border-bottom-left-radius: 4px;*/
+  border-radius: 4px;
 }
 
 /*#searchInner .pagination a:hover {
@@ -868,12 +878,13 @@ width:1170px;
 #searchInner .pagination span {
   float: left;
   width: 36px;
-  height: 30px;
-  line-height: 31px;
+  height: 36px;
+  line-height: 36px;
   text-align: center;
   color: #ffffff;
   background-color: #2cb7ca;
   margin: 0 10px;
+	border-radius:4px;
 }
 #intercept{
 	margin-top: 25px;

+ 8 - 5
src/web/staticres/css/dev2/superSearch.css

@@ -2,13 +2,16 @@
     background-color: #F8F7FC !important;
     border: 1px solid #ddd !important;
     padding: 3px 5px;
+	box-shadow: 0 0 10px rgba(0,0,0, .2);
+	border-radius:2px;
 }
 .pricefat{
 	float: left;
-	margin-top: -6px;
+	margin-top: -9px;
 	border: 1px solid #fff;
     background-color: #fff;
-	padding: 2px 5px;
+	padding: 5px 5px;
+	border-radius:2px;
 }
 #searchInner .active{
 	background-color: #2cb7ca;
@@ -38,14 +41,14 @@
     border-color: #2cb7ca transparent transparent transparent;
     z-index: 99;
     position: absolute;
-    left: 34px;
-	top:-3px;
+    left: 21px;
+	top:-4px;
 }
 .bidbut{
 /*	background-color: #2cb7ca;*/
     color: #2cb7ca;
     font-size: 14px;
-    padding: 4px 12px 5px 12px;
+    padding: 4px 30px 5px 0px;
 	cursor: pointer;
 }
 .bidbtn{

+ 4 - 4
src/web/staticres/css/pc.css

@@ -83,15 +83,15 @@ form{
 
 .useronline>button{
 	    width: 70px;
-    height: 35px;
-    line-height: 32px;
+    height: 30px;
+    line-height: 27px;
     text-align: center;
-    border: 1px solid #fff;
+    border: 1px solid #e0e0e0;
     border-radius: 4px;
     background-color: transparent;
     color: #fff;
     font-size: 14px;
-/*    margin-top: 20px;*/
+    margin-top: 2px;
     cursor: pointer;
 }
 .useronline>button>img{

二进制
src/web/staticres/images/biddingSearch/sea-header-btnImg_gray.png


二进制
src/web/staticres/images/biddingSearch/sea-right-wx.png


二进制
src/web/staticres/images/biddingSearch/sea-right-wx_bak.png


二进制
src/web/staticres/images/biddingSearch/tab-icon1.png


二进制
src/web/staticres/images/biddingSearch/tab-icon1_bak.png


二进制
src/web/staticres/images/biddingSearch/tab-icon3.png


二进制
src/web/staticres/images/biddingSearch/tab-icon3_bak.png


二进制
src/web/staticres/images/pc_6.png


二进制
src/web/staticres/images/pc_6_bak.png


+ 69 - 0
src/web/staticres/js/common.js

@@ -1,3 +1,72 @@
+var priceshow = false;
+var timeshow = false;
+function priceTime(){
+	$(".pricefat").mouseover(function(){
+		if(!$(".pricefat").hasClass("active")){
+			$("#minprice").css({"border-color":"#2cb7ca"});
+			$("#maxprice").css({"border-color":"#2cb7ca"});
+			$(".pricebut").show();
+			$(".pricefat").addClass("customtime-active");
+		}
+	}).mouseout(function(){
+		if(!$(".pricefat").hasClass("active")){
+			if(!priceshow){
+				$("#minprice").css({"border-color":""});
+				$("#maxprice").css({"border-color":""});
+				$(".pricebut").hide();
+				$(".pricefat").removeClass("customtime-active");
+			}
+		}
+	})
+	$("#minprice,#maxprice").blur(function(){
+		if(!priceshow&&!$(".pricefat").hasClass("active")){
+			$("#minprice").css({"border-color":""});
+			$("#maxprice").css({"border-color":""});
+			$(".pricebut").hide();
+			$(".pricefat").removeClass("customtime-active");
+		}
+	})
+	$("#minprice").click(function(){
+		priceshow=true;
+		$(".pricebut").show();
+		$(".pricefat").addClass("customtime-active");
+	})
+	$("#maxprice").click(function(){
+		priceshow=true;
+		$(".pricebut").show();
+		$(".pricefat").addClass("customtime-active");
+	})
+	//
+	$(".timerInput").mouseover(function(){
+		if(!$(".timerInput").hasClass("active")){
+			$("#starttime").css({"border-color":"#2cb7ca"});
+			$("#endtime").css({"border-color":"#2cb7ca"});
+			$("#timebut").show();
+			$(".timerInput").addClass("customtime-active");
+		}
+	}).mouseout(function(){
+		if(!$(".timerInput").hasClass("active")){
+			if(!timeshow){
+				$("#starttime").css({"border-color":""});
+				$("#endtime").css({"border-color":""});
+				$("#timebut").hide();
+				$(".timerInput").removeClass("customtime-active");
+			}
+		}
+	})
+	//
+	$("#starttime").click(function(){
+		timeshow = true;
+		$("#timebut").show();
+		$(".timerInput").addClass("customtime-active");
+	})
+	$("#endtime").click(function(){
+		timeshow = true;
+		$("#timebut").show();
+		$(".timerInput").addClass("customtime-active");
+	})
+}
+//
 var EasyAlert = {
 	timeout: null,
 	waitTime: 1000,

+ 2 - 2
src/web/staticres/js/login.js

@@ -652,9 +652,9 @@ function loginBtnType(){
 		$(".loginBtn").attr("onmouseover","this.style.borderColor='#2cb7ca'; this.style.color='#2cb7ca';");
 		$(".loginBtn").attr("onmouseout","this.style.borderColor='#fff'; this.style.color='#fff';");
 	}else{
-		$(".loginBtn").css({"border-color":"rgb(37, 38, 39)","color":"rgb(37, 38, 39)"});
+		$(".loginBtn").css({"border-color":"#e0e0e0","color":"rgb(37, 38, 39)"});
 		$(".loginBtn").attr("onmouseover","this.style.borderColor='#2cb7ca'; this.style.color='#2cb7ca';");
-		$(".loginBtn").attr("onmouseout","this.style.borderColor='#252627'; this.style.color='#252627';");
+		$(".loginBtn").attr("onmouseout","this.style.borderColor='#e0e0e0'; this.style.color='#252627';");
 	}
 }
 //

+ 16 - 14
src/web/staticres/js/proproject.js

@@ -4,25 +4,27 @@ var submitflag = true;
 var nbflag = false;
 var tabularflag = "Y";
 $(function() {
-	
-	$("#starttime").click(function(){
-		$("#timebut").show();
-		$(".timerInput").addClass("customtime-active");
-	})
-	$("#endtime").click(function(){
-		$("#timebut").show();
-		$(".timerInput").addClass("customtime-active");
-	})
-	
 	$(".timer").find("ul li:first-child").click(function(){
+		timeshow = false;
+		$("#starttime").css({"border-color":""});
+		$("#endtime").css({"border-color":""});
+		$("#timebut").hide();
+		$(".timerInput").removeClass("customtime-active");
 		$(this).addClass("active");
 		$(".timerInput").removeClass("active");
 	})
 	//
 	$("#timebut").click(function(){
+		timeshow=false;
 		$(this).hide();
 		$(".timerInput").removeClass("customtime-active");
 		if($("#starttime").val()==""&&$("#endtime").val()==""){
+			$("#starttime").css({"border-color":""});
+			$("#endtime").css({"border-color":""});
+			$("#timebut").hide();
+			$(".timerInput").removeClass("customtime-active");
+			$("#timerAll").addClass("active");
+			$(".timerInput").removeClass("active");
 			return false;
 		}
 		$(".timerInput").addClass("active");
@@ -143,7 +145,7 @@ function getNewBids(pnum){
 
 //---取VIP数据---
 function getVIPData(){
-	if($("#zbSeatchT [name='keywords']").val()==""&&$("#zbSeatchT [name='keywords']").val()==""){
+	if($("#zbSeatchT [name='keywords']").val()==""){
 		$(".working").hide();
 		return true;
 	}
@@ -162,7 +164,7 @@ function getVIPData(){
 				area: $("#zbSeatchT [name='area']").val(),
 				subtype: $("#zbSeatchT [name='subtype']").val(),
 				publishtime: $("#zbSeatchT [name='publishtime']").val(),
-				selectType : "",
+				selectType : "title",
 				minprice : "",
 				maxprice : "",
 				industry : "",
@@ -221,7 +223,7 @@ function getNewBiddings(){
 				area: $("#zbSeatchT [name='area']").val(),
 				subtype: $("#zbSeatchT [name='subtype']").val(),
 				publishtime: $("#zbSeatchT [name='publishtime']").val(),
-				selectType : "",
+				selectType : "title",
 				minprice : "",
 				maxprice : "",
 				industry : "",
@@ -536,7 +538,7 @@ function searchOnsubmit(){
 				area: $("#zbSeatchT [name='area']").val(),
 				subtype: $("#zbSeatchT [name='subtype']").val(),
 				publishtime: $("#zbSeatchT [name='publishtime']").val(),
-				selectType : "",
+				selectType : "title",
 				minprice : "",
 				maxprice : "",
 				industry : "",

+ 13 - 17
src/web/staticres/js/superSearch.js

@@ -3,30 +3,19 @@ var nbflag = false;//是否显示的是最新招标数据
 var currentPage = 1;//当前页
 var submitflag = true;
 var tabularflag = "Y";
-
 $(function() {
-	$("#minprice").click(function(){
-		$(".pricebut").show();
-		$(".pricefat").addClass("customtime-active");
-	})
-	$("#maxprice").click(function(){
-		$(".pricebut").show();
-		$(".pricefat").addClass("customtime-active");
-	})
-	$("#starttime").click(function(){
-		$("#timebut").show();
-		$(".timerInput").addClass("customtime-active");
-	})
-	$("#endtime").click(function(){
-		$("#timebut").show();
-		$(".timerInput").addClass("customtime-active");
-	})
+	priceTime();
 	$(".Price-content").find("span:first-child").click(function(){
 		$(this).addClass("active");
 		$(".pricefat").removeClass("active");
 		beforeSubmit();
 	})
 	$(".timer").find("ul li:first-child").click(function(){
+		timeshow = false;
+		$("#starttime").css({"border-color":""});
+		$("#endtime").css({"border-color":""});
+		$("#timebut").hide();
+		$(".timerInput").removeClass("customtime-active");
 		$(this).addClass("active");
 		$(".timerInput").removeClass("active");
 	})
@@ -72,9 +61,16 @@ $(function() {
 	})
 	//
 	$("#timebut").click(function(){
+		timeshow=false;
 		$(this).hide();
 		$(".timerInput").removeClass("customtime-active");
 		if($("#starttime").val()==""&&$("#endtime").val()==""){
+			$("#starttime").css({"border-color":""});
+			$("#endtime").css({"border-color":""});
+			$("#timebut").hide();
+			$(".timerInput").removeClass("customtime-active");
+			$("#timerAll").addClass("active");
+			$(".timerInput").removeClass("active");
 			return false;
 		}
 		$(".timerInput").addClass("active");

+ 1 - 1
src/web/staticres/pccss/public-nav-1200.css

@@ -61,7 +61,7 @@
 }
 
 .public-nav .iner .jynav {
-  width: 500px;
+  width: 480px;
   float: left;
   position: relative;
   transition: all 1s;

+ 1 - 1
src/web/staticres/pccss/public-nav.css

@@ -27,7 +27,7 @@
 }
 
 .public-nav .iner .jynav {
-  width: 500px;
+  width: 480px;
   float: left;
   position: relative;
   transition: all 1s;

+ 18 - 7
src/web/templates/pc/biddingsearch_enterprise.html

@@ -441,7 +441,7 @@
 			<div class="tabTitle clearfix">
 				<ul>
 					<li>
-						<a class="active" href="javascript:;">最新招标信息</a>
+						<a class="active" href="javascript:;" style="width:100px;">最新招标信息</a>
 					</li>
 				</ul>
 				<div class="right-tabBtn">
@@ -464,18 +464,18 @@
 						<tr>
 						{{if .T.searchvalue}}
 							<td width="45">序号</td>
-							<td width="150">中标日期</td>
+							<td width="150" style="border-top: 4px solid #2C90CB;">中标日期</td>
 							<td width="854">项目名称</td>
-							<td width="150">中标金额(万元)</td>
+							<td width="150" style="border-top: 4px solid #2C90CB;">中标金额(万元)</td>
 						{{else}}
 							<td width="48">序号</td>
-							<td width="315">项目名称</td>
+							<td width="315" style="border-top: 3px solid #2C90CB;">项目名称</td>
 							<td width="84">公告类型</td>
-							<td width="73">预算<br>(万元)</td>
+							<td width="73" style="border-top: 3px solid #2C90CB;">预算<br>(万元)</td>
 							<td width="181">招标单位</td>
-							<td width="103">开标时间</td>
+							<td width="103" style="border-top: 3px solid #2C90CB;">开标时间</td>
 							<td width="174">中标单位</td>
-							<td width="76">中标金额<br>(万元)</td>
+							<td width="76" style="border-top: 3px solid #2C90CB;">中标金额<br>(万元)</td>
 							<td width="103">发布时间</td>
 						{{end}}
 						</tr>
@@ -514,6 +514,7 @@
 
     <script>
     $(function() {
+		priceTime();
 		$(".logo img").attr("src","/images/swordfish/sf_01.png");
 		
 		selcetIndexNav(3);
@@ -802,6 +803,11 @@
 			})
 			//价格的全部按钮
 			$(".Price-content").find("span:first-child").click(function(){
+				priceshow=false;
+				$("#minprice").css({"border-color":""});
+				$("#maxprice").css({"border-color":""});
+				$(".pricebut").hide();
+				$(".pricefat").removeClass("customtime-active");
 				$(this).addClass("active");
 				$(".pricefat").removeClass("active");
 				pricetype = "n"
@@ -1075,6 +1081,7 @@
 		}
 		
 		function priceCss(){
+			priceshow=false;
 			var minp = $("#minprice").val();
 			var maxp = $("#maxprice").val();
 			if(minp!=""&&isNaN(minp)){
@@ -1084,6 +1091,10 @@
 				$("#maxprice").val("")
 			}
 			if ($("#minprice").val()==""&&$("#maxprice").val()==""){
+				$(".pricefat").removeClass("active");
+				$("#priceAll").addClass("active");
+				$("#minprice").css({"border-color":""})
+				$("#maxprice").css({"border-color":""})
 				$(".pricefat").removeClass("customtime-active");
 				$(".pricebut").hide();
 				pricetype = "n";

+ 3 - 2
src/web/templates/pc/classifylist.html

@@ -171,7 +171,7 @@
 }
 
 #searchInner .searchControl .seaTender-inner .tabContainer .lucene li{
-	padding: 15px 20px 0 !important;
+	padding: 15px 0px 0px !important;
     overflow: hidden;
     font-size: 16px;
     height: 61px !important;
@@ -207,6 +207,7 @@
 var industrylist = {{.T.industrylist}}
 var sortArray = {{.T.sortArray}}
 $(function(){
+	priceTime();
 	$(".logo img").attr("src","/images/swordfish/sf_01.png");
 	selcetIndexNav(8)
 	new JyWebScoket.qrToLab();
@@ -697,7 +698,7 @@ function priceCss(){
 			<div class="tabTitle clearfix">
 				<ul id="newsnow">
 					<li>
-						<a class="active" href="javascript:;">最新招标信息</a>
+						<a class="active" href="javascript:;" style="width:100px">最新招标信息</a>
 					</li>
 				</ul>
 				<div class="right-tabBtn">

+ 6 - 5
src/web/templates/pc/proproject.html

@@ -226,7 +226,7 @@ var dataId = "";
 var qr_type = "s";
 $(function(){
 	$(".logo img").attr("src","/images/swordfish/sf_01.png");
-	
+	priceTime();
 	selcetIndexNav(2);
 	$(document).keydown(function(e){
 	    if(e.keyCode == "13"){
@@ -239,6 +239,7 @@ $(function(){
 	$("#searchinput").focus();
 	if($.trim(keys)!=""){
 		$("#newsnow li a").html("搜索结果")
+		$("#newsnow li a").css({"width":"70px"})
 		$(".wx-inner-bottom").html('');
 		$("#t-clear").show();
 		searchvalue = $.trim(searchvalue);
@@ -494,7 +495,7 @@ $(function(){
 			<div class="tabTitle clearfix">
 				<ul id="newsnow">
 					<li>
-						<a class="active" href="javascript:;">最新拟建信息</a>
+						<a class="active" href="javascript:;" style="width:100px;">最新拟建信息</a>
 					</li>
 				</ul>
 				<div class="right-tabBtn">
@@ -516,11 +517,11 @@ $(function(){
 						<thead>
 							<tr>
 								<td width="48">序号</td>
-								<td width="134">项目代码</td>
+								<td width="134" style="border-top: 3px solid #2C90CB;">项目代码</td>
 								<td width="324">项目名称</td>
-								<td width="265">审批事项</td>
+								<td width="265" style="border-top: 3px solid #2C90CB;">审批事项</td>
 								<td width="155">审批结果</td>
-								<td width="115">审批时间</td>
+								<td width="115" style="border-top: 3px solid #2C90CB;">审批时间</td>
 								<td width="116">发布时间</td>
 							</tr>
 						</thead>

+ 14 - 4
src/web/templates/pc/supsearch.html

@@ -233,7 +233,7 @@
 	height:80px;
 }
 #searchInner .pagination{
-	margin-bottom:20px !important;
+	margin-bottom:40px !important;
 }
 </style>
 <script>
@@ -364,6 +364,11 @@ $(function(){
 		$("#priceAll").removeClass("active");
 	}
 	$("#priceAll").click(function(){
+		priceshow=false;
+		$("#minprice").css({"border-color":""});
+		$("#maxprice").css({"border-color":""});
+		$(".pricebut").hide();
+		$(".pricefat").removeClass("customtime-active");
 		beforeSubmit();
 	})
 	//
@@ -785,15 +790,15 @@ $(function(){
 			<div class="tabTitle clearfix">
 				<ul id="newsclass" style="display:none;">
 					<li>
-						<a class="active" href="javascript:;">标题搜索</a>
+						<a class="active" href="javascript:;" style="width:70px;">标题搜索</a>
 					</li>
 					<li>
-						<a href="javascript:;" style="margin-left:20px;">全文搜索</a>
+						<a href="javascript:;" style="width:70px;left: 135px;">全文搜索</a>
 					</li>
 				</ul>
 				<ul id="newsnow">
 					<li>
-						<a class="active" href="javascript:;">最新招标信息</a>
+						<a class="active" href="javascript:;" style="width:100px;">最新招标信息</a>
 					</li>
 				</ul>
 				<div class="right-tabBtn">
@@ -986,6 +991,7 @@ function noIn(p){
 }
 //
 function priceCss(){
+	priceshow=false;
 	var minp = $("#minprice").val();
 	var maxp = $("#maxprice").val();
 	if(minp!=""&&isNaN(minp)){
@@ -996,7 +1002,11 @@ function priceCss(){
 	}
 	if ($("#minprice").val()==""&&$("#maxprice").val()==""){
 		$(".pricefat").removeClass("customtime-active");
+		$(".pricefat").removeClass("active");
+		$("#priceAll").addClass("active");
 		$(".pricebut").hide();
+		$("#minprice").css({"border-color":""})
+		$("#maxprice").css({"border-color":""})
 		return false;
 	}
 	if (parseInt(minp)>parseInt(maxp)){

+ 12 - 12
src/web/templates/weixin/wxinfocontent.html

@@ -119,7 +119,7 @@ pre {
 	top: 2px;
 }
 .timebefore{
-	color: #a0a0a0;
+	color: #888888;
 }
 .timebefore i{
 	color: #7a7a7a;
@@ -127,20 +127,20 @@ pre {
 	top: 3px;
 }
 .area{
-	color: #fff;
-	background-color: #24C0D7;
-	border-radius: 3px;
-	padding: 1px 3px;    
-	border: 1px solid #24C0D7;
-	margin-right: 3px;
-	float: left;
+	    color: #fff;
+    background-color: #24C0D7;
+    border-radius: 2px;
+    padding: 0px 4px 0px 5px;
+    /* border: 1px solid #24C0D7; */
+    margin-right: 3px;
+    float: left;
 }
 .type{
-	padding: 1px 3px;
-	border: 1px solid #ffba00;
+    padding: 0px 4px 0px 5px;
+/*border: 1px solid #ffba00; */
     background: #ffba00;
 	color: #fff;
-	border-radius: 3px;
+	border-radius: 2px;
 	margin-right: 3px;
 	float: left;
 }
@@ -907,7 +907,7 @@ $(function(){
 	$("body").show();
 	var wechatInfo = getWxVersion();
 	if(wechatInfo == null || wechatInfo < "5.0") {
-	  	//$(".reward").remove();
+	  	$(".reward").remove();
 	}
 	//打赏成功提示
 	if(sessionStorage && sessionStorage.rewardStatus == 1){

+ 11 - 11
src/web/templates/weixin/wxinfocontent_rec.html

@@ -95,7 +95,7 @@ pre {
 	top: 2px;
 }
 .timebefore{
-	color: #a0a0a0;
+	color: #888888;
 }
 .timebefore i{
 	color: #7a7a7a;
@@ -103,20 +103,20 @@ pre {
 	top: 3px;
 }
 .area{
-	color: #fff;
-	background-color: #24C0D7;
-	border-radius: 3px;
-	padding: 1px 3px;    
-	border: 1px solid #24C0D7;
-	margin-right: 3px;
-	float: left;
+	    color: #fff;
+    background-color: #24C0D7;
+    border-radius: 2px;
+    padding: 0px 4px 0px 5px;
+    /* border: 1px solid #24C0D7; */
+    margin-right: 3px;
+    float: left;
 }
 .type{
-	padding: 1px 3px;
-	border: 1px solid #ffba00;
+    padding: 0px 4px 0px 5px;
+/*border: 1px solid #ffba00; */
     background: #ffba00;
 	color: #fff;
-	border-radius: 3px;
+	border-radius: 2px;
 	margin-right: 3px;
 	float: left;
 }