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

src/jfw/front/dataExport.go

@@ -505,7 +505,7 @@ func (d *DataExport) ToCreateOrderPage(_id string) error {
 	}
 	//手机号
 	phone := d.GetSession("DataExportVerifyPhone_val")
-	if phone != nil {
+	if phone != nil && phone != "" {
 		d.T["phone"] = phone
 	} else {
 		if isPhone(openid) {

src/jfw/pay/weixin.go

@@ -301,12 +301,76 @@ func (p *WxPayAction) SacnPay_CreateOrder() {
 		})
 		return
 	}
+	//
+	data_spec := p.GetString("data_spec")
+	if data_spec == "standard" {
+		data_spec = "标准字段包"
+	} else if data_spec == "senior" {
+		data_spec = "高级字段包"
+	}
+	user_mail, _ := p.GetSession("DataExportVerifyEmail_val").(string)
+	user_phone, _ := p.GetSession("DataExportVerifyPhone").(string)
+	if user_phone != "" {
+		p.SetSession("DataExportVerifyPhone_val", user_phone) //提交后下次默认带出手机号
+	} else {
+		user_phone, _ = p.GetSession("DataExportVerifyPhone_val").(string)
+	}
 	//先看有没有创建过预支付订单
 	oldOrder := public.Mysql.FindOne("dataexport_order", map[string]interface{}{
 		"user_openid": openId,
 		"filter_id":   id,
-	}, "id,order_status,order_code,order_money", "")
+	}, "id,order_status,order_code,order_money,user_mail,user_phone,data_spec,prepay_time", "")
 	if oldOrder != nil {
+		if user_mail != "" && user_mail != util.ObjToString((*oldOrder)["user_mail"]) {
+			public.Mysql.Update("dataexport_order", map[string]interface{}{
+				"user_openid": openId,
+				"filter_id":   id,
+			}, map[string]interface{}{
+				"user_mail": user_mail,
+			})
+		}
+		if user_phone != "" && user_phone != util.ObjToString((*oldOrder)["user_phone"]) {
+			public.Mysql.Update("dataexport_order", map[string]interface{}{
+				"user_openid": openId,
+				"filter_id":   id,
+			}, map[string]interface{}{
+				"user_phone": user_phone,
+			})
+		}
+		if data_spec != "" && data_spec != util.ObjToString((*oldOrder)["data_spec"]) {
+			//
+			data_count := public.GetDataExportSearchCountUseId(id)
+			if data_count > public.ExConf.MsgMaxCount {
+				data_count = public.ExConf.MsgMaxCount
+			}
+			order_money_, original_price_ := float64(0), float64(0)
+			if data_spec == "标准字段包" {
+				original_price_ = float64(data_count) * public.ExConf.UnitPrice_normal
+			} else if data_spec == "高级字段包" {
+				original_price_ = float64(data_count) * public.ExConf.UnitPrice_senior
+			}
+			order_money_ = float64(original_price_) * public.ExConf.Discount
+			if order_money_ < public.ExConf.OrderMinPrice {
+				order_money_ = public.ExConf.OrderMinPrice
+			}
+			if original_price_ < public.ExConf.OrderMinPrice {
+				original_price_ = public.ExConf.OrderMinPrice
+			}
+			order_money := int(order_money_ * 100)
+			original_price := int(original_price_ * 100)
+			prepayTime, _ := time.ParseInLocation(util.Date_Full_Layout, util.ObjToString((*oldOrder)["prepay_time"]), time.Local)
+			surplus_second := prepayTime.Unix() - 7200 //价格变动  支付二维码更新成超时状态--重新生订单二维码
+			public.Mysql.Update("dataexport_order", map[string]interface{}{
+				"user_openid": openId,
+				"filter_id":   id,
+			}, map[string]interface{}{
+				"data_spec":      data_spec,
+				"order_money":    order_money,
+				"original_price": original_price,
+				"prepay_time":    util.FormatDateByInt64(&surplus_second, util.Date_Full_Layout),
+			})
+			(*oldOrder)["order_money"] = order_money
+		}
 		if util.IntAll((*oldOrder)["order_status"]) == 0 {
 			p.ServeJson(map[string]interface{}{
 				"status": "y",
@@ -322,11 +386,7 @@ func (p *WxPayAction) SacnPay_CreateOrder() {
 			return
 		}
 	}
-	//
-	user_mail, _ := p.GetSession("DataExportVerifyEmail_val").(string)
-	user_phone, _ := p.GetSession("DataExportVerifyPhone_val").(string)
 	user_mail_status := p.GetSession("EMVerifySucess").(bool)
-	data_spec := p.GetString("data_spec")
 	pay_way := p.GetString("pay_way")
 	//
 	data_count := public.GetDataExportSearchCountUseId(id)
@@ -334,11 +394,9 @@ func (p *WxPayAction) SacnPay_CreateOrder() {
 		data_count = public.ExConf.MsgMaxCount
 	}
 	order_money_, original_price_ := float64(0), float64(0)
-	if data_spec == "standard" {
-		data_spec = "标准字段包"
+	if data_spec == "标准字段包" {
 		original_price_ = float64(data_count) * public.ExConf.UnitPrice_normal
-	} else if data_spec == "senior" {
-		data_spec = "高级字段包"
+	} else if data_spec == "高级字段包" {
 		original_price_ = float64(data_count) * public.ExConf.UnitPrice_senior
 	}
 	order_money_ = float64(original_price_) * public.ExConf.Discount

src/web/templates/pc/createOrderPage.html

@@ -47,7 +47,7 @@
         <div class="guige">
             <div class="title">数据规格<i id="exp" class="iconfont icon-bangzhu"></i></div>
             <div class="inner clearfix switch-dataType">
-                <div class="bz no-select active">
+                <div class="bz no-select">
                     <p>标准字段包</p>
                     <p>
                         <del>{{.T.unitPrice_normal}}元/条</del>&nbsp;<span>{{.T.unitPrice_normal_final}}元/条</span></p>
@@ -169,10 +169,23 @@
 		//数据展示
 		var showCount=FormatNum(msgCount);
 		$(".msgCount").text(showCount);
-		
+		if (sessionStorage.getItem("order_spec"+{{.T._id}})!=null){
+			dataType = sessionStorage.getItem("order_spec"+{{.T._id}});
+		}
+		if(dataType==1){
+			$(".switch-dataType .bz").addClass("active")
+			$(".switch-dataType .gj").removeClass("active")
+		}else{
+			$(".switch-dataType .bz").removeClass("active")
+			$(".switch-dataType .gj").addClass("active")
+		}
 		ChangePayMoney();
 
-		if(email_lastInput!=""){
+		if (sessionStorage.getItem("order_email"+{{.T._id}})!=null){
+			$(".email_check_ok").show();
+			$(".email_input").val(sessionStorage.getItem("order_email"+{{.T._id}}));
+			finishEmailVerity=true;
+		}else if(email_lastInput!=""){
 			$(".email_check_ok").show();
 			$(".email_input").val(email_lastInput);
 			finishEmailVerity=true;
@@ -180,7 +193,11 @@
 		if(email_lastVerity>0){
 			sendemailTimer(email_lastVerity);
 		}
-		if(phone_lastInput!=""){
+		if (sessionStorage.getItem("order_phone"+{{.T._id}})!=null){
+			$(".phone_check_ok").show();
+			$(".phone_input").val(sessionStorage.getItem("order_phone"+{{.T._id}}));
+			finishPhoneVerity=true;
+		}else if(phone_lastInput!=""){
 			$(".phone_check_ok").show();
 			$(".phone_input").val(phone_lastInput);
 			finishPhoneVerity=true;
@@ -396,6 +413,9 @@
 			
 			$.post("/weixin/sacnPay/createOrder",param,function(data){
 				if(data.status=="y"){
+					sessionStorage.setItem("order_spec"+{{.T._id}}, dataType);
+					sessionStorage.setItem("order_email"+{{.T._id}}, $(".email_input").val().replace(/\s*/g,""));
+					sessionStorage.setItem("order_phone"+{{.T._id}}, $(".phone_input").val().replace(/\s*/g,""));
 					window.location.href="/weixin/sacnPay/waitPay?code="+data.code+"&token="+data.token;
 				}else{
 					canpay=true;

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();