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

src/jfw/modules/app/src/app/front/swordfish.go

@@ -843,13 +843,6 @@ func getHistorypush(lasttime, infotime int64, openid string, res []map[string]in
 	date := util.Int64All(lasttime)
 	//	log.Println("date", date)
 	if date > 0 {
-		//		go ca.SaveCache("jy_pushvisit", map[string]interface{}{
-		//			"openid": openid,
-		//			"pdate":  date,
-		//			"vsid":   "-1", //打开列表页，无sid默认为-1
-		//			"date":   time.Now(),
-		//			"isopen": true,
-		//		})
 		//获取已浏览记录
 		visited := ca.Search("select vsid from jy_pushvisit where openid=? and pdate<? limit 100", openid, date)
 		vsidList := []string{}

src/jfw/modules/app/src/web/templates/weixin/historypush.html

@@ -37,6 +37,39 @@ function afterJyObjInit(){
 	redSpotOnMenu({{session "s_m_openid"}});
 }
 function initpage(){
+	$.ajax({
+		type: 'post',
+		url: '/jyapp/front/hasPushHistory?t='+new Date().getTime(),
+		data: {},
+		async: false,
+		dataType: 'json',
+		success: function(data){
+			success = data.success;
+			lasttime = data.thistime;
+			firstPage = data.data;
+			if(data.data.length>0){
+				a_visitedindex = data.data[0].a_visitedindex;
+			}
+			if(!success && !data.haskey){
+				if(sessionStorage&&(sessionStorage.keysetindexToHistory=="1"||sessionStorage.keysetindexToHistory=="2"||sessionStorage.keysetindexToHistory=="3")){
+					sessionStorage.removeItem("keysetindexToHistory");
+				}else{
+					history.pushState({},"","");
+					if(data.isInTSguide){
+						if(localStorage){
+							localStorage.removeItem("tsGuide_status");
+						}
+						window.location.href='/jyapp/tenderSubscribe/guide';
+					}else{
+						window.location.href='/jyapp/wxkeyset/keyset/index';
+					}
+				}
+			}
+		},
+		error: function(xhr, type){
+			hasNoData();
+		}
+	});
 	new FastClick(document.body);
 	$("#gotosetpage").click(function(){
 		setSessionStorage();
@@ -86,7 +119,7 @@ function initpage(){
 			noMoreData(wxflag,1);
 		}
 		$(window).scrollTop(scrollTop);
-		sessionStorage.removeItem("historypushDataCache");
+		// sessionStorage.removeItem("historypushDataCache");
 		sessionStorage.removeItem("historypushListCache");
 		sessionStorage.removeItem("historypushTableCache");
 		sessionStorage.removeItem("historypushLasttimeCache");
@@ -95,39 +128,39 @@ function initpage(){
 		sessionStorage.removeItem("historypushCount");
 		localStorage.removeItem("listortable"+{{.T._id}},"T");
 	}else{
-		$.ajax({
-			type: 'post',
-			url: '/jyapp/front/hasPushHistory?t='+new Date().getTime(),
-			data: {},
-			async: false,
-			dataType: 'json',
-			success: function(data){
-				success = data.success;
-				lasttime = data.thistime;
-				firstPage = data.data;
-				if(data.data.length>0){
-					a_visitedindex = data.data[0].a_visitedindex;
-				}
-				if(!success && !data.haskey){
-					if(sessionStorage&&(sessionStorage.keysetindexToHistory=="1"||sessionStorage.keysetindexToHistory=="2"||sessionStorage.keysetindexToHistory=="3")){
-						sessionStorage.removeItem("keysetindexToHistory");
-					}else{
-						history.pushState({},"","");
-						if(data.isInTSguide){
-							if(localStorage){
-								localStorage.removeItem("tsGuide_status");
-							}
-							window.location.href='/jyapp/tenderSubscribe/guide';
-						}else{
-							window.location.href='/jyapp/wxkeyset/keyset/index';
-						}
-					}
-				}
-			},
-			error: function(xhr, type){
-				hasNoData();
-			}
-		});
+		// $.ajax({
+		// 	type: 'post',
+		// 	url: '/jyapp/front/hasPushHistory?t='+new Date().getTime(),
+		// 	data: {},
+		// 	async: false,
+		// 	dataType: 'json',
+		// 	success: function(data){
+		// 		success = data.success;
+		// 		lasttime = data.thistime;
+		// 		firstPage = data.data;
+		// 		if(data.data.length>0){
+		// 			a_visitedindex = data.data[0].a_visitedindex;
+		// 		}
+		// 		if(!success && !data.haskey){
+		// 			if(sessionStorage&&(sessionStorage.keysetindexToHistory=="1"||sessionStorage.keysetindexToHistory=="2"||sessionStorage.keysetindexToHistory=="3")){
+		// 				sessionStorage.removeItem("keysetindexToHistory");
+		// 			}else{
+		// 				history.pushState({},"","");
+		// 				if(data.isInTSguide){
+		// 					if(localStorage){
+		// 						localStorage.removeItem("tsGuide_status");
+		// 					}
+		// 					window.location.href='/jyapp/tenderSubscribe/guide';
+		// 				}else{
+		// 					window.location.href='/jyapp/wxkeyset/keyset/index';
+		// 				}
+		// 			}
+		// 		}
+		// 	},
+		// 	error: function(xhr, type){
+		// 		hasNoData();
+		// 	}
+		// });
 		if(!success){
 			hasNoData();
 			return;
@@ -500,7 +533,7 @@ function beforeJump(eid,h,sds){
 		if(dataCache[i].a_visitedindex.length>0){
 			visitedArr = dataCache[i].a_visitedindex;
 			if(JSON.stringify(visitedArr).indexOf(eid)<0){
-				dataCache[i].a_visitedindex = visitedArr.push(eid)
+				dataCache[i].a_visitedindex = visitedArr.push(eid);
 			}
 		}
 	}
@@ -520,7 +553,7 @@ function setSessionStorage(){
 }
 
 function setVisitedIndex(obj,eid){
-	console.log(obj.hasClass("visited")+"--------");
+	// console.log(obj.hasClass("visited")+"--------");
 	if(obj.find("a.bt").hasClass("visit")||obj.hasClass("visited")){
 		return;
 	}

src/web/templates/pc/dataExport_invoice.html

@@ -1,13 +1,16 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="UTF-8">
     <meta name="viewport"
           content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
+		
+	<link rel="stylesheet" href="/dataExport/css/order_twoleave.css">
+	<link rel="stylesheet" href="//at.alicdn.com/t/font_624651_pkolpjt0k5a.css">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/dataExport/css/font_624651_bjdvktmum68.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/dataExport/css/reset_pc.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/dataExport/css/drder_details.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/dataExport/css/reset_pc.css?v={{Msg "seo" "version"}}"><!--
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/dataExport/css/drder_details.css?v={{Msg "seo" "version"}}">-->
 	
     {{include "/common/pnc.html"}}
     <link href="{{Msg "seo" "cdn"}}/css/pc.css?v={{Msg "seo" "version"}}" rel="stylesheet">
@@ -17,9 +20,7 @@
 
     <link href="//cdn.bootcss.com/jquery-confirm/3.1.0/jquery-confirm.min.css" rel="stylesheet">
     <script src="//cdn.bootcss.com/jquery-confirm/3.1.0/jquery-confirm.min.js"></script>
-	
-	<link rel="stylesheet" href="/dataExport/css/order_twoleave.css">
-	<link rel="stylesheet" href="//at.alicdn.com/t/font_624651_pkolpjt0k5a.css">
+
     <title>订单详情-申请发票</title>
     <style type="text/css">
          #order_two .nav a {
@@ -30,9 +31,9 @@
         }
         .demo--label{cursor: pointer;display:inline-block;}
         .demo--radio{display:none}
-        .demo--radioInput{background-color:#fff;border:1px solid rgba(0,0,0,0.15);border-radius:100%;display:inline-block;height:12px;margin-right:10px;margin-top:-1px;vertical-align:middle;width:12px;line-height:1}
+        .demo--radioInput{background-color:#fff;border:1px solid rgba(0,0,0,0.15);border-radius:100%;display:inline-block;height:12px;margin-right:10px;margin-top:-1px;vertical-align:middle;width:12px;line-height:1;box-sizing: content-box;}
         .demo--radio:checked + .demo--radioInput {border-color: #2eb8ca;}
-        .demo--radio:checked + .demo--radioInput:after{background-color:#2eb8ca;border-radius:100%;content:"";display:inline-block;height:6px;margin: 0px 3px 3px 2px;width:6px;margin-bottom: 3.5px;}
+        .demo--radio:checked + .demo--radioInput:after{background-color:#2eb8ca;border-radius:100%;content:"";display:inline-block;height:6px;width:6px;margin:3px}
         .demo--checkbox.demo--radioInput,.demo--radio:checked + .demo--checkbox.demo--radioInput:after{border-radius:0}
         .demo--label + .demo--label {
             margin-left: 28px;
@@ -163,7 +164,7 @@
         /* --end-- */
     </style>
 </head>
-<body style="background-color: #fff !important;">
+<body style="background-color: #fff !important;" >
 {{include "/common/pchead.html"}}
 <section id="order_two" class="w">
     <div class="nav" style="margin-top: 80px;">
@@ -255,7 +256,7 @@
 <script>
     var companyName_reg = /^(?![0-9]+$)(?![a-zA-Z]+$)[\u4e00-\u9fa5a-zA-Z0-9]{4,}$/;
 	//var taxNumer_reg = /^[0-9LX]{15}$|^[0-9LX]{18}$|^[0-9LX]{20}$/
-	var taxNumer_reg =/^[0-9A-Z]{18}$/
+	var taxNumer_reg =/^[0-9A-Z]{18}$/;
 
 $(function(){
         selcetIndexNav(4);
@@ -311,7 +312,7 @@ var companyName =document.getElementById("companyName");
 
 function updateAjax(){
 	var formParam =$("#saveinvoice").serialize();
-	var submitBl =false
+	var submitBl =false;
 	
 	var companyName = $("#companyName").val();
 	var taxNumer = $("#taxNumer").val();

src/web/templates/weixin/historypush.html

@@ -332,7 +332,6 @@ function structureHtml(object){
 		var $list = $(this).find(".bt").attr("eid");
 		if (typeof (a_visitedindex) != "undefined") {
 			var xh = $(this).find(".xh").text().replace(".", "");
-			// console.log(xh);
 			for (var i = 0; i < a_visitedindex.length; i++) {
 				if (xh == a_visitedindex[i]) {
 					tableVisit="visited";
@@ -488,7 +487,7 @@ function beforeJump(eid,h,sds){
 		if(dataCache[i].a_visitedindex.length>0){
 			visitedArr = dataCache[i].a_visitedindex;
 			if(JSON.stringify(visitedArr).indexOf(eid)<0){
-				dataCache[i].a_visitedindex = visitedArr.push(eid)
+				dataCache[i].a_visitedindex = visitedArr.push(eid);
 			}
 		}
 	}