appjiazaizhong

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

@@ -124,7 +124,7 @@
 			    left: 0;
 			    width: 100%;
 			    background: #fff;
-			    height: 6.2rem;
+			    height: 6.5rem;
 			    z-index: 9999;
 			}
 			.pay_way .box .box_hd {
@@ -702,9 +702,11 @@
 								}, function(r) {
 									if (r.success) {
 										//更改缓存内容
+										$(".loading_").show();
 										changeCache(this_e);
 										setTimeout(function(){
 											//存缓存
+											$(".loading_").hide();
 											setSessionStorage();
 											window.location.href = "/jyapp/front/dataExport/paySuccessPage?code=" + r.orderCode+"&email="+r.email+"&payTime="+r.payTime+"&pay_way="+r.pay_way;
 										},300)

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

@@ -50,148 +50,148 @@
 		}
 		
 		
-			.pay_way .box {
-			    position: fixed;
-			    bottom: 0;
-			    left: 0;
-			    width: 100%;
-			    background: #fff;
-			    height: 6.2rem;
-			    z-index: 9999;
-			}
-			.pay_way .box .box_hd {
-			    padding: 0 .4rem;
-			    height: .88rem;
-			    line-height: .88rem;
-			    background: #F4F4F9;
-			    display: -webkit-box;
-			    display: -ms-flexbox;
-			    display: flex;
-			    -webkit-box-pack: justify;
-			    -ms-flex-pack: justify;
-			    justify-content: space-between;
-			    -webkit-box-align: center;
-			    -ms-flex-align: center;
-			    align-items: center;
-			    border-bottom: 1px solid #eee;
-			}
-			
-			 .pay_way .box .box_bd p {
-			    font-size: .32rem;
-			}
-			.pay_way .box .box_bd .zfb_label{
-				margin-bottom:.38rem;
-			}
-			 .pay_way .box .box_hd>h3 {
-			    color: #1D1D1D;
-			    font-size: .32rem;
-			}
-			.pay_way .box .box_hd .cancel {
-			    color: #2cb7ca;
-			    font-size: .32rem;
-			}
-			.pay_way .box .box_bd img {
-			    width: .8rem;
-			    height: .8rem;
-			    margin-right: .3rem;
-			}
-			.pay_way .box .box_bd .wx_label, .pay_way .box .box_bd .zfb_label {
-			    margin-top: .38rem;
-			    padding: 0 .3rem;
-			}
-			.weui-cells {
-			    margin-top: 0 !important;
-			    background-color: #fff;
-			    line-height: 1.47058824;
-			    font-size: 17px;
-			    overflow: hidden;
-			    position: relative;
-			}
-			.weui-cell:before {
-			    content: " ";
-			    position: absolute;
-			    left: 0;
-			    top: 0;
-			    right: 0;
-			    height: 1px;
-			     border-top:0px solid #e5e5e5 !important; 
-			    color: #e5e5e5;
-			    -webkit-transform-origin: 0 0;
-			    transform-origin: 0 0;
-			    -webkit-transform: scaleY(.5);
-			    transform: scaleY(.5);
-			    left: 15px;
-			    z-index: 2;
-			}
-			.pay_way .box .box_bd .weui-check:checked + .weui-icon-checked:before {
-			    color: #2cb7ca;
-			}
-			.zfje{
-				font-size: .32rem;
-			}
-			.money_pay{
-			    font-size: .50rem;
-			    text-align: center;
-			    height: 1rem;
-			    line-height: 1rem;
-			}
-			.surePay{
-				font-size: .40rem;
-			    text-align: center;
-			    height: 1rem;
-			    line-height: 1rem;
-			    background-color: #2CB7CA;
-			    color: #fff;
-			    margin-top: 0.94rem;
-			}
-			
-						/*加载中*/
-			body .loading_ {
-			    height: 100%;
-			    width: 100%;
-			    position: fixed;
-			    background: #382f3d;
-			    z-index: 999999999990;
-				opacity: .7;
-			    margin-top: 0px;
-			}
-			body .loading_ > p {
-			    position: absolute;
-			    left: 0;
-			    right: 0;
-			    top: 0;
-			    bottom: 0;
-			    margin: auto;
-			    height: 60px;
-			    width: 60px;
-			    text-align: center;
-			    line-height: 60px;
-			    font-size: 0.36rem;
-			    color: rgba(44, 183, 202, 0.8);
-			}
-			body .loading_ p span {
-			    position: absolute;
-			    display: block;
-			    height: 40px;
-			    width: 40px;
-			    margin: 10px;
-			    border-radius: 50%;
-			    -webkit-box-shadow: 0 2px 3px rgba(44, 183, 202, 0.8);
-			    animation: loading_ ease 1s infinite;
-			    left: 0;
-			    top: 0;
-			}
-			@keyframes loading_ {
-			  0% {
-			    transform: rotate(0deg); }
-			  100% {
-			    transform: rotate(360deg); } 
-			}
+		.pay_way .box {
+		    position: fixed;
+		    bottom: 0;
+		    left: 0;
+		    width: 100%;
+		    background: #fff;
+		    height: 6.5rem;
+		    z-index: 9999;
+		}
+		.pay_way .box .box_hd {
+		    padding: 0 .4rem;
+		    height: .88rem;
+		    line-height: .88rem;
+		    background: #F4F4F9;
+		    display: -webkit-box;
+		    display: -ms-flexbox;
+		    display: flex;
+		    -webkit-box-pack: justify;
+		    -ms-flex-pack: justify;
+		    justify-content: space-between;
+		    -webkit-box-align: center;
+		    -ms-flex-align: center;
+		    align-items: center;
+		    border-bottom: 1px solid #eee;
+		}
+		
+		 .pay_way .box .box_bd p {
+		    font-size: .32rem;
+		}
+		.pay_way .box .box_bd .zfb_label{
+			margin-bottom:.38rem;
+		}
+		 .pay_way .box .box_hd>h3 {
+		    color: #1D1D1D;
+		    font-size: .32rem;
+		}
+		.pay_way .box .box_hd .cancel {
+		    color: #2cb7ca;
+		    font-size: .32rem;
+		}
+		.pay_way .box .box_bd img {
+		    width: .8rem;
+		    height: .8rem;
+		    margin-right: .3rem;
+		}
+		.pay_way .box .box_bd .wx_label, .pay_way .box .box_bd .zfb_label {
+		    margin-top: .38rem;
+		    padding: 0 .3rem;
+		}
+		.weui-cells {
+		    margin-top: 0 !important;
+		    background-color: #fff;
+		    line-height: 1.47058824;
+		    font-size: 17px;
+		    overflow: hidden;
+		    position: relative;
+		}
+		.weui-cell:before {
+		    content: " ";
+		    position: absolute;
+		    left: 0;
+		    top: 0;
+		    right: 0;
+		    height: 1px;
+		     border-top:0px solid #e5e5e5 !important; 
+		    color: #e5e5e5;
+		    -webkit-transform-origin: 0 0;
+		    transform-origin: 0 0;
+		    -webkit-transform: scaleY(.5);
+		    transform: scaleY(.5);
+		    left: 15px;
+		    z-index: 2;
+		}
+		.pay_way .box .box_bd .weui-check:checked + .weui-icon-checked:before {
+		    color: #2cb7ca;
+		}
+		.zfje{
+			font-size: .32rem;
+		}
+		.money_pay{
+		    font-size: .50rem;
+		    text-align: center;
+		    height: 1rem;
+		    line-height: 1rem;
+		}
+		.surePay{
+			font-size: .40rem;
+		    text-align: center;
+		    height: 1rem;
+		    line-height: 1rem;
+		    background-color: #2CB7CA;
+		    color: #fff;
+		    margin-top: 0.94rem;
+		}
+		
+					/*加载中*/
+		body .loading_ {
+		    height: 100%;
+		    width: 100%;
+		    position: fixed;
+		    background: #382f3d;
+		    z-index: 999999999990;
+			opacity: .7;
+		    margin-top: 0px;
+		}
+		body .loading_ > p {
+		    position: absolute;
+		    left: 0;
+		    right: 0;
+		    top: 0;
+		    bottom: 0;
+		    margin: auto;
+		    height: 60px;
+		    width: 60px;
+		    text-align: center;
+		    line-height: 60px;
+		    font-size: 0.36rem;
+		    color: rgba(44, 183, 202, 0.8);
+		}
+		body .loading_ p span {
+		    position: absolute;
+		    display: block;
+		    height: 40px;
+		    width: 40px;
+		    margin: 10px;
+		    border-radius: 50%;
+		    -webkit-box-shadow: 0 2px 3px rgba(44, 183, 202, 0.8);
+		    animation: loading_ ease 1s infinite;
+		    left: 0;
+		    top: 0;
+		}
+		@keyframes loading_ {
+		  0% {
+		    transform: rotate(0deg); }
+		  100% {
+		    transform: rotate(360deg); } 
+		}
 	</style>
 		<script>
 			var pay_way="wx_app";
 			$(function(){
-				$(".loading_").hide()
+				$(".loading_").hide();
 				var filter={{.T.o.filter}};
 				if (filter){
 				    var publishtime = filter["publishtime"];
@@ -360,7 +360,7 @@
 				                }else{
 				                  JyObj.aliPay(data.data)
 				                }
-				                $('.pay_way').hide(200)
+				                $('.pay_way').hide(200);
 				                checkPaySuccess(data.order);
 							} catch (e) {
 								alert(e)
@@ -374,12 +374,11 @@
 		        var interval
 		        //支付完成跳转
 		        function checkPaySuccess(orderCode){
-		          if(interval){
-		            clearInterval(interval);
-		          }
-	         	$(".loading_").show();
-		         interval=setInterval(function() {
-		            $.post("/jyapp/dataExport/pay/isPaySuccess", {
+		        	if(interval){
+		            	clearInterval(interval);
+	        		}
+		        	interval=setInterval(function() {
+		            	$.post("/jyapp/dataExport/pay/isPaySuccess", {
 									code: orderCode
 								}, function(r) {
 									if (r.success) {
@@ -390,7 +389,6 @@
 									}
 								})
 		         	},3000)
-	         	$(".loading_").hide();
 		        }
 			});