Browse Source

支付成功后,结果页显示问题

chenyue 6 years ago
parent
commit
a9fc099f29

+ 6 - 1
html/payment/css/payment.css

@ -252,7 +252,12 @@
	color: #FF5E6C;
}
.success-pay .failure-btn{display: none;}
.synchronization-pay{}
.synchronization-pay .txtColor{
	color: #FF5E6C;
}
.synchronization-pay .failure-btn,.success-pay .failure-btn{display: none;}
.failure-pay .success-list{display: none;}
/*缴费结果页面*/

+ 1 - 1
html/payment/html/paymentList.html

@ -63,7 +63,7 @@
				</div>
			</div>
			<a href="javascript:;" class="circle-btn"  @click="gotoCards">
				<span style="position: relative;top: 5px;left: 1px;">我的<br/>就诊卡</span>
				<span style="position: relative;top: 3px;left: 1px;">我的<br/>就诊卡</span>
			</a>
		</div>

+ 52 - 7
html/payment/js/patientIDCards-pay.js

@ -1,5 +1,9 @@
var Request = GetRequest(); 
var checktype=false;
var loading = dialog({
	contentType: 'load',
	skin: 'bk-popup'
});
(function() {
	new Vue({
		el: "#app",
@ -34,12 +38,53 @@ var checktype=false;
			//获取列表数据
			getData:function(){
				var vm=this
				var loading = dialog({
					contentType: 'load',
					skin: 'bk-popup'
				});
				loading.showModal();
				 sendPost("patient/card/getCardInfo", {id:vm.cardId}, "json", "get",function(){
				sendPost("patient/card/getCardList", {patient:vm.code}, "json", "get",function(){
			 	loading.close();
		    	dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:'请求失败'}).show();
		       }, function(res){
			        if(res.status == 200){ 
			        	if(res.data.length>0){
			        		var data={}
			        		if(Request.id){																
				        		data=res.data.filter(function(item){
				        			return item.id==Request.id
				        		})[0]
				        		if(!data){
			        				data=res.data.filter(function(item){
					        			return item.isDefault==1
					        		})[0]
			        			}
							}else{								
				        		data=res.data.filter(function(item){
				        			return item.isDefault==1
				        		})[0]
							}
							if(!data){
			        			data=res.data[0]
			        		}
			        		vm.cardId=data.id
			        		vm.getCardInfo()
			        	}else{
				 	  		loading.close();
			        		dialog({
					            content: "请先绑定就诊卡,再进行在线就诊缴费业务!", 
					            okValue: '确定',
					            ok: function(){
									window.location.href='../../payment/html/patientIDCards.html';
					            },
			//						            cancelValue: '我再看看',
			//						            cancel: function(){}
					        }).showModal()
			        	}
			        }else{
				 	  loading.close();
			          dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:'数据获取失败'}).show();
			        }
			    })		
			},
			getCardInfo:function(){				
				var vm=this
				sendPost("patient/card/getCardInfo", {id:vm.cardId}, "json", "get",function(){
				 	loading.close();
			    	dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:'请求失败'}).show();
			       }, function(res){
@ -95,7 +140,7 @@ var checktype=false;
				var vm = this
				var screemH=window.screen.availHeight;	
				var bodyH=document.body.clientHeight;
				if(screemH-bodyH<160){
				if(screemH-bodyH<180){
					vm.BtnClass="mt20"
				}				
			},

+ 1 - 1
html/payment/js/patientIDCards.js

@ -80,7 +80,7 @@ var checktype=false;
				var vm = this
				var screemH=window.screen.availHeight;	
				var bodyH=document.body.clientHeight;
				if(screemH-bodyH<70){
				if(screemH-bodyH<130){
					vm.BtnClass="mt20"
				}				
			},

+ 42 - 0
html/payment/js/payment.js

@ -28,6 +28,36 @@ var loading = dialog({
		methods: {
			//获取列表数据
			getData:function(){
				var vm=this
				if(Request.id){
					sendPost("patient/card/getCardList", {patient:vm.code}, "json", "get",function(){
				 	loading.close();
			    	dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:'请求失败'}).show();
			       }, function(res){
				        if(res.status == 200){ 
				        	if(res.data.length>0){										
				        		var data=res.data.filter(function(item){
				        			return item.id==Request.id
				        		})[0]
				        		if(!data){
				        			vm.backtoCards()  //当前用户无该就诊卡
				        		}else{
				        			vm.getCardInfo()
				        		}
				        	}else{
					 	  		vm.backtoCards() //当前用户无绑定就诊卡
				        	}
				        }else{
					 	  loading.close();
				          dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:'数据获取失败'}).show();
				        }
				    })	
				}else{
					vm.backtoCards() //未带参
				}					
			},
			//获取列表数据
			getCardInfo:function(){
				 var vm=this
				 sendPost("patient/card/getCardInfo", {id:vm.cardId}, "json", "get",function(){
				 	loading.close();
@ -144,6 +174,18 @@ var loading = dialog({
			        }
			    })
			},
			backtoCards:function(){
				loading.close();
        		dialog({
		            content: "请重新选择待缴费就诊卡!", 
		            okValue: '确定',
		            ok: function(){
						window.location.href='../../payment/html/patientIDCards.html';
		            },
//						            cancelValue: '我再看看',
//						            cancel: function(){}
		        }).showModal()
			},
			//强制设定最多只能输入两位小数
			checkNumber:function(payMoney){
				var myreg=/^[0][0-9]{1}$/; 

+ 8 - 3
html/payment/js/paymentList.js

@ -78,6 +78,11 @@ var iscrollState='';//判断滑动方向
				        		vm.data=res.data.filter(function(item){
				        			return item.id==Request.id
				        		})[0]
				        		if(!vm.data){
			        				vm.data=res.data.filter(function(item){
					        			return item.isDefault==1
					        		})[0]
			        			}
							}else{								
				        		vm.data=res.data.filter(function(item){
				        			return item.isDefault==1
@ -144,7 +149,7 @@ var iscrollState='';//判断滑动方向
			//跳转到订单结果页
			gotoResult:function(item){
				var vm=this
				window.location.href='../../payment/html/paymentResult.html?healthType='+item.healthType+"&patientName="+item.patientName+"&healthNo="+item.healthNo+"&payAmount="+item.payAmount+"&seqNo="+item.seqNo+"&createDate="+item.createDate;
				window.location.href='../../payment/html/paymentResult.html?healthType='+item.healthType+"&patientName="+item.patientName+"&healthNo="+item.healthNo+"&payAmount="+item.payAmount+"&seqNo="+item.seqNo+"&createDate="+item.createDate+"&hyStatus="+item.hyStatus;
			},
			//跳转切换就诊卡
			changeCards:function(){
@ -184,11 +189,11 @@ var iscrollState='';//判断滑动方向
				},10);
			},
			isdown:function(){	
				alert(12)			
//				alert(12)			
			    this.getList(1)
			},
			isup:function(){
				alert(13)
//				alert(13)
				if(this.isUPsuccess){
					this.queryList.pageNo++
					this.isUPsuccess=false

+ 19 - 3
html/payment/js/paymentResult.js

@ -15,6 +15,12 @@ var loading = dialog({
				msg:"恭喜您缴费成功,您将享有医院在线的所有服务,以下为您的缴费信息。",
				Img:"../images/jiaofeichengong_icon.png",	
				txt:"缴费成功",				
			},			
			synchronizationResult:{
				status:"synchronization-pay",
				msg:"系统繁忙,请重新充值缴费。",
				Img:"../images/jiaofeishibai_icon.png",	
				txt:"缴费失败",				
			},
			failureResult:{
				status:"failure-pay",
@ -62,15 +68,20 @@ var loading = dialog({
			        	vm.data=res.data
		        	    vm.filterData()
			        }else{
			          dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:'数据获取失败'}).show();
			          dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:res.msg}).show();
			        }
			    })
			},
			//从缴费列表进入
			gerPayOrderList:function(){
				var vm=this
				vm.data={seqNo:Request.seqNo,"patientName":getQueryString('patientName'),"healthNo":Request.healthNo,"healthType":Request.healthType,"payAmount":Request.payAmount,"createDate":getQueryString('createDate')}
				vm.data={seqNo:Request.seqNo,"patientName":getQueryString('patientName'),"healthNo":Request.healthNo,"healthType":Request.healthType,"payAmount":Request.payAmount,"createDate":getQueryString('createDate'),"hyStatus":Request.hyStatus}
				vm.result=vm.successResult
//				if(Request.hyStatus==1){
//					vm.result=vm.successResult
//				}else{
//					vm.result=vm.synchronizationResult
//				}
			},
			filterData:function(){				
				var vm=this
@ -78,7 +89,12 @@ var loading = dialog({
	        	if(vm.data.payStatus==1){   //充值状态,0未完成,1已完成,2失败
	        		vm.result=vm.successResult
	        	}else{
	        		vm.result=vm.failureResult
	        		if(vm.data.wechatStatus==1){     //未同步
	        			vm.result=vm.successResult
	        			vm.data.hyStatus=0
	        		}else{
	        			vm.result=vm.failureResult
	        		}	        		
	        	}
			},
			//