zhangxinlei1996 5 лет назад
Родитель
Сommit
9c324982da

+ 20 - 6
src/jfw/front/wxMyOrder.go

@@ -445,12 +445,26 @@ func (w *WxMyOrder) WxToOrderDetail() error {
 	orderDetail["filter_id"] = util.SE.Encode2Hex(orderDetail["filter_id"].(string))
 	orderStatus := util.IntAll((orderDetail)["order_status"])
 	orderDetail["order_status"] = orderStatus
-	if orderStatus == 1 && (util.ObjToString(orderDetail["pay_way"]) == "wx_js" || util.ObjToString(orderDetail["pay_way"]) == "wx_pc") {
-		//微信订单编号
-		wxPayMap := map[string]interface{}{}
-		wxPayMap["out_trade_no"] = orderDetail["out_trade_no"]
-		wxpay := public.Mysql.FindOne("weixin_pay", wxPayMap, "", "")
-		orderDetail["transaction_id"] = (*wxpay)["transaction_id"]
+	if orderStatus == 1 {
+		orderDetail["transaction_id"] = func() string {
+			table := ""
+			payway := util.ObjToString(orderDetail["pay_way"])
+			if strings.Contains(payway, "wx") {
+				payway = "微信"
+				table = "weixin_pay"
+			} else if strings.Contains(payway, "ali") {
+				payway = "支付宝"
+				table = "ali_pay"
+			} else {
+				return ""
+			}
+			orderDetail["pay_way"] = payway
+
+			wxPayMap := map[string]interface{}{}
+			wxPayMap["out_trade_no"] = orderDetail["out_trade_no"]
+			wxpay := public.Mysql.FindOne(table, wxPayMap, "", "")
+			return util.ObjToString((*wxpay)["transaction_id"])
+		}()
 	}
 	w.T["o"] = orderDetail
 	w.Render("/weixin/dataExport/dataExport_toOrderDetail.html", &w.T)

+ 2 - 2
src/jfw/modules/app/src/app/front/myorder.go

@@ -334,9 +334,9 @@ func (m *MyOrder) ToOrderDetail() error {
 			// 0微信支付 1支付宝支付
 			if util.ObjToString(orderDetail["pay_way"]) == "wx_pc" || util.ObjToString(orderDetail["pay_way"]) == "wx_js" || util.ObjToString(orderDetail["pay_way"]) == "wx_app" {
 				table = "weixin_pay"
-				//orderDetail["pay_way"] = 0
+				orderDetail["pay_way"] = "wx"
 			} else if util.ObjToString(orderDetail["pay_way"]) == "ali_pc" || util.ObjToString(orderDetail["pay_way"]) == "ali_app" {
-				//orderDetail["pay_way"] = 1
+				orderDetail["pay_way"] = "ali"
 				table = "ali_pay"
 			} else {
 				return ""

+ 19 - 4
src/jfw/modules/app/src/web/templates/dataExport/dataExport_applyInvoice.html

@@ -178,7 +178,10 @@
 			var companyName =document.getElementById("companyName");
 			//纳税人识别正则
 			   taxNumer.onblur = function(){
-			   	 	this.scrollIntoView();
+			   	 	var target = this;
+			        setTimeout(function(){
+			            target.scrollIntoViewIfNeeded();
+			        },400);
 			    	var taxNumerValue = taxNumer.value;
 			    	var b = taxNumer_reg.test(taxNumerValue);
 				if(taxNumerValue == ""){
@@ -199,10 +202,18 @@
 				   		document.getElementById("sieve").style.backgroundColor="#90D5E1" ;
 				   		document.getElementById("sieve").style.color="#C8EAF0" ;
 				   }
-			}
+				}
+			    taxNumer.onkeyup=function(){
+	       		 	if($("#taxNumer").val()==""){
+	       		 		taxNumer.classList.remove("fontcolorred")
+	       		 	}
+	       		 }
 			//公司识别正则
 			   companyName.onblur = function(){
-			   	 	this.scrollIntoView();
+			   	 	var target = this;
+			        setTimeout(function(){
+			            target.scrollIntoViewIfNeeded();
+			        },400);
 			    	var companyNameValue = companyName.value;
 			    	var b = companyName_reg.test(companyNameValue);
 			    	if (companyNameValue == "")	{
@@ -224,7 +235,11 @@
 				   		document.getElementById("sieve").style.color="#C8EAF0" ;
 				   	}
 				}
-        
+       		 companyName.onkeyup=function(){
+       		 	if($("#companyName").val()==""){
+       		 		companyName.classList.remove("fontcolorred")
+       		 	}
+       		 }
             $(function() {
                 if ($(".type").html() == '单位') {
                     $("#unit-info").show()

+ 1 - 1
src/jfw/modules/app/src/web/templates/dataExport/dataExport_invoiceSuccess.html

@@ -2,7 +2,7 @@
 <html>
     <head>
         <meta charset="utf-8">
-        <title>提交成功</title>
+        <title>开发票</title>
         <meta name="viewport" content="initial-scale=1, maximum-scale=1">
         <meta name="apple-mobile-web-app-capable" content="yes">
         <meta name="apple-mobile-web-app-status-bar-style" content="black">

+ 6 - 6
src/jfw/modules/app/src/web/templates/dataExport/dataExport_toMyOrder.html

@@ -604,9 +604,9 @@
 												                        var keysLen = keysArr.length;for(var j=0;j<keysLen;j++){
 												                            keysHtml += "<span>" + keysArr[j] + "&nbsp</span>";
 												                        }
-												                        if(keysArr.length>2){
-												                            keysHtml += "<span>...</span>";
-												                        }
+//												                        if(keysArr.length>2){
+//												                            keysHtml += "<span>...</span>";
+//												                        }
 												                 	}else{
 												                 		keysHtml=""
 												                 	}
@@ -1146,9 +1146,9 @@
 	                        var keysLen = keysArr.length;for(var j=0;j<keysLen;j++){
 	                            keysHtml += "<span>" + keysArr[j] + "&nbsp</span>";
 	                        }
-	                        if(keysArr.length>2){
-	                            keysHtml += "<span>...</span>";
-	                        }
+//	                        if(keysArr.length>2){
+//	                            keysHtml += "<span>...</span>";
+//	                        }
 	                 	}else{
 	                 		keysHtml=""
 	                 	}

+ 4 - 3
src/jfw/modules/app/src/web/templates/dataExport/dataExport_toOrderDetail.html

@@ -523,6 +523,7 @@
 	            }
 	            return n+n2;
 	        }
+			
 		</script>		
 		<div class="app-layout-header">
 			<span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
@@ -553,13 +554,13 @@
 							<p class="text ellipsis">订单编号:{{.T.o.order_code}}</p>
 							<p class="text ellipsis">下单时间:{{.T.o.create_time}}</p>
 							<p class="text ellipsis">支付时间:{{.T.o.pay_time}}</p>
-							<p class="text ellipsis">产品类型:{{.T.o.product_type}}</p>
+							<p class="text ellipsis">产品类型:{{.T.o.product_type}}导出</p>
 							{{if ne .T.o.order_status -2}}
 							{{if .T.o.pay_time}}
-							{{if eq .T.o.pay_way "wx_js"}}        
+							{{if eq .T.o.pay_way "wx"}}        
 								<p class="text ellipsis">微信支付单号:{{.T.o.transaction_id}}</p>
 					        {{end}}
-					        {{if eq .T.o.pay_way "ali_app"}}        
+					        {{if eq .T.o.pay_way "ali"}}        
 								<p class="text ellipsis">支付宝单号:{{.T.o.transaction_id}}</p>
 					        {{end}}
 							{{end}}

+ 4 - 0
src/jfw/modules/app/src/web/templates/staticpage/dataExport_serviceterms.html

@@ -129,6 +129,9 @@
 	    top: 18px;
 	    color: #444444;
 	}
+	.paddingtop{
+		padding-top:50px;
+	}
 	</style>
 	<script>
 	$(function(){
@@ -145,6 +148,7 @@
 		<span class="app-back_ jyapp-icon jyapp-icon-zuojiantou"></span>
 		剑鱼标讯线上购买与服务条款
 	</div>
+	<div class="paddingtop"></div>
     <p>
 	<div class="MsoNormal" align="center" style="font-size:10.5pt;text-align:center;margin-bottom:20px;">
 		<b><span style="font-size: 1.5rem;line-height: 2rem;">剑鱼标讯产品与服务线上购买服务条款<span></span></span></b>

+ 13 - 13
src/web/staticres/wx_dataExport/css/order_detail.css

@@ -1,12 +1,18 @@
-.main {
-  width: 100%;
-  overflow: scroll;
+#order_detail{
+	width: 100%;
+	height: 100%;
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+	overflow: hidden;
 }
-
 .main::-webkit-scrollbar {
   display: none;
 }
-
+#order_detail .main{
+	flex: 1;
+	overflow-y: scroll;
+}
 #order_detail .main .lists {
   margin-bottom: 1.26rem;
 }
@@ -106,20 +112,14 @@
       -ms-flex: 1;
           flex: 1;
 }
