Почетна Преглед Помоћ
Регистрација Пријавите се
Amoy2
/
sr-iHealthwx
Прати 2
Волим 0
Креирај огранак 1
Датотеке
Преглед изворни кода

Merge branch 'master' of http://192.168.1.220:10080/Amoy2/sr-iHealthwx

lulihong пре 6 година
родитељ
c136da2de9 5d2550f96d
комит
7cc94338b6
11 измењених фајлова са 194 додато и 44 уклоњено
Подељен поглед Покажи статистику Diff
  1. 9 4
      html/payment/css/payment.css
  2. 3 5
      html/payment/html/changeCards.html
  3. 1 1
      html/payment/html/payment.html
  4. 2 2
      html/payment/html/paymentList.html
  5. 14 2
      html/payment/js/changeCards.js
  6. 52 7
      html/payment/js/patientIDCards-pay.js
  7. 1 1
      html/payment/js/patientIDCards.js
  8. 74 8
      html/payment/js/payment.js
  9. 18 10
      html/payment/js/paymentList.js
  10. 19 3
      html/payment/js/paymentResult.js
  11. 1 1
      html/yszx/html/select-consult-doctor.html

+ 9 - 4
html/payment/css/payment.css
Прегледај датотеку 

@ -118,6 +118,7 @@
 
  /*height: 100px;*/
 
  color:#ffffff;
 
  margin-top: 15px;
 
  position: relative;
 
}
 
.labelIcon.weixin{
 
  background-image: url(../images/weixinzhifu_bg_img.png);	
@ -154,9 +155,8 @@
 
    color: #FFFFFF;
 
    text-align: center;
 
    position: absolute;
 
    top: 15px;
 
    top: 0px;
 
    left: 0px;
 
    margin: 0px 15px;
 
    width: -webkit-fill-available;
 
    width: -webkit-fill-available;
 
    width: -moz-fill-available;
 
@ -226,7 +226,7 @@
 
   color:#ffffff;
 
}
 
.zhuyuan .c-btn-full,.zhuyuan .c-btn-big{
 
	background: #FF5E6C;
 
	background: #17B3EC;
 
	border-bottom-left-radius: 5px;
 
	border-bottom-right-radius: 5px;
 
}
 
@ -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;}
 
/*缴费结果页面*/

+ 3 - 5
html/payment/html/changeCards.html
Прегледај датотеку 

@ -8,7 +8,7 @@
 
              content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0"/>
 
        <meta name="apple-mobile-web-app-capable" content="yes"/>
 
        <meta name="apple-mobile-web-app-status-bar-style" content="black"/>
 
		<title>我的卡包</title>
 
		<title>切换就诊卡</title>
 
		<meta name="keywords" content="">
 
		<meta name="description" content="">
 
		<link rel="shortcut icon" href="../../../favicon.ico">
 
@ -21,12 +21,10 @@
 
	<body class="bgc-f2f3f4">
 
		<div id="app" v-cloak>
 
			<div  class="plr15">				
				<div class="bgc-fff mt10 jiuzhen c-radius-20 c-f14" v-for="(item,i) in dataList" v-key="i"  @click="gotoPage(item.id)">
 
				<div class="bgc-fff mt10  c-radius-20 c-f14" :class="divClass" v-for="(item,i) in dataList" v-key="i"  @click="gotoPage(item.id)">
 
					<div class="pt12 pb5 pl15">
 
						<span class="c-333333">{{item.cardNo}}&nbsp;({{item.name}})&nbsp;</span>
 
						<span  style="float: right;">
 
							<span class="card-icon c-f14">就诊</span>
 
						</span>						
						<span class="card-icon" style="float: right;">{{divName}}</span>
 
					</div>	
					<div class="geduan"></div>
 
					<div class="pt5 pb10 c-t-center">

+ 1 - 1
html/payment/html/payment.html
Прегледај датотеку 

@ -23,7 +23,7 @@
 
			<div class="bgc-fff c-f14 plr15 mt10">
 
				<div class="c-border-b  ptb10">
 
					<span class="c-333333">{{cardNo}}&nbsp;({{data.name}})&nbsp;</span>
 
					<span v-if="data.isDefault==1" class="c-4dcd70">默认</span>
 
					<span v-if="cardlenght>1" class="qiehuan-txt" @click="changeCards">切换</span>
 
					<span class="c-999" style="float: right;">余额:<span class="c-ff9526">￥&nbsp;{{surplusMoney}}元</span></span>						
				</div>	
				<div class="c-999 mt7">

+ 2 - 2
html/payment/html/paymentList.html
Прегледај датотеку 

