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

@@ -123,7 +123,7 @@
                     <div class="form-control" style="display: none;border-top: 1px solid #e0e0e0;margin-top: 0.06rem;">
 <!--                            <label for="">验证码：</label>-->
                         <div class="input" id="codeinput">
-                            <input id="yzm" type="text" value="" readonly=true class="verity_input" id="code" maxlength="6" placeholder="验证码">
+                            <input type="text" value="" readonly=true class="verity_input" id="code" maxlength="6" placeholder="验证码">
 				<div id="devinput">
 					<i class="icon iconfont code_check_ok"></i>
 					<span class="code_err_msg">验证码错误</span>
@@ -474,12 +474,6 @@
 					$(".email_check_ok").hide();
 					$(".email_err_msg").hide();
 				});
-			   	//验证码
-//			   	$("#yzm").on("focus",function(){
-//			   		var mainh=$(".main").height()
-//			   		console.log(mainh+"----"+mainh/2)
-//			   		  $("#yzm").scrollTop(mainh/2);
-//			   	})
 				//点击发送验证码-邮箱验证
 				var canVerify = true;
 				$(".sendCode").on("click", function() {
@@ -544,6 +538,9 @@
 					} else {
 						$(".email_err_msg").hide();
 					}
+					//防遮挡
+				}).on("focus",function(){
+			   		  this.scrollIntoView();
 				})
 
 				//点击阅读条款

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

@@ -516,6 +516,9 @@
 					}else{
 						$(".email_err_msg").hide();
 					}
+					//防遮挡
+				}).on("focus",function(){
+			   		  this.scrollIntoView();
 				})
 				
 				//点击阅读条款