Merge branch 'dev2.0' of 192.168.3.17:qmx/jy into dev2.0

src/web/staticres/css/search/superSearch.css

@@ -1626,36 +1626,36 @@ body{
 	color: #686868;
 }
 #table table{
-	width: 870px;
+	width: 880px;
 	padding: 20px 20px 0px 20px;
 	display:block;
 }
-#table table>tbody>tr>td:nth-child(1){
+#table table>tbody>tr>td:nth-child(1) div{
 	width:30px;
 }
-#table table>tbody>tr>td:nth-child(2){
+#table table>tbody>tr>td:nth-child(2) div{
+	width:58px;
+}
+#table table>tbody>tr>td:nth-child(3) div{
 	width:60px;
 }
-#table table>tbody>tr>td:nth-child(3){
-	width:100px;
+#table table>tbody>tr>td:nth-child(4) div{
+	width:125px;
 }
-#table table>tbody>tr>td:nth-child(4){
+#table table>tbody>tr>td:nth-child(5) div{
 	width:160px;
 }
-#table table>tbody>tr>td:nth-child(5){
-	width:200px;
-}
-#table table>tbody>tr>td:nth-child(6){
-	width:40px;
+#table table>tbody>tr>td:nth-child(6) div{
+	width:60px;
 }
-#table table>tbody>tr>td:nth-child(7){
-	width:100px;
+#table table>tbody>tr>td:nth-child(7) div{
+	width:75px;
 }
-#table table>tbody>tr>td:nth-child(8){
-	width: 140px;
+#table table>tbody>tr>td:nth-child(8) div{
+	width: 110px;
 }
-#table table>tbody>tr>td:nth-child(9){
-	width: 40px;
+#table table>tbody>tr>td:nth-child(9) div{
+	width: 60px;
 }
 #table tr td{
 	border: 1px solid #E0E0E0;

src/web/templates/weixin/search/superSearch.html

@@ -441,7 +441,7 @@
 				//招标单位
                 var agency=list[i].agency==null?"":list[i].agency;
 				//预算
-				var budget=list[i].budget==null?"":list[i].budget/10000;
+				var budget=list[i].budget==null?"":((list[i].budget)/1000+"").substring(0,5);
 				//开标时间
 				var bidopentime=""
 				var optim=list[i].bidopentime;
@@ -454,7 +454,7 @@
 				//中标单位
 				var winner=list[i].winner==null?"":list[i].winner;
 				//中标金额
-				var bidamount=list[i].bidamount==null?"":list[i].bidamount/10000;
+				var bidamount=list[i].bidamount==null?"":(list[i].bidamount/10000+"").substring(0,5);
 				
                 ListHtml += '<div class="tslist">'
                     +'<div class="resnumb">'
@@ -474,15 +474,15 @@
                     +'</div>';
                 //
                 TableHtml +='<tr s="'+href+'"  sid="'+list[i]._id+'">'+
-                    '<td>'+index+'</td>'+
-                    '<td>'+fullTime+'</td>'+
-                    '<td>'+datatype+'公告</td>'+
-                    '<td>'+agency+'</td>'+
-                    '<td>'+projectname+'</td>'+
-					'<td>'+budget+'</td>'+
-					'<td>'+bidopentime+'</td>'+
-					'<td>'+winner+'</td>'+
-					'<td>'+bidamount+'</td>'+
+                    '<td><div>'+index+'</div></td>'+
+                    '<td><div>'+fullTime+'</div></td>'+
+                    '<td><div>'+datatype+'公告</div></td>'+
+                    '<td><div>'+agency+'</div></td>'+
+                    '<td><div>'+projectname+'</div></td>'+
+					'<td><div>'+budget+'</div></td>'+
+					'<td><div>'+bidopentime+'</div></td>'+
+					'<td><div>'+winner+'</div></td>'+
+					'<td><div>'+bidamount+'</div></td>'+
                     '</tr>'
             }
             html["ListHtml"]=ListHtml;
@@ -549,7 +549,7 @@
                 var sds = s_words.replace(/\+/g,"+");
                 myredirect(h,sid,sds);
             })
-            $("#table .content").html("<tr><td>序号</td><td>发布时间</td><td>公告类型</td><td>招标单位</td><td>项目名称</td><td>预算（万元）</td><td>开标时间</td><td>中标单位</td><td>中标金额（万元）</td></tr>");
+            $("#table .content").html("<tr><td><div>序号</div></td><td><div>发布时间</div></td><td><div>公告类型</div></td><td><div>招标单位</div></td><td><div>项目名称</div></td><td><div>预算<br>（万元）</div></td><td><div>开标时间</div></td><td>中标单位</td><td><div>中标金额<br>（万元）</div></td></tr>");
             $("#table .content").append(TableHtmlobj);
 
             if(!window.top.isBackIndex){
@@ -823,15 +823,15 @@
 			<div id="table" class="hidden">
 				<div class="data"><table class="content">
 					<tr>
-						<td>序号</td>
-						<td>发布时间</td>
-						<td>公告类型</td>
-						<td>招标单位</td>
-						<td>项目名称</td>
-						<td>预算（万元）</td>
-						<td>开标时间</td>
-						<td>中标单位</td>
-						<td>中标金额（万元）</td>
+						<td><div>序号</div></td>
+						<td><div>发布时间</div></td>
+						<td><div>公告类型</div></td>
+						<td><div>招标单位</div></td>
+						<td><div>项目名称</div></td>
+						<td><div>预算<br>（万元）</div></td>
+						<td><div>开标时间</div></td>
+						<td><div>中标单位</div></td>
+						<td><div>中标金额<br>（万元）</div></td>
 					</tr>
 				</table></div>
 				<div class="TableTip">提示：为了获得更佳的体验，推荐使用电脑浏览器访问剑鱼网站jianyu360.com查看数据表格。</div>