缴费结算结果页修改

html/payment/js/payment.js

@@ -233,7 +233,7 @@ var loading = dialog({
							success: function (res) {
								// 支付成功后的回调函数
								if(Request.repayAmout){   //从缴费结算进入，直接进行缴费结算
								    window.location.href = "../../payment/html/repaymentResult.html?seqNo="+data.seqNo+"patientName=" + vm.data.name + "&healthNo=" + vm.cardNo + "&payAmount=" + vm.repayAmout + "&createDate=" + getNowFormatDate() + "&cardId=" + vm.cardId;
								    window.location.href = "../../payment/html/repaymentResult.html?seqNo="+data.seqNo+"&patientName=" + vm.data.name + "&healthNo=" + cardNo + "&payAmount=" + vm.repayAmout + "&createDate=" + getNowFormatDate() + "&cardId=" + vm.cardId;
//									vm.torePay()
								}else{
									window.location.href='../../payment/html/paymentResult.html?seqNo='+data.seqNo+"&payStatus=1&cardId="+vm.cardId;

html/payment/js/paymentResult.js

@@ -67,7 +67,7 @@ var loading = dialog({
				 	loading.close();
			        if(res.status == 200){    		
			        	vm.data=res.data
			        	if(vm.data.type=="2"){
			        	if(vm.data.healthNo.length>13){
                            vm.data.healthNo=vm.data.healthNo.substr(0,1)+"*************"+vm.data.healthNo.substr(vm.data.healthNo.length-4,4)
                        }
		        	    vm.filterData()
@@ -78,8 +78,12 @@ var loading = dialog({
			},
			//从缴费列表进入
			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'),"payStatus":Request.payStatus,"payType":Request.payType}
				var vm=this,healthNo=""
				healthNo=Request.healthNo
				if(Request.healthNo.length>13){
                    healthNo=healthNo.substr(0,1)+"*************"+healthNo.substr(healthNo.length-4,4)
                }				
				vm.data={seqNo:Request.seqNo,"patientName":getQueryString('patientName'),"healthNo":healthNo,"healthType":Request.healthType,"payAmount":Request.payAmount,"createDate":getQueryString('createDate'),"payStatus":Request.payStatus,"payType":Request.payType}
				vm.result=vm.successResult
//				if(Request.hyStatus==1){
//					vm.result=vm.successResult

html/payment/js/repaymentResult.js

@@ -34,24 +34,12 @@ var loading = dialog({
			healthType:["","账单结算缴费","住院缴费充值"],
			initdata:{"patientName":"","healthNo":"","healthType":1,"payAmount":"","createDate":"",},
			carddata:{},
			queryList:{
                month:"",
                healthNo:Request.healthNo,
                chargeType:"1",   //1：门诊，2：住院，
                pageNo:1,
                pageSize:10,
            },
		},
		mounted: function() {
			var vm = this
			checkUserAgent();
			vm.checkType()
			vm.cardId=Request.cardId
			var month=new Date().getMonth()+1
            if(month<=9){
               month="0"+month
            }
            vm.queryList.month=new Date().getFullYear()+"-"+month
		},
		methods: {		    
            getCardInfo:function(){             
@@ -62,25 +50,21 @@ var loading = dialog({
                   }, function(res){
                    loading.close();
                    if(res.status == 200){ 
                        vm.carddata=res.data  
//                      if(parseFloat(Request.payAmount)<=vm.carddata.cardMoney){
//                      }else{
//                      }
                        vm.carddata=res.data 
                    }else{
                      dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:'数据获取失败'}).show();
                    }
                })
            },
            //获取列表数据(用于判断是否同步，是否可进行缴费结算)
            //用于判断订单是否同步，是否可进行缴费结算
            getList:function(){
                var vm=this
                sendPost("third/hy/pay/gerPayOrderList", vm.queryList, "json", "get",function(){
                sendPost("/third/hy/pay/getHyPaySeqNo", {wxSeqNo: Request.seqNo}, "json", "get",function(){
                    loading.close();  
                    dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:'请求失败'}).show();
                  }, function(res){                    
                    if(res.status == 200){
                        var thisOrder=_.where(res.data, {seqNo: Request.seqNo})
                        if(thisOrder[0]&&thisOrder[0].hyStatus==1){   //该缴费记录且同步成功
                        if(res.data){   //同步成功,可以进行支付
                            if(vm.carddata.hisId){                                
                                vm.isloading=false
                                vm.data=vm.initdata
@@ -171,9 +155,12 @@ var loading = dialog({
            },
			//获取数据
			getData:function(){
				var vm=this
				var vm=this,healthNo=""	
                if(Request.healthNo.length>13){
                    healthNo=healthNo.substr(0,1)+"*************"+healthNo.substr(healthNo.length-4,4)
                }
				vm.result=vm.successResult
				vm.data={"patientName":getQueryString('patientName'),"healthNo":Request.healthNo,"payAmount":Request.payAmount,"createDate":getQueryString('createDate'),"healthType":1,}
				vm.data={"patientName":getQueryString('patientName'),"healthNo":healthNo,"payAmount":Request.payAmount,"createDate":getQueryString('createDate'),"healthType":1,}
			},
            backClick:function(){
                window.location.href='../../payment/html/paymentList.html?id='+Request.cardId; //充值查询页面
@@ -191,8 +178,13 @@ var loading = dialog({
				var timer = setInterval(function(){
					if(checktype){
						clearInterval(timer);
                        vm.getCardInfo()	
                        vm.getList()
						if(Request.seqNo){  //从微信支付页进入
                            vm.getCardInfo()
						    vm.getList()
						}else{
						    vm.isloading=false
						    vm.getData()
						}
					}
				},10);
			},