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

src/jfw/modules/app/src/web/templates/dataExport/dataExport_payOrder.html

@@ -551,8 +551,8 @@
 							if (email_lastVerity > 0) {
 								console.log("3333")
 								$("#sendCode").attr("disabled", true);
-								//返回后验证码可输入
-								if((sessionStorage.getItem("new_email_"+userId)!=null)&&(sessionStorage.getItem("new_email_"+userId)==email_input)){
+								//返回后验证码可输入  sessionStorage
+								if((localStorage.getItem("new_email_"+userId)!=null)&&(localStorage.getItem("new_email_"+userId)==email_input)){
 									console.log("可输入")
 									$(".verity_input").attr("readonly", false);
 								}else{
@@ -640,7 +640,7 @@
 								//sessionStorage.setItem("send_email_"+{{.T._id}}, $(".email_input").val().replace(/\s*/g,""));
 								sessionStorage.setItem("send_code_"+{{.T._id}}, Date.parse(new Date())/1000);
 								//
-								sessionStorage.setItem("new_email_"+userId,$(".email_input").val().replace(/\s*/g,""))
+								localStorage.setItem("new_email_"+userId,$(".email_input").val().replace(/\s*/g,""))
 							}
 						} else {
 							EasyAlert.show(data.errMsg, "", 3000)
@@ -789,7 +789,7 @@
 							        sessionStorage.removeItem("readClause");
 								    sessionStorage.removeItem("index");
 									sessionStorage.removeItem("pay_way");
-									sessionStorage.removeItem("new_email_"+userId);
+									localStorage.removeItem("new_email_"+userId);
 									sessionStorage.removeItem("EmailVerity_"+{{.T._id}});
 									clearInterval(interval);
 									window.location.replace("/jyapp/front/dataExport/paySuccessPage?code=" + r.orderCode+"&email="+r.email+"&payTime="+r.payTime+"&pay_way="+r.pay_way);

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

@@ -471,7 +471,7 @@
 							if(email_lastVerity>0){
 								$("#sendCode").attr("disabled", true);
 								//返回后验证码可输入
-								if((sessionStorage.getItem("new_email_"+userId)!=null)&&(sessionStorage.getItem("new_email_"+userId)==email_input)){
+								if((localStorage.getItem("new_email_"+userId)!=null)&&(localStorage.getItem("new_email_"+userId)==email_input)){
 									$(".verity_input").attr("readonly", false);
 								}else{
 									$(".verity_input").attr("readonly", true);
@@ -554,7 +554,7 @@
 								$(".sendCode").attr("disabled","disabled");
 								$(".email_input").attr("readonly",true);
 								sessionStorage.setItem("send_code_"+{{.T._id}}, Date.parse(new Date())/1000);
-								sessionStorage.setItem("new_email_"+userId,$(".email_input").val().replace(/\s*/g,""))
+								localStorage.setItem("new_email_"+userId,$(".email_input").val().replace(/\s*/g,""))
 							}
 						}else{
 							EasyAlert.show(data.errMsg,"",3000)
@@ -694,6 +694,8 @@
 							//清除我已阅读缓存
 							sessionStorage.removeItem("readClause");
 							sessionStorage.removeItem("index");
+							sessionStorage.removeItem("EmailVerity_"+{{.T._id}});
+							localStorage.removeItem("new_email_"+userId);
 							$(".toPay").attr("disabled","disabled");
 							var email_pay = sessionStorage.getItem("order_email"+{{.T._id}})
 							window.location.replace("/front/wx_dataExport/paySuccessPage?email="+email_pay+"&orderCode="+order_code+"&payTime="+res["timestamp"])
@@ -707,6 +709,7 @@
 					sessionStorage.removeItem("readClause");
 					sessionStorage.removeItem("index");
 					sessionStorage.removeItem("EmailVerity_"+{{.T._id}});
+					localStorage.removeItem("new_email_"+userId);
 				});
 			}
 			//倒计时