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

src/jfw/front/wxkeyset.go

@@ -2,7 +2,6 @@
 package front
 
 import (
-	"gopkg.in/mgo.v2/bson"
 	"jfw/wx"
 	"log"
 	"qfw/util"
@@ -10,6 +9,8 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
+	"gopkg.in/mgo.v2/bson"
 )
 
 //进入订阅词设置

src/web/templates/weixin/wxpush.html

@@ -6,6 +6,7 @@
 <link href="/wxswordfish/style.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 <script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
 <script src="/js/jquery.js"></script>
+<script src="/js/rem.js"></script>
 <script src="/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
 <style>
 	.findnull{
@@ -18,9 +19,10 @@ if(sessionStorage){
 }
 	initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avatar}});
 var b_view = "{{.T.view}}";
+var zbadd = {{Msg "seo" "ZBADDRESS"}}
+var sds = "";
 $(function(){
 	//
-	var zbadd = {{Msg "seo" "ZBADDRESS"}}
 	var width=$(window).width();
 	var height=$(window).height();
 	var s_words = {{.T.data.s_words}};
@@ -33,7 +35,14 @@ $(function(){
 	var a_type={};
 	var topstype={};
 	var substype={};
+	var projectname={};
+	var projectid={};
+	var buyer={};
 	var bmatch={{.T.data.bmatch}};
+	var tabletime = ""
+	var tabletype = ""
+	var tableptname = ""
+	var tablebuyer = ""
 	if(bmatch){
 		$(".findnull").hide();
 	}else{
@@ -58,7 +67,6 @@ $(function(){
 		jywords = a_key;
 	}
 	//
-	var sds = "";
 	for(var i=0;i<jywords.length;i++){
 		if(i==0){
 			sds +=jywords[i]
@@ -81,6 +89,17 @@ $(function(){
 		return false;
 	}
 	$("body .listcontent").prepend(s_content);
+	var tablehtml='<table>'+
+					'<thead>'+
+					'<tr>'+
+					'<td>序号</td>'+
+					'<td>发布时间</td>'+
+					'<td>公告类型</td>'+
+					'<td>招标单位</td>'+
+					'<td>项目名称</td>'+
+					'</tr>'+
+					'</thead>'+
+					'<tbody>';
 	var mark="为您预览30天之内的信息，点击标题可查看详细信息。"
 	if (window.location.href.indexOf("bidinfo") > 0){
 		mark="为您推送以下信息，点击标题可查看详细信息。"
@@ -122,18 +141,26 @@ $(function(){
 					}else{
 						tdf = '';	
 					}
+					tabletime = formatDate(a_publishtime[xh]);
 					datatype="";
 					if(substype[xh] != ""&&substype[xh] != null){
 						datatype='<span class="type">'+substype[xh]+'</span>'
+						tabletype=substype[xh]
 					}else if(topstype[xh] != ""&&topstype[xh] != null){
 						datatype='<span class="type">'+topstype[xh]+'</span>'
+						tabletype=topstype[xh]
 					}else if(a_type[xh] != ""&&a_type[xh] != null){
 						if(a_type[xh] == "tender"){
 							datatype='<span class="type">招标</span>'
+							tabletype="招标"
 						}else if(a_type[xh] == "bid"){
 							datatype='<span class="type">中标</span>'
+							tabletype="中标"
 						}
 					}
+					//console.log(tabletype+":tabletype"+"tablebuyer:"+buyer[xh]+"---"+projectname[xh])
+					tablebuyer=buyer[xh]
+					tableptname=projectname[xh]
 					if (area&&area!="" && area!="undefined"){
 						area='<span class="location">'+area+'</span>';
 					}else{
@@ -148,8 +175,20 @@ $(function(){
 			var html = $(this).find("a.bt").html();
 			html = keyWordHighlight(html,s_words.join("|").replace(/\+/gm,"|"),'<font class="keyword">$1</font>');
 			$(this).find("a.bt").html(html);
+			tableptname= keyWordHighlight(tableptname,s_words.join("|").replace(/\+/gm,"|"),'<font class="keyword">$1</font>')
 		}
+		var tableid = $(this).find("a.bt").attr("eid");
+		var tablehref = $(this).find("a.bt").attr("href");
+		tablehtml +='<tr onClick="tablejump(\''+tableid+'\',\''+tablehref+'\')">'+
+					'<td>'+xh+'</td>'+
+					'<td>'+tabletime+'</td>'+
+					'<td>'+tabletype+'公告</td>'+
+					'<td>'+tablebuyer+'</td>'+
+					'<td>'+tableptname+'</td>'+
+					'</tr>'
 	});
+	tablehtml +='</tbody></table>';
+	$("#jytables").append(tablehtml);
 	setTimeout(function(){
 			var abt=$("a.bt");
 			abt.each(function(){
@@ -172,7 +211,44 @@ $(function(){
 				return false;
 			})
 		},800);
+	//展示
+	$(".showType .showlist").click(function(){
+	    $(this).addClass("on").siblings().removeClass("on");
+		$(".listcontent").removeClass("hidden");
+		$(".tablecontent").addClass("hidden");
+	})
+	$(".showType .showTable").click(function(){
+	    $(this).addClass("on").siblings().removeClass("on");
+		$(".listcontent").addClass("hidden");
+		$(".tablecontent").removeClass("hidden");
+	})
+	//
+	$(".blue").click(function(){
+		window.location.href="/wxkeyset/keyset/seniorset"
+	})
+	
 })
+//
+function tablejump(eid,href){
+	if(eid){
+		newredirect(zbadd,href,eid,sds);
+	}
+}
+//
+function   formatDate(date)   { 
+	var myDate = new Date(date*1000);      
+    var   year=myDate.getFullYear();
+    var   month=myDate.getMonth()+1;    
+	if(month<10){
+		month="0"+month
+	} 
+    var   date=myDate.getDate();      
+	if(date<10){
+		date="0"+date
+	} 
+    return   year+" "+month+""+date;     
+} 
+//
 function open_window(link){
 	if(!/^http/.test(link)){
 		link="http://"+link
@@ -255,13 +331,113 @@ a{
 .listcontent{
 	padding:0px 10px;
 }
+.showType{
+	margin-top: 8px;
+    padding-right: 15px;
+	display: flex;
+	justify-content: space-around;
+	align-content: center;
+	float:right;
+}
+.showType div{
+	padding-left: 30px;
+}
+.showType .showlist{
+	background: url(/images/search/showList.png)10px 3px no-repeat;
+	background-size: 30%;
+    margin-right: 15px;
+	line-height: 21px;
+}
+.showType .showtable{
+	background: url(/images/search/showTable.png)10px 2px no-repeat;
+	background-size: 30%;
+    margin-left: 15px;
+	line-height: 21px;
+}
+.showType .showlist.on{
+	background: url(/images/search/showList_on.png)10px 3px no-repeat;
+	background-size: 30%;
+	color: #2cb7ca;
+}
+.showType .showtable.on{
+	background: url(/images/search/showTable_on.png)10px 2px no-repeat;
+	background-size: 30%;
+	color: #2cb7ca;
+}
+.shuxian{
+	padding: 0px !important;
+    margin-right: -10px;
+}
+#jytables{
+	/*不需要可自己删除*/
+	padding: .2rem;
+}
+#jytables table{
+	width: 100%;
+	border-collapse: collapse;
+}
+#jytables table td {
+	padding: .3rem 0;
+	border: 1px solid #E0E0E0;
+	text-align: center;
+	vertical-align: middle;
+}
+#jytables table thead{
+	font-size: .28rem;
+	color: #686868;
+}
+#jytables table tbody{
+	font-size: .3rem;
+	color: #1d1d1d;
+}
+/*高亮字体*/
+#jytables table span.higHlight{
+	color: #2cb7ca;
+}
+.tablecontent{
+	width: 100%;
+    overflow-x: scroll;
+}
+#jytables{
+	width: 140%;
+}
+#jytables thead>tr>td:nth-child(1){
+	width:30px;
+}
+#jytables tbody>tr>td:nth-child(2),#jytables tbody>tr>td:nth-child(3){
+	width:70px;
+}
+#jytables tbody>tr>td:nth-child(4){
+	width:170px;
+}
+#jytables tbody>tr>td:nth-child(5){
+	width:180px;
+}
+.prompt{
+	padding:10px 10px 20px;
+	position:absolute;
+}
+.blue{
+	color:#0987ff;
+}
 </style>
 </head>
 
 <body>
 <div></div>
-<div class=""></div>
+<div class="showType">
+	<div class="showlist on">列表</div>
+	<div class="shuxian">|</div>
+	<div class="showtable">表格</div>
+</div>
+<div style="height:37px;border-bottom:1px solid #ddd;border-top: 1px solid #ddd;"></div>
 <div class="listcontent"></div>
+<div class="tablecontent hidden">
+	<section id="jytables">
+		
+	</section>
+	<div class="prompt">提示：为了获得更佳的体验，推荐<span class="blue">打开邮件推送</span>，用电脑查看邮件中的表格。</div>
+</div>
 <span class=" text-center findnull">
 <div>
 <img style="width:200px;margin:100px 0 50px 0;" src="/images/wx/jysorry.png">