瀏覽代碼

修改订单页面

zhangxinlei1996 5 年之前
父節點
當前提交
3825491eb4

+ 44 - 6
src/jfw/modules/app/src/web/templates/dataExport/dataExport_payOrder.html

@@ -24,6 +24,17 @@
 		.weui-check__label:active {
 		    background-color: #fff;
 		}
+		.app-layout-header>.app-back_{
+			position: absolute;
+		    font-size: 19px;
+		    padding-top: 20px;
+		    padding-left: 11px;
+			padding-right: 40px;
+		    padding-bottom: 7px;
+		    left: 0px;
+		    top: 18px;
+			color: #444444;
+		}
 		</style>
 	</head>
   <body>
@@ -31,7 +42,7 @@
 		<p><span></span></p>
 	</div>
 	<div class="app-layout-header">
-		<span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
+		<span class="app-back_ jyapp-icon jyapp-icon-zuojiantou"></span>
 		数据导出
 	</div>
 	<div id="pay_order">
@@ -280,6 +291,18 @@
 				$(".pay_before").text("¥" + beforePay)
 			}
 			$(function() {            	
+				//返回键
+					$(".app-layout-header .app-back_").unbind("tap").on("tap",function(){
+							setTimeout(function(){
+								window.history.back();
+							},300)
+					});
+				if(sessionStorage.pay_way){
+					if(sessionStorage.pay_way=="ali_app"){
+						$(".payment").text("支付宝支付");
+					}
+				}
+				
 				if(sessionStorage.index=="1"){
             		$(".choose .choose-item").eq(sessionStorage.index).addClass("active").siblings().removeClass("active");
             		dataType=2;
@@ -324,6 +347,12 @@
 				//
 				$('#choose_way').click(function() {
 					$('.pay_way').slideDown('slow')
+					if(sessionStorage.pay_way=="ali_app"){
+						$("#zfb").prop("checked",true);
+						$("#wx").prop("checked",false);
+						 pay_way=sessionStorage.pay_way;
+					}
+						sessionStorage.removeItem("pay_way");
 				})
 				/* 选择支付方式*/
 				$('input:radio[name="way"]').click(function() {
@@ -334,6 +363,7 @@
 			            pay_way="ali_app";
 			          }
 					$('.pay_way').hide(200)
+					sessionStorage.pay_way=pay_way;
 					$('.payment').html(checkValue)
 				});
 				$(".cancel").click(function() {
@@ -572,18 +602,23 @@
 				$(".toPay").on("click", function() {
 					if (!finishEmailVerity || !readClause || !canpay || !finishPhoneVerity) {
 						return
-					}else{
-				      //清除我已阅读缓存
-				      sessionStorage.removeItem("readClause");
-					  sessionStorage.removeItem("index");
-				     }
+					}
+//					}else{
+//				      //清除我已阅读缓存
+//				      sessionStorage.removeItem("readClause");
+//					  sessionStorage.removeItem("index");
+//				     }
 					$(".loading_").show();
 					canpay = false;
 					var param = {};
 					param.pay_way = pay_way;
+					if (sessionStorage.pay_way){
+						param.pay_way=sessionStorage.pay_way;
+					}
 					param.data_spec = dataType == 2 ? "senior" : "standard";
 					param.id = {{.T._id}}
 					console.log(param.id)
+					alert(param.pay_way);
 					param.sourcePage = "weixin"
 					//先去创建预支付订单
 					/*-----------------*/
@@ -595,6 +630,9 @@
 				                }else{
 				                  JyObj.aliPay(data.data)
 				                }
+				                 //清除我已阅读缓存
+						      sessionStorage.removeItem("readClause");
+							  sessionStorage.removeItem("index");
 				                checkPaySuccess(data.order)
 							} catch (e) {
 								alert(e)

+ 2 - 2
src/web/staticres/wx_dataExport/css/pay_order.css

@@ -1,6 +1,6 @@
 .main {
-  width: 100%;
-  overflow: scroll;
+  /*width: 100%;*/
+  /*overflow: scroll;*/
 }
 
 .main::-webkit-scrollbar {

+ 1 - 1
src/web/templates/weixin/dataExport/dataExport_payOrder.html

@@ -10,7 +10,7 @@
         <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
         <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}" />
         <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
-        <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/pay_order.css?v={{Msg "seo" "version"}}22">
+        <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/pay_order.css?v={{Msg "seo" "version"}}33">
         <script src="{{Msg "seo" "cdn"}}/js/jquery-3.2.1.min.js"></script>
         <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/weui.min.js"></script>
 		{{include "/common/weixin.html"}}