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

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

@@ -263,6 +263,7 @@
                 }
                 
                 //软键盘弹起 
+				/*
 				var oHeight = $(document).height(); //浏览器当前的高度
 				var mainHeight=$("form").height();
 				
@@ -273,6 +274,7 @@
 					    $("#bottombox").css("position","fixed");
 					}
 			   	});
+				*/
             })
             $(document).on("click", ".fp", function() {
                 $.actions({

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

@@ -715,7 +715,7 @@
 					                }
 									canpay=true;
 					                $('.pay_way').hide(200)
-					                checkPaySuccess_vip(data.order);
+					                checkPaySuccess_vip(orderCode);
 			            	}
 	            		})
 						$(".loading_").hide();
@@ -783,12 +783,15 @@
 					}
 					$(".loading_").show();
 					interval_vip=setInterval(function(){
-						$.post("jyapp/isPaySuccess",{code:order_vipcode},function(r){
+						$.post("/jypay/isPaySuccess",{code:order_vipcode},function(r){
 							if(r.success){
-								clearInterval(interval_vip);
-								$(".loading_").hide();
-								setSessionStorage();	
-								window.location.href="/jyapp/vipsubscribe/toPaySuccessPage?orderCode="+order_vipcode;
+								$(".loading_").show();
+								setTimeout(function(){
+									$(".loading_").hide();
+									setSessionStorage();	
+									window.location.href="/jyapp/vipsubscribe/toPaySuccessPage?orderCode="+order_vipcode;
+									clearInterval(interval_vip);
+								})
 							}
 						})
 					},3000)

src/jfw/modules/app/src/web/templates/vipsubscribe/vip_order_detail.html

@@ -524,19 +524,14 @@
 	        $(".button.align").css("display","").on("click",function(){//显示去支付按钮
 	         	$("#pay_way").show();
 				if(localStorage.getItem(orderCode)=="wx"){
-							  $(".line_payway").css("display","");
-							  $(".payWay").text("微信支付");
-							  pay_way="wx_app"
-							  $("#wx").prop("checked",true);
-							  $("#zfb").prop("checked",false);
+				  pay_way="wx_app"
+				  $("#wx").prop("checked",true);
+				  $("#zfb").prop("checked",false);
 				}else if (localStorage.getItem(orderCode)=="ali"){
-							  $(".payWay").text("支付宝支付");
-							  $(".line_payway").css("display","");
-							  $("#wx").prop("checked",false);
-							  $("#zfb").prop("checked",true);
-							  pay_way="ali_app"
-				}else{
-					}
+				  $("#wx").prop("checked",false);
+				  $("#zfb").prop("checked",true);
+				  pay_way="ali_app"
+				}
 	        })
         }else if (r.data.order.order_status==1){
           $("#pageTitle").text("已完成");