Merge branch 'dev' of 47.111.118.107:/srv/git/sdk into dev

Application/Sdk/Common/function.php

@@ -252,3 +252,4 @@ function re_msg($code=200,$msg='',$data=[])
     echo base64_encode(json_encode($ret));
     exit();
 }
+

Application/Sdk/Controller/PayH5Controller.class.php

@@ -751,7 +751,12 @@ ADD COLUMN `pay_url`  text NULL AFTER `check_sign`;
                 $json_data['url']='http://'.$_SERVER ['HTTP_HOST'];
             }
         }
-        redirect($json_data['url']);
+        
+        echo json_encode(array(
+        	'url' => $json_data['url']
+        ));
+        exit();
+        //redirect($json_data['url']);
     }
     
     

Application/Sdk/View/default/UserH/platform_pay.html

@@ -64,7 +64,19 @@ $(function(){
 	$("#wxpay").on('click', function() {
 		if (flag) return ;
 		flag = true;
-		window.location.href = $(this).data('url');
+		$.ajax({
+			type: "GET",
+			dataType: "json",
+			url: $(this).data('url'),
+			data: {
+				
+			},
+			success: function(r) {
+				window.location.href = r.url;
+			}
+		
+		});
+		//window.location.href = $(this).data('url');
 	});
 	
 	$('#alipaybtn').on('click',function() {

Application/Sdk/View/default/WapPay/wap_shortcut_pay.html

@@ -324,19 +324,28 @@
     var validCode=true;
     var smsstatus = true;
     function getSms() {
-        if ($("#custName").val() == '' || $("#idNo").val() == '' || $("#phoneNo").val() == '') {
-            $("#tipmsg").html('参数不能为空');
-            $("#msgdialog").show();
+        // if ($("#custName").val() == '' || $("#idNo").val() == '' || $("#phoneNo").val() == '') {
+        //     $("#tipmsg").html('参数不能为空');
+        //     $("#msgdialog").show();
+        //     return ;
+        // }
+        if(Check.trim($("#custName").val()) == ''){
+            Tip.msgShow('名字不能为空');
             return ;
         }
+        if(!Check.idcardCheck($("#idNo").val())){
+            return;
+        }
+        if(!Check.mobileCheck($("#phoneNo").val())){
+            return;
+        }
+
+
         if (!smsstatus) return;
         $("#sms").html("请求中");
         smsstatus = false;
         
         var sms=document.getElementById("sms");
-        
-    /* 	$("#bankdialog").show();
-        return ; */
         //获取短信验证码
         $.ajax({
             type: "POST",
@@ -380,7 +389,7 @@
                     // 未签约
                     // 展示未签约页面	        	
                     $("#sign_mibile").html($("#phoneNo").val());
-                    $("#bankdialog").show();
+                    Tip.bankShow();
                     sms.innerText="获取验证码";
                     smsstatus = true;
                 }  
@@ -396,7 +405,7 @@
             $("#msgdialog").show();
             $("#tipok").click(function(){
                 $("#msgdialog").hide();
-                $("#bankdialog").show();
+                Tip.bankShow();
                 $(this).off("click");
             });
             return ;
@@ -502,7 +511,6 @@
         
     var btnpay = false;
     $("#wfsubmit").click(function(){
-        
         if (btnpay == true) return ;
         var isok = true;
         //名字
@@ -530,7 +538,6 @@
         if(isok){
             btnpay = true;
             Tip.loadShow();
-            //更换表单提交方式
             $.ajax({
                 type: "POST",
                 dataType: "json",
@@ -581,7 +588,7 @@
             }
             if (tiptype == 2) {
                 $("#msgdialog").hide();
-                $("#bankdialog").show();
+                Tip.bankShow();
             }
         });
         $("#close_doalog").click(function(){
@@ -604,6 +611,11 @@
             $("#Dialog").show();
             Tip.showDom = $("#Dialog");
         },
+        bankShow:function(){
+            //自行处理
+            window.scrollTo(0, document.documentElement.clientHeight);
+            $("#bankdialog").show();
+        },
         tipHide(){
             Tip._hideShow();
         },