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

src/web/templates/weixin/dataExport/dataExport.html

@@ -559,6 +559,7 @@
 	        }else{
 				localStorage.winner = "";
 			}
+			console.log(filter["publishtime"])
 	        //时间
 	        if(filter["publishtime"]!=""){
 				var timeflag = true;
@@ -591,6 +592,8 @@
 				localStorage.date = "";
 	            localStorage.removeItem("export_starttime");
 	            localStorage.removeItem("export_endtime");
+				//localStorage.export_starttime = 0;//1970-01-01
+				//localStorage.export_endtime = Date.parse(new Date())/1000;
 			}
 	        if(filter["selectType"]!=null&&filter["selectType"]!=""){
 				localStorage.selectType = filter["selectType"];

src/web/templates/weixin/wxinfocontent.html

@@ -75,7 +75,7 @@ body{
 	margin:0;
 	color: #333;
 	display: none;
-	padding-bottom: 50px;
+	/*padding-bottom: 50px;*/
 }
 table {
     border-collapse: inherit !important;

src/web/templates/weixin/wxinfocontent_rec.html

@@ -19,7 +19,7 @@ body{
 	margin:0;
 	color: #333;
 	display: none;
-	padding-bottom: 50px;
+	/*padding-bottom: 50px;*/
 }
 table {
     border-collapse: inherit !important;