@ -37,7 +37,7 @@
 
				<div class="mui-scroll">
 
					<ul class="plr15 pb15" v-if="length!=0">
 
						<template  v-for="(item,i) in dataList" v-key="i">
 
							<li  class="labelIcon" :class="payTypeList[item.payType]?payTypeList[item.payType].type:''" :data-id="i" @tap="gotoResult(i)">
 
							<li  class="labelIcon" :class="payTypeList[item.payType]?payTypeList[item.payType].type:''" @tap="gotoResult(item)">
 
								<div>
 
									<img :src="payTypeList[item.payType]?payTypeList[item.payType].Img:''" width="24" height="24"/>
 
									<span class="c-f14 pl10" style="position: relative;top: -2px;">{{payTypeList[item.payType]?payTypeList[item.payType].text:''}}</span>
 
@ -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>

+ 14 - 2
html/payment/js/changeCards.js
Прегледај датотеку 

@ -6,6 +6,8 @@ var checktype=false;
 
		data: {
 
			dataList:[],
 
			code:"",
 
			divClass:"jiuzhen",
 
			divName:"就诊"
 
		},
 
		mounted:function(){
 
			var vm = this
 
@ -28,6 +30,14 @@ var checktype=false;
 
			   		loading.close();
 
			        if(res.status == 200){ 
			        	vm.dataList=res.data
 
			        	if(Request.paytype==2){
 
			        		vm.divClass="zhuyuan"
 
			        		vm.divName="住院"
 
			        		vm.dataList=res.data.filter(function(item){
 
			        			item.cardNo=item.inpCardNo
 
			        			return item.inpCardNo
 
			        		})
 
			        	}
 
			        }else{
 
			          dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:'数据获取失败'}).show();
 
			        }
 
@ -51,8 +61,10 @@ var checktype=false;
 
					window.location.href='../../payment/html/paymentList.html?id='+id;
 
				}else if(Request.pre=="waitingDoctorList"){   //跳到候诊查询页面
 
					window.location.href='../../informationSearch/html/waitingDoctorList.html?id='+id;
 
				}else{
 
					
				}else if(Request.pre=="payment"){   //跳到支付页面
 
					window.location.href='../../payment/html/payment.html?id='+id+"&paytype="+Request.paytype;
 
				}else{  //默认跳转缴费查询页面
 
					window.location.href='../../payment/html/paymentList.html?id='+id;
 
				}
 
			},
 
			//判断是否验证登录通过

+ 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"
 
				}				
			},

+ 74 - 8
html/payment/js/payment.js
Прегледај датотеку 