-#order_detail .main .lists .button {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  z-index: 99;
+#order_detail .button {
   width: 100%;
   height: .94rem;
   line-height: .94rem;
   text-align: center;
   font-size: .36rem;
-  margin-top: .4rem;
 }
-#order_detail .main .lists .align {
+#order_detail .align {
   background: #2cb7ca;
   color: #fff;
 }

+ 11 - 2
src/web/templates/weixin/dataExport/dataExport_applyInvoice.html

@@ -175,7 +175,12 @@
 				   		document.getElementById("sieve").style.backgroundColor="#90D5E1" ;
 				   		document.getElementById("sieve").style.color="#C8EAF0" ;
 				   	}
-			}
+				}
+			   taxNumer.onkeyup=function(){
+	       		 	if($("#taxNumer").val()==""){
+	       		 		taxNumer.classList.remove("fontcolorred")
+	       		 	}
+	       		 }
 			//公司识别正则
 			   companyName.onblur = function(){
 			   		this.scrollIntoView();
@@ -200,7 +205,11 @@
 				   		document.getElementById("sieve").style.color="#C8EAF0" ;
 				   	}
 				}
-        
+	         companyName.onkeyup=function(){
+	       		 	if($("#companyName").val()==""){
+	       		 		companyName.classList.remove("fontcolorred")
+	       		 	}
+	       		 }
             $(function() {
                 if ($(".type").html() == '单位') {
                     $("#unit-info").show()

+ 1 - 1
src/web/templates/weixin/dataExport/dataExport_invoiceSuccess.html

@@ -2,7 +2,7 @@
 <html>
     <head>
         <meta charset="utf-8">
-        <title>提交成功</title>
+        <title>开发票</title>
         <meta name="viewport" content="initial-scale=1, maximum-scale=1">
         <meta name="apple-mobile-web-app-capable" content="yes">
         <meta name="apple-mobile-web-app-status-bar-style" content="black">

+ 22 - 12
src/web/templates/weixin/dataExport/dataExport_toMyOrder.html

@@ -262,10 +262,9 @@
 //									getOneMore(gopayIndex);
 //								}
 								$(".buttons-tab .tab-link").eq(typ).addClass("active").siblings().removeClass("active");
-								queryOrder(typ)
 							}else{
 								//typ=0 更改 显示已完成 
-								$(e).parent(".card-footer").parent(".card").children(".card-header").children(".status").html('<span class="status " style="color:#1d1d1d">已完成</span>');
+								$(e).parent(".card-footer").parent(".card").children(".card-header").children(".status").html('<span class=" " style="color:#1d1d1d">已完成</span>');
 								$(e).parent(".card-footer").html('<a onclick="onceMore(this)" class="btn cancle">再次购买</a>');
 								//支付过的订单 存入缓存 便于 更新数据
 //								if(JSON.parse(sessionStorage.getItem("payMsg"))){
@@ -277,8 +276,8 @@
 //									sessionStorage.setItem("payMsg",JSON.stringify(payArr));
 //								}
 							}
+							setSessionStorage();
 							setTimeout(function(){
-								setSessionStorage();
 								window.location.href="/front/wx_dataExport/paySuccessPage?email="+res["user_mail"]+"&orderCode="+res["order_code"]+"&payTime="+res["timestamp"];
 							},500)
 						}else if(r.err_msg == "get_brand_wcpay_request:cancel"){
@@ -438,14 +437,14 @@
 			}
 			
 			function setSessionStorage(){
-				if(sessionStorage){
+				//if(sessionStorage){
 //					sessionStorage.orderDataCache = JSON.stringify(dataCache);
 //					sessionStorage.orderPageIndexCache = pageIndex;
 //					sessionStorage.orderHasNextPage = hasNextPage;
 //					sessionStorage.orderCount = count;
 //					sessionStorage.orderScrollTop =scrollTop;
 					sessionStorage.orderTabActive=$("ul .active").index();
-				}
+				//}
 			}
 			
 			function onceMore(e){
@@ -583,9 +582,9 @@
 												                        var keysLen = keysArr.length;for(var j=0;j<keysLen;j++){
 												                            keysHtml += "<span>" + keysArr[j] + "&nbsp</span>";
 												                        }
-												                        if(keysArr.length>2){
-												                            keysHtml += "<span>...</span>";
-												                        }
+//												                        if(keysArr.length>2){
+//												                            keysHtml += "<span>...</span>";
+//												                        }
 												                 	}else{
 												                 		keysHtml=""
 												                 	}
@@ -818,6 +817,16 @@
 //					sessionStorage.removeItem("orderTabActive");
 //				}else{
 					//查看全部
+					
+				//解决苹果手机里面的网页返回不刷新页面的问题
+				var browserRule = /^.*((iPhone)|(iPad)|(Safari))+.*$/;
+				    if (browserRule.test(navigator.userAgent)) {
+				        window.onpageshow = function(event) {
+				            if (event.persisted) {
+				                window.location.reload()
+				            }
+				        };
+				}
 				if(sessionStorage.orderTabActive){
 					$(".buttons-tab .tab-link").eq(sessionStorage.orderTabActive).addClass("active").siblings().removeClass("active");
 					queryOrder(sessionStorage.orderTabActive);
@@ -1037,12 +1046,13 @@
 							if(obj.filter_keys && obj.filter_keys.split(",").length>0){
 								var keysHtml="";
 		                        var keysArr = obj.filter_keys.split(",");
-		                        var keysLen = keysArr.length;for(var j=0;j<keysLen;j++){
+		                        var keysLen = keysArr.length;
+		                        for(var j=0;j<keysLen;j++){
 		                            keysHtml += "<span>" + keysArr[j] + "&nbsp</span>";
 		                        }
-		                        if(keysArr.length>2){
-		                            keysHtml += "<span>...</span>";
-		                        }
+//		                        if(keysArr.length>4){
+//		                            keysHtml += "<span>...</span>";
+//		                        }
 		                 	}else{
 		                 		keysHtml=""
 		                 	}

+ 310 - 368
src/web/templates/weixin/dataExport/dataExport_toOrderDetail.html

@@ -1,99 +1,107 @@
 <!DOCTYPE html>
 <html>
+
 	<head>
 		<meta charset="utf-8">
 		<title>订单详情</title>
 		<meta name="viewport" content="initial-scale=1, maximum-scale=1">
 		<meta name="apple-mobile-web-app-capable" content="yes">
 		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js"></script>
-		<script src="{{Msg "seo" "cdn"}}/js/jquery-3.2.1.min.js"></script>
-		<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
+		<script src="{{Msg " seo " "cdn "}}/wx_dataExport/js/rem.js"></script>
+		<script src="{{Msg " seo " "cdn "}}/js/jquery-3.2.1.min.js"></script>
+		<script src="{{Msg " seo " "cdn "}}/wxswordfish/share.js?v={{Msg "seo " "version "}}"></script>
 		{{include "/common/weixin.html"}}
-		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}" />
-		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css" />
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/order_detail.css?v={{Msg "seo" "version"}}1">
+		<link rel="stylesheet" type="text/css" href="{{Msg " seo " "cdn "}}/wx_dataExport/css/base.css?v={{Msg "seo " "version "}}" />
+		<link rel="stylesheet" type="text/css" href="{{Msg " seo " "cdn "}}/wx_dataExport/iconfont/iconfont.css" />
+		<link rel="stylesheet" href="{{Msg " seo " "cdn "}}/wx_dataExport/css/order_detail.css?v={{Msg "seo " "version "}}1">
 	</head>
+
 	<body>
 		<style>
-			html, body {
-			    max-width: 750px;
-			    -webkit-text-size-adjust: 100%;
-			    margin: 0 auto;
-			    height: 100%;
-			    overflow-x: hidden;
-			    -webkit-box-sizing: border-box;
-			    box-sizing: border-box;
-			    font-size: .24rem;
-			    background: #F5F4F9 !important;
-			    color: #3d3d3d;
-			    font-family: "Microsoft YaHei","Helvetica Neue", "Roboto", "Segoe UI", "PingFang SC", "Hiragino Sans GB", sans-serif;
+			html,
+			body {
+				max-width: 750px;
+				-webkit-text-size-adjust: 100%;
+				margin: 0 auto;
+				height: 100%;
+				overflow-x: hidden;
+				-webkit-box-sizing: border-box;
+				box-sizing: border-box;
+				font-size: .24rem;
+				background: #F5F4F9 !important;
+				color: #3d3d3d;
+				font-family: "Microsoft YaHei", "Helvetica Neue", "Roboto", "Segoe UI", "PingFang SC", "Hiragino Sans GB", sans-serif;
 			}
 		</style>
 		<script>
-			initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
-			
+			initShare({{.T.signature}}, {{.T.openid}}, 2, "jy_wxmyorder", {{.T.nickname}}, {{.T.avatar}});
+
 			var signature = {{.T.signature}};
 			var isConfigSuccess = true;
 			var id = {{.T._id}}
-			if(signature && signature.length == 4){
+			if(signature && signature.length == 4) {
 				wx.config({
-				    debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来,若要查看传入的参数,可以在pc端打开,参数信息会通过log打出,仅在pc端时才会打印。
-				    appId: signature[0], // 必填,公众号的唯一标识
-				    timestamp:signature[1], // 必填,生成签名的时间戳
-				    nonceStr: signature[2], // 必填,生成签名的随机串
-				    signature: signature[3],// 必填,签名,见附录1
-				    jsApiList: ['chooseWXPay','hideAllNonBaseMenuItem'] // 必填,需要使用的JS接口列表,所有JS接口列表见附录2
+					debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来,若要查看传入的参数,可以在pc端打开,参数信息会通过log打出,仅在pc端时才会打印。
+					appId: signature[0], // 必填,公众号的唯一标识
+					timestamp: signature[1], // 必填,生成签名的时间戳
+					nonceStr: signature[2], // 必填,生成签名的随机串
+					signature: signature[3], // 必填,签名,见附录1
+					jsApiList: ['chooseWXPay', 'hideAllNonBaseMenuItem'] // 必填,需要使用的JS接口列表,所有JS接口列表见附录2
 				});
-				wx.ready(function () {
-					if(!isConfigSuccess){
+				wx.ready(function() {
+					if(!isConfigSuccess) {
 						return;
 					}
 					wx.hideAllNonBaseMenuItem();
-			    });
-				wx.error(function(res){
-				    //config信息验证失败会执行error函数,如签名过期导致验证失败,具体错误信息可以打开config的debug模式查看,也可以在返回的res参数中查看,对于SPA可以在这里更新签名。
+				});
+				wx.error(function(res) {
+					//config信息验证失败会执行error函数,如签名过期导致验证失败,具体错误信息可以打开config的debug模式查看,也可以在返回的res参数中查看,对于SPA可以在这里更新签名。
 					isConfigSuccess = false;
 				});
 			}
 			//调用微信支付接口
-			function onBridgeReady(res){
-			   	WeixinJSBridge.invoke('getBrandWCPayRequest',{
-			    		"appId": res["appId"],
-			          	"timeStamp": res["timestamp"],
-			          	"nonceStr": res["nonceStr"],
-			          	"package": res["prepayId"],
-			          	"signType": res["signType"],
-			         	"paySign": res["sign"]
+			function onBridgeReady(res) {
+				WeixinJSBridge.invoke('getBrandWCPayRequest', {
+						"appId": res["appId"],
+						"timeStamp": res["timestamp"],
+						"nonceStr": res["nonceStr"],
+						"package": res["prepayId"],
+						"signType": res["signType"],
+						"paySign": res["sign"]
 					},
-					function(r){
-				        if(r.err_msg == "get_brand_wcpay_request:ok"){
+					function(r) {
+						if(r.err_msg == "get_brand_wcpay_request:ok") {
 							//location.reload();
-							sessionStorage.setItem("paySuccess_"+{{.T.o.order_code}},1);
-							window.location.replace("/front/wx_dataExport/paySuccessPage?email="+res["user_mail"]+"&orderCode="+res["order_code"]+"&payTime="+res["timestamp"]+"&param=detail");
-						}else if(r.err_msg == "get_brand_wcpay_request:cancel"){
+							sessionStorage.setItem("paySuccess_" + {{.T.o.order_code}}, 1);
+							window.location.replace("/front/wx_dataExport/paySuccessPage?email=" + res["user_mail"] + "&orderCode=" + res["order_code"] + "&payTime=" + res["timestamp"] + "&param=detail");
+						} else if(r.err_msg == "get_brand_wcpay_request:cancel") {
 							//取消支付 可以再次支付
-							canpay=true;
+							canpay = true;
 							isReqing = false;
-						}else{
-							EasyAlert.show("系统异常,请稍微再试","",3000);
-					}
-				});
+						} else {
+							EasyAlert.show("系统异常,请稍微再试", "", 3000);
+						}
+					});
 			}
 			//
 			var isReqing = false;
-			function goPay(){
+
+			function goPay() {
 				var filterid = {{.T.o.filter_id}};
 				var token = {{.T.o.token}};
 				var id = {{.T.o.id}};
-				if(isReqing){
+				if(isReqing) {
 					return;
 				}
 				isReqing = true;
-				$.post("/front/wx_dataExport/getPayParm",{"filterid":filterid,"id":id,"token":token},function(res){
+				$.post("/front/wx_dataExport/getPayParm", {
+					"filterid": filterid,
+					"id": id,
+					"token": token
+				}, function(res) {
 					isReqing = false;
 					console.log(res)
-					if(res.status == 1){
+					if(res.status == 1) {
 						//sessionStorage.setItem("paySuccess_"+{{.T.o.order_code}},1);
 						onBridgeReady(res);
 					}
@@ -101,343 +109,296 @@
 			}
 			//提示框
 			var EasyAlert = {
-				timeout: null,
-				waitTime: 1000,
-				show: function(text,css,waitTime){
-					if(this.timeout != null){
-						clearTimeout(this.timeout);
-						this.hide();
-						this.timeout = null;
+					timeout: null,
+					waitTime: 1000,
+					show: function(text, css, waitTime) {
+						if(this.timeout != null) {
+							clearTimeout(this.timeout);
+							this.hide();
+							this.timeout = null;
+						}
+						var thisClass = this;
+						this.timeout = setTimeout(function() {
+							thisClass.hide();
+							thisClass.timeout = null;
+						}, waitTime ? waitTime : this.waitTime);
+						$("body").append('<div class="easyalert" id="easyAlert">' + text + '</div>');
+						$("#easyAlert").css({
+							"left": "50%",
+							"margin-top": -($("#easyAlert").outerHeight() / 2),
+							"margin-left": -($("#easyAlert").outerWidth() / 2)
+						}).show();
+					},
+					hide: function() {
+						$("#easyAlert").remove();
 					}
-					var thisClass = this;
-					this.timeout = setTimeout(function(){
-						thisClass.hide();
-						thisClass.timeout = null;
-					},waitTime?waitTime:this.waitTime);
-					$("body").append('<div class="easyalert" id="easyAlert">'+text+'</div>');
-					$("#easyAlert").css({"left":"50%","margin-top":-($("#easyAlert").outerHeight()/2),"margin-left":-($("#easyAlert").outerWidth()/2)}).show();
-				},
-				hide: function(){
-					$("#easyAlert").remove();
 				}
-			}
-			//
-			$(function(){
-				var filter={{.T.o.filter}};
-				if (filter){
-				    var publishtime = filter["publishtime"];
-		            var region = filter["region"];
-		            var area = filter["area"];
-		            var industry = filter["industry"];
-		            var keywords = filter["keywords"];
-		            var price = filter["minprice"];
-		            var subType = filter["subtype"];
-		            var buyer = filter["buyer"];
-		            var winner = filter["winner"];
-		            if(!publishtime){
-		                publishtime = "全部";
-		            }else{
-		            	publishtime = publishtime.replace(/\./g, "/"); //改日期格式
-		            }
-		            $(".publishTime").text(publishtime);
-		            
-		            var regionHtml = "";
-		            if (region && region.length>0){
-		                for (var i=0;i<region.length;i++){
-		                    regionHtml += "<span>" + region[i] + "&nbsp</span>";
-		                }
-		            }else if(area && area.length>0){
-		                for (var i=0;i<area.length;i++){
-		                    regionHtml += "<span>" + area[i] + "&nbsp</span>";
-		                }
-		            }else {
-		                regionHtml += "<li>全国</li>";
-		            }
-		            $(".region").append(regionHtml);
-		            
-				 	var industryHtml = "";
-			        if(industry && industry.length>0){
-			            for (var i=0;i<industry.length;i++){
-			                var d = industry[i];
-			                if (d && d.split("_").length==2){
-			                    d = d.split("_")[1];
-			                }else {
-			                    d = "";
-			                }
-			                industryHtml += "<span>" + d + "&nbsp</span>";
-			            }
-			        }else{
-			            industryHtml += "<span>全部</span>";
-			        }
-			        $(".industry").append(industryHtml);
-			        
-			        var reg = RegExp(/,/);
-			        if (keywords && keywords.length>0){
-			        	 var onek="";
-			        	 for (var i=0;i<keywords.length;i++){
-			        	 	 var keywordObj = keywords[i];
-			        	 	 var word = keywordObj["keyword"];
-			        	 	 var exclude = keywordObj["exclude"];
-		                     var excludeStr =exclude+"";
-	                    	 if(excludeStr.match(reg)){
-								excludeStr=excludeStr.replace(/,/g," ");
-							 }
-			        	 	 var appended = keywordObj["appended"];
-		                     var appendedStr =""+appended;
-		                     if(appendedStr.match(reg)){
-								appendedStr=appendedStr.replace(/,/g," ");
-							 }
-		                    onek +='<div class="item-list">'
+				//
+			$(function() {
+				var filter = {{.T.o.filter}};
+				if(filter) {
+					var publishtime = filter["publishtime"];
+					var region = filter["region"];
+					var area = filter["area"];
+					var industry = filter["industry"];
+					var keywords = filter["keywords"];
+					var price = filter["minprice"];
+					var subType = filter["subtype"];
+					var buyer = filter["buyer"];
+					var winner = filter["winner"];
+					if(!publishtime) {
+						publishtime = "全部";
+					} else {
+						publishtime = publishtime.replace(/\./g, "/"); //改日期格式
+					}
+					$(".publishTime").text(publishtime);
+
+					var regionHtml = "";
+					if(region && region.length > 0) {
+						for(var i = 0; i < region.length; i++) {
+							regionHtml += "<span>" + region[i] + "&nbsp</span>";
+						}
+					} else if(area && area.length > 0) {
+						for(var i = 0; i < area.length; i++) {
+							regionHtml += "<span>" + area[i] + "&nbsp</span>";
+						}
+					} else {
+						regionHtml += "<li>全国</li>";
+					}
+					$(".region").append(regionHtml);
+
+					var industryHtml = "";
+					if(industry && industry.length > 0) {
+						for(var i = 0; i < industry.length; i++) {
+							var d = industry[i];
+							if(d && d.split("_").length == 2) {
+								d = d.split("_")[1];
+							} else {
+								d = "";
+							}
+							industryHtml += "<span>" + d + "&nbsp</span>";
+						}
+					} else {
+						industryHtml += "<span>全部</span>";
+					}
+					$(".industry").append(industryHtml);
+
+					var reg = RegExp(/,/);
+					if(keywords && keywords.length > 0) {
+						var onek = "";
+						for(var i = 0; i < keywords.length; i++) {
+							var keywordObj = keywords[i];
+							var word = keywordObj["keyword"];
+							var exclude = keywordObj["exclude"];
+							var excludeStr = exclude + "";
+							if(excludeStr.match(reg)) {
+								excludeStr = excludeStr.replace(/,/g, " ");
+							}
+							var appended = keywordObj["appended"];
+							var appendedStr = "" + appended;
+							if(appendedStr.match(reg)) {
+								appendedStr = appendedStr.replace(/,/g, " ");
+							}
+							onek += '<div class="item-list">'
 							onek += '<label>关键词:</label>'
-							onek +='<ul class="item-list-parents">'
-							onek +='<li class="keywords">'
+							onek += '<ul class="item-list-parents">'
+							onek += '<li class="keywords">'
 							onek += word
-							onek +='</li>'
-							onek +='</ul>'
-							onek +='</div>'
-							if(appended.length!=0){
-								onek +='<div class="item-list">'
-								onek +='<label>附加词:</label>'
-								onek +='<ul class="item-list-parents">'
-								onek +='<li class="appended">'
-								onek +=appendedStr
-								onek +='</li>'
-								onek +='</ul>'
-								onek +='</div>'
-							}else{
-								onek +='<div class="item-list">'
-								onek +='<label>附加词:</label>'
-								onek +='<ul class="item-list-parents">'
-								onek +='<li class="appended">'
-								onek +='-'
-								onek +='</li>'
-								onek +='</ul>'
-								onek +='</div>'
+							onek += '</li>'
+							onek += '</ul>'
+							onek += '</div>'
+							if(appended.length != 0) {
+								onek += '<div class="item-list">'
+								onek += '<label>附加词:</label>'
+								onek += '<ul class="item-list-parents">'
+								onek += '<li class="appended">'
+								onek += appendedStr
+								onek += '</li>'
+								onek += '</ul>'
+								onek += '</div>'
+							} else {
+								onek += '<div class="item-list">'
+								onek += '<label>附加词:</label>'
+								onek += '<ul class="item-list-parents">'
+								onek += '<li class="appended">'
+								onek += '-'
+								onek += '</li>'
+								onek += '</ul>'
+								onek += '</div>'
+							}
+							if(exclude.length != 0) {
+								onek += '<div class="item-list">'
+								onek += '<label>排除词:</label>'
+								onek += '<ul class="item-list-parents">'
+								onek += '<li class="exclude">'
+								onek += excludeStr
+								onek += '</li>'
+								onek += '</ul>'
+								onek += '</div>'
+							} else {
+								onek += '<div class="item-list">'
+								onek += '<label>排除词:</label>'
+								onek += '<ul class="item-list-parents">'
+								onek += '<li class="exclude">'
+								onek += '-'
+								onek += '</li>'
+								onek += '</ul>'
+								onek += '</div>'
 							}
-							if(exclude.length!=0){
-								onek +='<div class="item-list">'
-								onek +='<label>排除词:</label>'
-								onek +='<ul class="item-list-parents">'
-								onek +='<li class="exclude">'
-								onek +=excludeStr
-								onek +='</li>'
-								onek +='</ul>'
-								onek +='</div>'
-							}else{
-								onek +='<div class="item-list">'
-								onek +='<label>排除词:</label>'
-								onek +='<ul class="item-list-parents">'
-								onek +='<li class="exclude">'
-								onek +='-'
-								onek +='</li>'
-								onek +='</ul>'
-								onek +='</div>'
+						}
+					} else {
+						onek = '<div class="item-list"><label>关键词:</label><ul class="item-list-parents"><li class="keywords">-</li></ul></div><div class="item-list"><label>附加词:</label><ul class="item-list-parents"><li class="appended">-</li></ul></div><div class="item-list"><label>排除词:</label><ul class="item-list-parents"><li class="exclude">-</li></ul></div>'
+					}
+					$("#keywords").append(onek);
+					var priceHtml = "";
+					if(price) {
+						priceHtml += "<span>" + price + "</span>";
+					} else {
+						priceHtml += "<span>全部</span>";
+					}
+					$(".money").append(priceHtml);
+
+					var subTypeHtml = "";
+					if(subType) {
+						var subTypeArr = subType.split(",");
+						for(var i = 0; i < subTypeArr.length; i++) {
+							var d = subTypeArr[i];
+							if(!d) {
+								d = "";
 							}
-			        	}
-			        }else{
-			        	onek='<div class="item-list"><label>关键词:</label><ul class="item-list-parents"><li class="keywords">-</li></ul></div><div class="item-list"><label>附加词:</label><ul class="item-list-parents"><li class="appended">-</li></ul></div><div class="item-list"><label>排除词:</label><ul class="item-list-parents"><li class="exclude">-</li></ul></div>'
-	        	 	}
-			        $("#keywords").append(onek);
-			        
-			        
-//			        keywordsHtml ="";
-//			        appendedHtml ="";
-//			        excludeHtml ="";
-//                  if (keywords && keywords.length>0){
-//		                for (var i=0;i<keywords.length;i++){
-//		                    var keywordObj = keywords[i];
-//		                    //关键词
-//		                    var word = keywordObj["keyword"];
-//		                    //附加词
-//		                    var appended = keywordObj["appended"];
-//		                    var appendedStr =""+appended;
-//							var reg = RegExp(/,/);
-//							if(appendedStr.match(reg)){
-//								appendedStr=appendedStr.replace(/,/g," ");
-//							}
-//							//排除词
-//		                    var exclude = keywordObj["exclude"];
-//		                    var excludeStr =exclude+"";
-//							console.log(excludeStr)
-//							if(excludeStr.match(reg)){
-//								excludeStr=excludeStr.replace(/,/g," ");
-//							}
-//		                    keywordsHtml +="<span>" + word + "&nbsp</span>";
-//		                    appendedHtml +="<span>" + appendedStr + "&nbsp</span>";
-//		                    excludeHtml +="<span>" + excludeStr + "&nbsp</span>";
-//		                }
-//		            }else{
-//		            	 keywordsHtml +="<p></p>";
-//		            	 appendedHtml +="<p></p>";
-//		            	 excludeHtml +="<p></p>";
-//		            }
-//		            $(".keywords").append(keywordsHtml);
-//		            $(".appended").append(appendedHtml);
-//		            $(".exclude").append(excludeHtml);
-		            
-		            var priceHtml = "";
-		            if(price){
-		                priceHtml += "<span>" + price + "</span>";
-		            }else{
-		                priceHtml += "<span>全部</span>";
-		            }
-		            $(".money").append(priceHtml);
-		            
-		            var subTypeHtml = "";
-		            if(subType){
-		                var subTypeArr = subType.split(",");
-		                for (var i=0;i<subTypeArr.length;i++){
-		                    var d = subTypeArr[i];
-		                    if (!d){
-		                        d = "";
-		                    }
-		                    subTypeHtml += "<span>" + d + "&nbsp</span>";
-		                }
-		            }else {
-		                subTypeHtml += "<span>全部</span>";
-		            }
-		            $(".subType").append(subTypeHtml);
-		            
-                    var buyerHtml = "";
-		            if(buyer && buyer.length>0){
-		                for (var i=0;i<buyer.length;i++){
-		                    buyerHtml += "<span>" + buyer[i] + "&nbsp</span>";
-		                }
-		            }else{
-		            	buyerHtml += "<span>-</span>";
-		            }
-		            $(".buyer").append(buyerHtml);
-		            
-		            var winnerHtml = "";
-		            if(winner && winner.length>0){
-		                for (var i=0;i<winner.length;i++){
-		                    winnerHtml += "<span>" + winner[i] + "&nbsp</span>";
-		                }
-		            }else{
-		            	winnerHtml += "<span>-</span>";
-		            }
-		            $(".winner").append(winnerHtml);
+							subTypeHtml += "<span>" + d + "&nbsp</span>";
+						}
+					} else {
+						subTypeHtml += "<span>全部</span>";
+					}
+					$(".subType").append(subTypeHtml);
+
+					var buyerHtml = "";
+					if(buyer && buyer.length > 0) {
+						for(var i = 0; i < buyer.length; i++) {
+							buyerHtml += "<span>" + buyer[i] + "&nbsp</span>";
+						}
+					} else {
+						buyerHtml += "<span>-</span>";
+					}
+					$(".buyer").append(buyerHtml);
+
+					var winnerHtml = "";
+					if(winner && winner.length > 0) {
+						for(var i = 0; i < winner.length; i++) {
+							winnerHtml += "<span>" + winner[i] + "&nbsp</span>";
+						}
+					} else {
+						winnerHtml += "<span>-</span>";
+					}
+					$(".winner").append(winnerHtml);
 				};
-				
+
 				//存缓存 纳税人识别号 公司名
-				if(sessionStorage.applysuccess=="1"){
+				if(sessionStorage.applysuccess == "1") {
 					$(".person_").hide()
 					$(".invoiceP").hide();
 					$(".person").show();
-					if(sessionStorage.taxNumer!=""){
+					if(sessionStorage.taxNumer != "") {
 						$(".notpersontaitou").show();
 						$(".persontaitou").hide();
-						$(".company").text("单位名称:"+sessionStorage.companyName);
+						$(".company").text("单位名称:" + sessionStorage.companyName);
 						$(".company").show();
-						$(".tax").text("纳税人识别号:"+sessionStorage.taxNumer);
+						$(".tax").text("纳税人识别号:" + sessionStorage.taxNumer);
 						$(".tax").show();
-					}else{
+					} else {
 						$(".persontaitou").show();
 					}
 					sessionStorage.removeItem("applysuccess");
 					sessionStorage.removeItem("companyName");
 					sessionStorage.removeItem("taxNumer");
-				}else{
+				} else {
 					$(".person_").show();
 				}
 			});
-			
-			
-			function FormatNum(n){
-	            var isF = /^-?\d*\.\d+$/.test(n);
-	            var n2 = "";
-	            if(isF){
-	                var t = n+"";
-	                n2 = t.substr(t.indexOf("."));
-	                n = parseInt(n);
-	            }
-	            if(n>=1000){
-	                n = Math.floor(n/1000)+","+("0000"+n%1000).slice(-3);
-	            }
-	            return n+n2;
-	            
-	           
-	        }
+
+			function FormatNum(n) {
+				var isF = /^-?\d*\.\d+$/.test(n);
+				var n2 = "";
+				if(isF) {
+					var t = n + "";
+					n2 = t.substr(t.indexOf("."));
+					n = parseInt(n);
+				}
+				if(n >= 1000) {
+					n = Math.floor(n / 1000) + "," + ("0000" + n % 1000).slice(-3);
+				}
+				return n + n2;
+
+			}
 		</script>
 		<div id="order_detail">
 			<main class="main">
 				<div class="lists">
 					<div class="card">
 						<div class="card-header">
-							<img src="/wx_dataExport/images/line.png" >
-							{{if ne .T.o.order_status -2}}
-							{{if .T.o.pay_time}}
-							<h3>已完成</h3>
-							{{else}}
-							<h3>待付款</h3>
-							{{end}}
-							{{else}}
-							<h3>已取消</h3>
-							{{end}}
-							<img src="/wx_dataExport/images/line.png" >
+							<img src="/wx_dataExport/images/line.png"> {{if ne .T.o.order_status -2}} {{if .T.o.pay_time}}
+							<h3>已完成</h3> {{else}}
+							<h3>待付款</h3> {{end}} {{else}}
+							<h3>已取消</h3> {{end}}
+							<img src="/wx_dataExport/images/line.png">
 						</div>
 						<div class="card-content font_color">
 							<p class="text ellipsis">订单编号:{{.T.o.order_code}}</p>
 							<p class="text ellipsis">下单时间:{{.T.o.create_time}}</p>
 							<p class="text ellipsis" id="payTime">支付时间:{{.T.o.pay_time}}</p>
-							<p class="text ellipsis">产品类型:{{.T.o.product_type}}</p>
-							{{if .T.o.transaction_id}}        
-							<p class="text ellipsis">微信支付单号:{{.T.o.transaction_id}}</p>
-					        {{end}}
+							<p class="text ellipsis">产品类型:{{.T.o.product_type}}导出</p>
+							{{if .T.o.transaction_id}}
+							<p class="text ellipsis">{{.T.o.pay_way}}单号:{{.T.o.transaction_id}}</p>
+							{{end}}
 							<p class="text ellipsis">数据类型:{{.T.o.data_spec}}</p>
 							<p class="text ellipsis">数据量:{{.T.o.data_count}}条</p>
-							<p class="text ellipsis">价格:<script>document.write(FormatNum({{.T.o.order_money}}))</script>元</p>
+							<p class="text ellipsis">价格:
+								<script>
+									document.write(FormatNum({{.T.o.order_money}}))
+								</script>元</p>
 							<p class="text ellipsis">邮箱地址:{{.T.o.user_mail}}</p>
 							<p class="text ellipsis">手机号:{{.T.o.user_phone}}</p>
-							{{if .T.o.order_status}}
-							{{if eq .T.o.order_status 1}}
-							{{if .T.o.applybill_status}}
-							{{if eq .T.o.applybill_status "F"}}
-							<p class="text ellipsis invoiceP">发票:<a href="/front/wxMyOrder/wxGetOrderCode/{{.T.o.order_code}}" class="invoicing">开发票</a></p>
-							{{end}}
-							{{end}}
-							{{end}}
-							{{else}}
+							{{if .T.o.order_status}} {{if eq .T.o.order_status 1}} {{if .T.o.applybill_status}} {{if eq .T.o.applybill_status "F"}}
+							<p class="text ellipsis invoiceP">发票:
+								<a href="/front/wxMyOrder/wxGetOrderCode/{{.T.o.order_code}}" class="invoicing">开发票</a>
+							</p>
+							{{end}} {{end}} {{end}} {{else}}
 							<p class="text ellipsis">发票:-</p>
 							{{end}}
-                           	
-                            <!--直接进入订单详情显示-->
-                            {{if eq .T.o.applybill_status "T"}}
-                            <div class="person_">
-                                <p class="text ellipsis"><span>发票类型:</span><span>普通发票(电子发票)</span></p>
-                                <p class="text ellipsis"><span>发票内容:</span><span>明细</span></p>
-                                {{if .T.o.applybill_status}}
-								{{if eq .T.o.applybill_status "F"}}
-								 <p class="text ellipsis">发票抬头:</p>
+
+							<!--直接进入订单详情显示-->
+							{{if eq .T.o.applybill_status "T"}}
+							<div class="person_">
+								<p class="text ellipsis"><span>发票类型:</span><span>普通发票(电子发票)</span></p>
+								<p class="text ellipsis"><span>发票内容:</span><span>明细</span></p>
+								{{if .T.o.applybill_status}} {{if eq .T.o.applybill_status "F"}}
+								<p class="text ellipsis">发票抬头:</p>
 								{{else}}
-								 <p class="text ellipsis">发票抬头:{{.T.o.applybill_type}}</p>
-								{{end}}
-								{{end}}
-								{{if .T.o.applybill_type}}
-								{{if eq .T.o.applybill_type "单位"}}
+								<p class="text ellipsis">发票抬头:{{.T.o.applybill_type}}</p>
+								{{end}} {{end}} {{if .T.o.applybill_type}} {{if eq .T.o.applybill_type "单位"}}
 								<p class="text">单位名称:{{.T.o.applybill_company}}</p>
 								<p class="text ellipsis">纳税人识别号:{{.T.o.applybill_taxnum}}</p>
-								{{end}}
-								{{end}}
-                            </div>
-                            {{end}}
-                            
-                            <!--订单成功时返回时显示-->
-                            <div class="person" style="display:none">
-                                <p class="text ellipsis"><span>发票类型:</span><span>普通发票(电子发票)</span></p>
-                                <p class="text ellipsis"><span>发票内容:</span><span>明细</span></p>
+								{{end}} {{end}}
+							</div>
+							{{end}}
+
+							<!--订单成功时返回时显示-->
+							<div class="person" style="display:none">
+								<p class="text ellipsis"><span>发票类型:</span><span>普通发票(电子发票)</span></p>
+								<p class="text ellipsis"><span>发票内容:</span><span>明细</span></p>
 								<p class="text ellipsis persontaitou" style="display:none">发票抬头:个人</p>
 								<p class="text ellipsis notpersontaitou" style="display:none">发票抬头:单位</p>
 								<p class="text  company" style="display:none"></p>
 								<p class="text ellipsis tax" style="display:none">纳税人识别号:</p>
-                            </div>
+							</div>
 						</div>
 					</div>
 					<div class="card">
 						<div class="card-header">
-							<img src="/wx_dataExport/images/line.png" >
+							<img src="/wx_dataExport/images/line.png">
 							<h3>筛选条件</h3>
-							<img src="/wx_dataExport/images/line.png" >
+							<img src="/wx_dataExport/images/line.png">
 						</div>
 						<div class="card-content">
 							<div class="item-list">
@@ -458,24 +419,6 @@
 									<li class="industry"></li>
 								</ul>
 							</div>
-							<!--<div class="item-list">
-								<label>关键词:</label>
-								<ul class="item-list-parents">
-									<li class="keywords"></li>
-								</ul>
-							</div>
-							<div class="item-list">
-								<label>附加词:</label>
-								<ul class="item-list-parents">
-									<li class="appended"></li>
-								</ul>
-							</div>
-							<div class="item-list">
-								<label>排除词:</label>
-								<ul class="item-list-parents">
-									<li class="exclude"></li>
-								</ul>
-							</div>-->
 							<div id="keywords">
 							</div>
 							<div class="item-list">
@@ -504,18 +447,17 @@
 							</div>
 						</div>
 					</div>
-					{{if ne .T.o.order_status -2}}
-					{{if .T.o.pay_time}}
-					<div class="button align bottomButton" id="buytwo" onclick="window.location.href='/front/wx_dataExport/toSieve?orderCode={{.T.o.order_code}}'">再次购买</div>
-					{{else}}
-					<div class="button align bottomButton" id="buy" onclick="goPay()">去支付</div>
-					{{end}}
-					{{else}}
-					<div class="button align bottomButton" id="buytwo" onclick="window.location.href='/front/wx_dataExport/toSieve?orderCode={{.T.o.order_code}}'">再次购买</div>
-					{{end}}
 				</div>
 			</main>
+			{{if ne .T.o.order_status -2}} {{if .T.o.pay_time}}
+			<div class="button align bottomButton" id="buytwo" onclick="window.location.href='/front/wx_dataExport/toSieve?orderCode={{.T.o.order_code}}'">再次购买</div>
+			{{else}}
+			<div class="button align bottomButton" id="buy" onclick="goPay()">去支付</div>
+			{{end}} {{else}}
+			<div class="button align bottomButton" id="buytwo" onclick="window.location.href='/front/wx_dataExport/toSieve?orderCode={{.T.o.order_code}}'">再次购买</div>
+			{{end}}
 		</div>
-	{{include "/common/baiducc.html"}}
+
+		{{include "/common/baiducc.html"}}
 	</body>
-</html>
+</html>