修改数据导出邮箱展示

src/jfw/front/dataExport.go

@@ -484,8 +484,6 @@ func (d *DataExport) ToCreateOrderPage(_id string) error {
 		"data_count": msgCount, //匹配到的数据总数 int
 	})
 	//邮箱验证
-	//	d.DelSession("DataExportVerifyEmail_val")
-	//	d.DelSession("DataExportVerifyPhone_val")
 	email := d.GetSession("DataExportVerifyEmail_val")
 	resPhone := d.GetSession("DataExportVerifyPhone_val")
 	if email != nil {

src/jfw/front/front.go

@@ -606,6 +606,8 @@ func (f *Front) SignOut() error {
 	f.DelSession("openid")
 	f.DelSession("s_m_openid")
 	f.DelSession("userId")
+	f.DelSession("DataExportVerifyEmail_val")
+	f.DelSession("DataExportVerifyPhone_val")
 	f.ServeJson("ok")
 	//sess := f.GetSession("user")
 	//if user, ok := sess.(map[string]interface{}); ok {

src/jfw/pay/dataExportPay.go

@@ -74,7 +74,7 @@ func (p *DataExportPayAction) SacnPay_WaitPay() error {
 					}
 				}
 			} else if pay_way == "支付宝" {
-				payOutTime := now.Add(time.Minute * 2)
+				payOutTime := now.Add(time.Hour * 2)
 				if qr_url, tradeno, err := Alipay.GetPayUrl(util.Float64All(orderMoney), util.FormatDate(&payOutTime, util.Date_Full_Layout)); err == nil {
 					if public.Mysql.Update("dataexport_order", map[string]interface{}{
 						"id": orderid,
@@ -123,7 +123,7 @@ func (p *DataExportPayAction) SacnPay_CreateOrder() {
 	} else if data_spec == "senior" {
 		data_spec = "高级字段包"
 	}
-	user_mail_status := p.GetSession("EMVerifySucess").(bool)
+	user_mail_status := util.ObjToString(p.GetSession("DataExportVerifyEmail_val")) != ""
 	pay_way := p.GetString("pay_way")
 	if pay_way == "weixin" {
 		pay_way = "微信"
@@ -306,7 +306,7 @@ func (p *DataExportPayAction) SacnPay_CreateOrder() {
 			}
 		} else if pay_way == "支付宝" {
 			now := time.Now()
-			payOutTime := now.Add(time.Minute * 2)
+			payOutTime := now.Add(time.Hour * 2)
 			if qr_url, tradeno, err := Alipay.GetPayUrl(util.Float64All(order_money), util.FormatDate(&payOutTime, util.Date_Full_Layout)); err == nil {
 				ordercode := public.GetOrderCode(openId)
 				orderid := public.Mysql.Insert("dataexport_order", map[string]interface{}{

src/web/templates/pc/createOrderPage.html

@@ -189,18 +189,10 @@
 			$(".email_check_ok").show();
 			$(".email_input").val(sessionStorage.getItem("order_email"+{{.T._id}}));
 			finishEmailVerity=true;
-		}else{
-      if(sessionStorage.getItem("order_email_emailVerity")){
-        $(".email_input").val(sessionStorage.getItem("order_email_emailVerity"));
-        $(".verity_input").show();
-        $(".sendEmail").show();
-      }else{
-        if(email_lastInput!=""){
-          $(".email_check_ok").show();
-  			  $(".email_input").val(email_lastInput);
-  			  finishEmailVerity=true;
-        }
-      }		
+		}else if(email_lastInput!=""){
+      $(".email_check_ok").show();
+		  $(".email_input").val(email_lastInput);
+		  finishEmailVerity=true;	
 		}
 		if(email_lastVerity>0){
 			sendemailTimer(email_lastVerity);
@@ -322,8 +314,6 @@
 			$.post("/front/dataExport/sendMailVerify",{"email":email},function(data){
 				canVerify=true;
 				if(data.success){
-          sessionStorage.setItem("order_email_emailVerity",email);
-          sessionStorage.removeItem("order_email"+{{.T._id}});
 					if(data.errCode==4){
 						$(".type-a").text(data.errMsg);
 						$(".type-a").show();
@@ -360,7 +350,6 @@
 			if(verity.length==6){
 				$.post("/front/dataExport/checkMailVerify",{"emailVerity":verity,"email":email},function(data){
 					if(data.success){
-            sessionStorage.setItem("order_email_emailVerity","")
 						showEmailErr("");
 						finishEmailVerity=true;
 						if(readClause&&finishPhoneVerity){