Merge branch 'dev2.5.1' of http://192.168.3.207:10080/qmx/jy into dev2.5.1

src/web/staticres/css/dev2/biddingSearch.css

@@ -668,13 +668,19 @@ position: absolute;
 
 #searchInner .searchControl .seaTender-inner .tabTitle .right-tabBtn {
   float: right;
-  width: 153px;
+ 
   height: 50px;
   line-height: 50px;
   background-color: transparent;
   font-size:14px;
+  display:flex;
+}
+#searchInner .right-tabBtn-superSearch{
+  width: 265px;
+}
+#searchInner .right-tabBtn-proproject{
+  width: 153px;	
 }
-
 #searchInner .searchControl .seaTender-inner .tabTitle .right-tabBtn button {
   width: 72px;
   height: 30px;
@@ -710,6 +716,22 @@ position: absolute;
   background-size: 16px 14px;
 }
 
+#searchInner .searchControl .seaTender-inner .tabTitle .right-tabBtn button:nth-of-type(3) {
+  background: transparent url("/images/biddingSearch/icons-export.png") 10px center no-repeat;
+  background-size: 18px 16px;
+}
+
+#right-export{
+	width: 100px !important;
+}
+
+#searchInner .split-line{
+	width:1px;
+	height:20px;
+	background-color:#e0e0e0;
+	margin:15px 5px 0px 5px;	
+}
+
 #searchInner .searchControl .seaTender-inner .tabContainer {
   /*列表*/
   background-color: #FFFFFF;

src/web/staticres/js/biddingSearch.js

@@ -320,8 +320,8 @@ $(function() {
 	tabListsConcrol()
 
 	function tabListsConcrol() {
-		var $tabBtn = $(".seaTender-inner  .right-tabBtn button"),
-			$controlDiv = $(".tabContainer>div"),
+		var $tabBtn = $(".seaTender-inner  .right-tabBtn button");
+			$controlDiv = $(".tabContainer>div");
 			$controlDiv_2 = $(".tabContainer-2>div");
 		$tabBtn.on("click", function() {
 			if($(this).attr("id")=="right-table"){
@@ -367,14 +367,22 @@ $(function() {
 						$("#labModal").modal("show");
 					}
 				}
-			}else{
+			}else if($(this).attr("id")=="right-list"){
 				$(this).addClass("active").siblings().removeClass("active");
 				$controlDiv.eq($(this).index()).show().siblings().hide();
 				$controlDiv_2.eq($(this).index()).show().siblings().hide();
+			}else if($(this).attr("id")=="right-export"){
+				//数据导出
+				if(!loginflag){
+					unseatflag = true;
+					$(".code-text").html('<span style="font-size:22px;margin-top:10px;display:inline-block;color:#252627;font-weight:normal;"><img id="wxpng" src="/images/wx1.png">请先微信扫码登录</span>')
+					$("#bidLogin").modal("show");
+				}else{
+					//已登录跳转订单支付页面
+					
+				}
 			}
-			
 		})
-
 	}
 
 	/*全文搜索 标题搜索 添加类名*/

src/web/templates/pc/proproject.html

@@ -501,7 +501,7 @@ $(function(){
 						<a class="active" href="javascript:;" style="width:100px;">最新拟建信息</a>
 					</li>
 				</ul>
-				<div class="right-tabBtn">
+				<div class="right-tabBtn right-tabBtn-proproject">
 					<button class="active" id="right-list">列表</button>
 					<button  id="right-table">表格</button>
 				</div>

src/web/templates/pc/supsearch.html

@@ -813,9 +813,11 @@ $(function(){
 						<a class="active" href="javascript:;" style="width:100px;">最新招标信息</a>
 					</li>
 				</ul>
-				<div class="right-tabBtn">
+				<div class="right-tabBtn right-tabBtn-superSearch">
 					<button class="active" id="right-list">列表</button>
 					<button  id="right-table">表格</button>
+					<div class="split-line"></div>
+					<button id="right-export">数据导出</button>
 				</div>
 			</div>
 			<!--tab切换内容-->