zhangxinlei1996 6 жил өмнө
parent
commit
725f319dff

+ 3 - 3
src/jfw/modules/app/src/web/templates/dataExport/dataExport_toMyOrder.html

@@ -151,8 +151,8 @@
 			    color: #1D1D1D;
 			    font-size: .32rem;
 			}
-			.pay_way .box .box_bd p {
-			    font-size: .32rem;
+			.pay_way .box .box_bd .zfb_label{
+				margin-bottom:.38rem;
 			}
 			.pay_way .box .box_hd .cancel {
 			    color: #2cb7ca;
@@ -452,7 +452,7 @@
 			                                	}
 			                                    self.remove();
 			                                    $.alert({
-			                                        title:"",
+			                                        title:"提示信息",
 			                                        content:"取消成功!",
 			                                        buttons: {
 			                                            ok: {

+ 8 - 5
src/jfw/modules/app/src/web/templates/dataExport/dataExport_toOrderDetail.html

@@ -78,14 +78,14 @@
 			
 			 .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_bd p {
-			    font-size: .32rem;
-			}
 			.pay_way .box .box_hd .cancel {
 			    color: #2cb7ca;
 			    font-size: .32rem;
@@ -403,7 +403,10 @@
 				$(".param_id").text(param_id);
 			}
 			
-				
+			//再次购买
+			function payAgain(){
+				window.location.href="/jyapp/front/dataExport/toSieve";
+			}
 			
 			function FormatNum(n){
 	            var isF = /^-?\d*\.\d+$/.test(n);
@@ -571,7 +574,7 @@
 						</div>
 					</div>
 					{{if .T.o.pay_time}}
-					<div class="button align">再次购买</div>
+					<div class="button align" onclick="payAgain()">再次购买</div>
 					{{else}}
 					<div class="button align" onclick="choosePayWay({{.T.o.order_money}},{{.T.o.data_spec}},{{.T.o.filter_id}},this)" >去支付</div>
 					{{end}}

+ 87 - 4
src/web/templates/weixin/dataExport/dataExport_toMyOrder.html

@@ -27,6 +27,7 @@
 			}
 			.jconfirm-content{
 				font-size: 14px;
+				text-align:center;
 			}
 			.jconfirm-buttons >.btn-primary-0{
 				color: #fff;
@@ -89,6 +90,88 @@
 			#order_list{
 				/*margin-bottom: 15px;*/
 				font-size: .24rem !important
+			}
+						/*修改提示*/
+			.jconfirm .jconfirm-box div.jconfirm-title-c .jconfirm-title {
+			    -webkit-user-select: none;
+			    -moz-user-select: none;
+			    -ms-user-select: none;
+			    user-select: none;
+		        font-size: 0.32rem;
+			    font-family: inherit;
+			    display: inline-block;
+			    vertical-align: middle;
+			    padding-bottom: 15px;
+			    margin-left: 36%;
+			}
+			.jconfirm .jconfirm-box div.jconfirm-title-c {
+			    display: block;
+			    font-size: 22px;
+			    line-height: 20px;
+			    -webkit-user-select: none;
+			    -moz-user-select: none;
+			    -ms-user-select: none;
+			    user-select: none;
+			    border-bottom: 1px solid #E5E5E5;
+			    margin-left: -15px;
+			    margin-right: -15px;
+		        margin-bottom: 20px;
+			}
+			.jconfirm.jconfirm-white .jconfirm-box .jconfirm-buttons button, .jconfirm.jconfirm-light .jconfirm-box .jconfirm-buttons button {
+			    text-transform: uppercase;
+			    font-size: 14px;
+			    font-weight: 200 !important;
+			    text-shadow: none;
+  				margin-bottom: 12px;
+			}
+			.btn-primary-1{
+				color: #fff;
+				float: right;
+			}
+			.jconfirm .jconfirm-box .jconfirm-buttons>btn-primary-0 {
+			    margin-bottom: 4px;
+			    margin-left: 2px;
+			}
+			.jconfirm.jconfirm-white .jconfirm-box .jconfirm-buttons, .jconfirm.jconfirm-light .jconfirm-box .jconfirm-buttons {
+			     float: none !important; 
+			}
+			.jconfirm .jconfirm-box .jconfirm-buttons button {
+			    display: inline-block;
+			    padding: 3px 14px;
+			    font-size: 14px;
+			    font-weight: 400;
+			    line-height: 1.42857143;
+			    text-align: center;
+			    white-space: nowrap;
+			    vertical-align: middle;
+			    -ms-touch-action: manipulation;
+			    touch-action: manipulation;
+			    cursor: pointer;
+			    -webkit-user-select: none;
+			    -moz-user-select: none;
+			    -ms-user-select: none;
+			    border-radius: 4px;
+			    min-height: 1em;
+			    outline: 0;
+			    -webkit-user-select: none;
+			    -moz-user-select: none;
+			    -ms-user-select: none;
+			    user-select: none;
+			    -webkit-transition: opacity .1s ease,background-color .1s ease,color .1s ease,box-shadow .1s ease,background .1s ease;
+			    transition: opacity .1s ease,background-color .1s ease,color .1s ease,box-shadow .1s ease,background .1s ease;
+			    -webkit-tap-highlight-color: transparent;
+			    border: 0;
+			    background-image: none;
+			}
+			.btn-primary-2{
+				color: #fff;
+				background-color: #2cb7ca;
+    			margin-left: 1.65rem !important;
+			}
+			.jconfirm .jconfirm-box .jconfirm-buttons>button {
+			    margin-bottom: 4px;
+			    margin-left: 25px;
+			    margin-right: 25px;
 			}
 		</style>
 		<script>
@@ -311,7 +394,7 @@
 			
 			function deleteOrder(id,obj) {
 			        $.confirm({
-			            title: '取消购买',
+			            title: '提示信息',
 			            content: '您确定要取消购买吗?',
 			            buttons: {
 			                ok: {
@@ -338,12 +421,12 @@
 			                                	}
 			                                    self.remove();
 			                                    $.alert({
-			                                        title:"",
+			                                        title:"提示信息",
 			                                        content:"取消成功!",
 			                                        buttons: {
 			                                            ok: {
 			                                                text: '确认',
-			                                                btnClass: 'btn-primary-0',
+			                                                btnClass: 'btn-primary-2',
 			                                                action: function() {
 			                                                	if(parent.children("div").length<10){
 			                                                		$(".dropload-refresh").text("没有更多了");
@@ -480,7 +563,7 @@
 			                },
 			                cancel: {
 			                    text: '取消',
-			                    btnClass: 'btn-primary-0'
+			                    btnClass: 'btn-primary-1'
 			                }
 			            }
 			        });