@ -16,6 +16,8 @@ var loading = dialog({
 
			surplusMoney:"",
 
			data:{},
 
			code:"",
 
			cardlenght:0,
 
			ischangeCard:false,
 
		},
 
		mounted: function() {
 
			var vm = this
 
@ -28,6 +30,59 @@ var loading = dialog({
 
		methods: {
 
			//获取列表数据
 
			getData:function(){
 
				var vm=this
 
				 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){
 
			        		vm.cardlenght=res.data.length
 
							if(Request.id){																
				        		vm.data=res.data.filter(function(item){
 
				        			return item.id==Request.id && vm.hasInpCardNo(item)
 
				        		})[0]
 
				        		if(!vm.data){
 
			        				vm.data=res.data.filter(function(item){
 
					        			return item.isDefault==1 && vm.hasInpCardNo(item)
 
					        		})[0]
 
			        			}
 
							}else{								
				        		vm.data=res.data.filter(function(item){
 
				        			return item.isDefault==1 && vm.hasInpCardNo(item)
 
				        		})[0]
 
							}
 
							if(!vm.data){
 
			        			vm.data=res.data[0]
 
			        			if(!vm.hasInpCardNo(vm.data)){
 
			        				dialog({
 
							            content: "请先绑定住院就诊卡！", 
							            okValue: '确定',
 
							            ok: function(){
 
											window.location.href='../../payment/html/patientIDCards.html';
 
							            },
 
							        }).showModal()
 
			        			}
 
			        		}
 
			        		vm.cardId=vm.data.id
 
			        		vm.getCardInfo()
 
			        	}else{
 
			        		dialog({
 
					            content: "请先绑定就诊卡！", 
					            okValue: '确定',
 
					            ok: function(){
 
									window.location.href='../../payment/html/patientIDCards.html';
 
					            },
 
					        }).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();
 
@ -36,12 +91,12 @@ var loading = dialog({
 
			        if(res.status == 200){ 
				 	    loading.close();
 
			        	vm.data=res.data 
			        	if(vm.paytype=="1"){
 
			        		vm.surplusMoney=vm.data.cardMoney?vm.data.cardMoney:0
 
			        		vm.cardNo=vm.data.cardNo
 
			        	}else{
 
			        	if(vm.paytype=="2"){			        		
			        		vm.surplusMoney=vm.data.cardInpMoney?vm.data.cardInpMoney:0
 
			        		vm.cardNo=vm.data.inpCardNo
 
			        	}else{
 
			        		vm.surplusMoney=vm.data.cardMoney?vm.data.cardMoney:0
 
			        		vm.cardNo=vm.data.cardNo
 
			        	}
 
			        }else{
 
				 	  loading.close();
 
@ -103,7 +158,7 @@ var loading = dialog({
 
					healthType:vm.paytype,
 
					payAmount:parseFloat(vm.payMoney).toFixed(2),
 
					spbillCreateIp:returnCitySN["cip"],
 
					code:getUrlParam("code"),
 
//					code:getUrlParam("code"),
 
					openid:JSON.parse(localStorage.getItem("wlyyAgent")).openid
 
				};
 
				sendPost("third/hy/pay/createPayOrder", params, "json", "post",function(){        	
@ -151,11 +206,22 @@ var loading = dialog({
 
					payMoney="0"
 
				}			
		        this.payMoney= (payMoney.match(/^\d*(\.?\d{0,2})/g)[0]) || null
 
		        if(this.payMoney>50000){
 
		        	dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:"微信支付金额不得超过50000"}).show();
 
		        	this.payMoney=50000
 
		        if(this.payMoney>20000){
 
		        	dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:"支付金额不得超过20000"}).show();
 
		        	this.payMoney=20000
 
		        }
 
		    },
 
		    hasInpCardNo:function(item){
 
		    	var ispass=true
 
		    	if(Request.paytype==2){
 
		    		ispass=item.inpCardNo?true:false
 
		    	}
 
		    	return ispass
 
		    },
 
			//跳转切换就诊卡
 
			changeCards:function(){
 
				window.location.href='../../payment/html/changeCards.html?pre=payment&paytype='+Request.paytype;
 
			},
 
			//判断是否验证登录通过
 
			checkType:function(){
 
				var vm=this

+ 18 - 10
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
 
@ -111,9 +116,13 @@ var iscrollState='';//判断滑动方向
 
				if(pageNo){
 
					vm.queryList.pageNo=pageNo
 
					vm.dataList=[]
 
					vm.isUPsuccess=true
 
				}
 
				sendPost("third/hy/pay/gerPayOrderList", vm.queryList, "json", "get",function(){
 
			   		loading.close();
 
			   		mui('#wrapper').pullRefresh().endPulldownToRefresh(false);
 
					mui('#wrapper').pullRefresh().enablePullupToRefresh();//重置
 
			   		mui('#wrapper').pullRefresh().endPullupToRefresh(false);
 
			    	dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:'请求失败'}).show();
 
			      }, function(res){
 
			   		loading.close();			   		
@ -129,24 +138,23 @@ var iscrollState='';//判断滑动方向
 
							mui('#wrapper').pullRefresh().enablePullupToRefresh();//重置
 
			        	}else{
 
			        		if(res.data.length<vm.queryList.pageSize){
 
			        			mui('#wrapper').pullRefresh().enablePullupToRefresh(true);
 
			        			mui('#wrapper').pullRefresh().endPullupToRefresh(true);
 
			        		}else{
 
			        			mui('#wrapper').pullRefresh().enablePullupToRefresh(false);
 
			        			mui('#wrapper').pullRefresh().endPullupToRefresh(false);
 
			        		}
 
			        	}
 
			        }else{
 
			            dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:'数据获取失败'}).show();			          
		        		mui('#wrapper').pullRefresh().endPulldownToRefresh(false);
 
			            dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:'数据获取失败'}).show();
 
				   		mui('#wrapper').pullRefresh().endPulldownToRefresh(false);
 
						mui('#wrapper').pullRefresh().enablePullupToRefresh();//重置
 
				   		mui('#wrapper').pullRefresh().endPullupToRefresh(false);
 
			        }
 
			    })
 
			},
 
			//跳转到订单结果页
 
			gotoResult:function(index){
 
			gotoResult:function(item){
 
				var vm=this
 
//				console.log($($(index)[0].currentTarget).attr("data-id"))
 
				var item=vm.dataList[index]
 
				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(){
 
@ -186,11 +194,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":Request.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
 
	        		}	        		
	        	}
 
			},
 
			//

+ 1 - 1
html/yszx/html/select-consult-doctor.html
Прегледај датотеку 

@ -40,7 +40,7 @@
 
                        </ul>
 
                    </div>
 
                </div>
 
                <div class="focused" id='focused'>已关注(咨询)</div>
 
                <div class="focused" id='focused'>已关注的医生</div>
 
            </div>
 
            <div class="div-no-search-info f-dn">
 
                <div class="div-img"></div>