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

src/web/staticres/css/pc.css

@@ -1344,22 +1344,25 @@ form{
 	background-color: #2cb7ca;
 	border-radius: 3px;
 	color: #fff;
-	padding: 1px 4px 2px 4px;
-	margin-right: 5px;
+	padding: 1px 6px 2px 6px;
+	margin-right:5px;
+	font-size:14px;
 }
 .j-content .com-type{
 	background-color: #ffba00;
 	border-radius: 3px;
 	color: #fff;
-	padding: 1px 4px 2px 4px;
+	padding: 1px 6px 2px 6px;
 	margin-right:5px;
+	font-size:14px;
 }
 .j-content .com-industry{
 	background-color: #25c78c;
 	border-radius: 3px;
 	color: #fff;
-	padding: 1px 4px 2px 4px;
+	padding: 1px 6px 2px 6px;
 	margin-right:5px;
+	font-size:14px;
 }
 .j-content .com-area a{
 	color: #fff;
@@ -1377,6 +1380,7 @@ form{
 .j-content .com-time{
 	color: #686868;
 	margin-left: 5px;
+	font-size: 14px;
 }
 
 .biddetail-content .original-text{
@@ -1488,7 +1492,7 @@ form{
 }
 .otherinfo ul li .com-title a:hover{
 	color: #fe7379;
-	text-decoration: underline;
+	text-decoration: none;
 }
 .otherinfo>.com-title{
 	padding: 15px 10px 15px 37px;

src/web/templates/pc/classifylist.html

@@ -480,17 +480,6 @@ function priceCss(){
 	<!--搜索头部 START-->
 	<div class="searchHeader">
 		<div class="w searchHeader-container">
-			<!--整体页面切换tab-->
-			<div class="control-tabBtn">
-				{{if eq .T.supstatus "T"}}
-				<a href="/jylab/supsearch/index.html" class="on">超级搜索</a>
-				<span class="bidbut" style="display:none;">招标搜索</span>
-				{{else}}
-				<a href="#" class="on" style="display:none;">超级搜索</a>
-				<span class="bidbut" onclick="window.location.href='/jylab/supsearch/index.html'">招标搜索</span>
-				{{end}}
-				<a  id="entsearch"  href="javascript:" datahref="/jylab/bidsearchforent/index.html">中标企业搜索</a>
-			</div>
 			<!--搜索-->
 			<div class="searchInput clearfix">
 				<form action="/jylab/supsearch/index.html" method="post"  id="zbSeatchT" class="clearfix" onsubmit="return beforeSubmit('F')">
@@ -531,6 +520,21 @@ function priceCss(){
 					</div>
 				</div>
 			</div>
+		
+			<!--整体页面切换tab-->
+			<div class="control-tabBtn">
+				{{if eq .T.supstatus "T"}}
+				<span class="bidbutdir" style="left:46px;"></span>
+				<a href="/jylab/supsearch/index.html" class="on">超级搜索</a>
+				<span class="bidbut" style="display:none;">招标搜索</span>
+				{{else}}
+				<span class="bidbutdir"></span>
+				<a href="#" class="on" style="display:none;">超级搜索</a>
+				<span class="bidbut" onclick="window.location.href='/jylab/supsearch/index.html'">招标搜索</span>
+				{{end}}
+				<a  id="entsearch"  href="javascript:" datahref="/jylab/bidsearchforent/index.html">中标企业搜索</a>
+			</div>
+			
 		</div>
 	</div>
 	<!--搜索头部 END-->