홈 탐색 도움말
가입하기 로그인
Amoy2
/
sr-iHealthwx
Watch 2
Star 0
포크 1
파일
소스 검색

支付结果页增加缴费渠道，点击返回按钮到就诊充值页

chenyue 6 년 전
부모
66fc97c090
커밋
04530d0c39
11개의 변경된 파일과 55개의 추가작업 그리고 36개의 파일을 삭제
분할 보기 변경상태 보기
  1. 5 8
      html/informationSearch/html/waitingDoctorList.html
  2. 6 1
      html/payment/css/payment.css
  3. 4 4
      html/payment/html/patientIDCards-pay.html
  4. 6 1
      html/payment/html/patientIDCards.html
  5. 2 2
      html/payment/html/payment.html
  6. 10 5
      html/payment/html/paymentList.html
  7. 8 4
      html/payment/html/paymentResult.html
  8. 1 0
      html/payment/js/patientIDCards-pay.js
  9. 5 5
      html/payment/js/payment.js
  10. 5 4
      html/payment/js/paymentList.js
  11. 3 2
      html/payment/js/paymentResult.js

+ 5 - 8
html/informationSearch/html/waitingDoctorList.html
파일 보기 

@ -29,15 +29,12 @@
 
					<li class="bgc-fff c-radius-5 jiuzhen mt15" v-for="(item,i) in dataList" v-key="i">
 
						<div class="c-fff c-f14 top-div">
 
							<span>上饶县人民医院</span>
 
							<span style="float: right;"><!--门诊--></span>
 
							<span style="float: right;">候诊人:{{data.name}}<!--门诊--></span>
 
						</div>
 
						<div class="pt10 plr10 c-333 c-f14">						
							<div class="c-f17" style="line-height: 18px;">
 
								<img src="../images/paidui_icon.png" width="20" class="mr5" />前方排队:&nbsp;<span class="c-ff5e6c">{{item.wait_num}}人</span>
 
							</div>
 
							<div class="pt15 pb10">
 
								<span>候诊人:&nbsp;{{data.name}}</span>
 
								<span style="float: right;">候诊科室：{{item.dept_name}}</span>
 
						<div class="pt15 plr10 c-333 c-f14">
 
							<div class="pb15">
 
								<span>科室/专家：{{item.dept_name}}</span>
 
								<span class="c-f17" style="line-height: 18px;float: right;"><img src="../images/paidui_icon.png" width="20" class="mr5" />排队:<span class="c-ff5e6c">{{item.wait_num}}人</span></span>
 
							</div>
 
							<!--<div class="ptb10">
 
								就诊时间:&nbsp;2018-08-29 14:20-15:00

+ 6 - 1
html/payment/css/payment.css
파일 보기 

@ -243,6 +243,11 @@ a:active{
 
.p-fix-bottom-0{
 
	position: fixed;bottom: 0px;
 
}
 
.surplusMoney{float: right;margin-top: -2px;}
 
@media screen and (device-width: 320px)  and (-webkit-device-pixel-ratio: 2){
 
	.surplusMoney{float: none;margin-top:5px;font-size: 14px;}
 
}
 
/*就诊卡缴费*/
 
/*缴费结果页面*/
 
@ -263,7 +268,7 @@ a:active{
 
	color: #FF5E6C;
 
}
 
.synchronization-pay .failure-btn,.success-pay .failure-btn{display: none;}
 
/*.synchronization-pay .failure-btn,.success-pay .failure-btn{display: none;}*/
 
.failure-pay .success-list{display: none;}
 
/*缴费结果页面*/

+ 4 - 4
html/payment/html/patientIDCards-pay.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">
 
@ -34,7 +34,7 @@
 
						{{data.createDate}} 创建
 
					</div>
 
					<div>
 
						<button type="button" class="c-btn-full c-btn-big" style="height: 45px;" @click="gotoPay(1)">门诊缴费</button>
 
						<button type="button" class="c-btn-full c-btn-big" style="height: 45px;" @click="gotoPay(1)">门诊充值</button>
 
					</div>
 
				</div>
 
				<div class="bgc-fff mt10 zhuyuan c-radius-5" v-show="data.inpCardNo">
 
@ -49,13 +49,13 @@
 
					<div class="pb10 c-999 pr10 c-f12 c-t-right createdata">						
					</div>
 
					<div>
 
						<button type="button" class="c-btn-full c-btn-big" style="height: 45px;" @click="gotoPay(2)">住院缴费</button>
 
						<button type="button" class="c-btn-full c-btn-big" style="height: 45px;" @click="gotoPay(2)">住院充值</button>
 
					</div>
 
				</div>
 
			</div>
 
			<div :class="BtnClass" class="c-100">
 
				<div class="pb20 plr30">
 
					<button type="button" class="c-btn-4dcd70 c-btn-arc c-btn-full  c-btn-big" style="height: 45px;" @click="gotoList()">缴费查询</button>
 
					<button type="button" class="c-btn-4dcd70 c-btn-arc c-btn-full  c-btn-big" style="height: 45px;" @click="gotoList()">充值查询</button>
 
				</div>
 
				<div class="pb20 mb15 plr30">
 
					<button type="button" class="c-btn-fff c-btn-full c-btn-arc c-btn-big" style="height: 45px;color:#FF5E6C;" @click="untieCard()">解绑就诊卡</button>

+ 6 - 1
html/payment/html/patientIDCards.html
파일 보기 

@ -17,6 +17,11 @@
 
		<link rel="stylesheet" type="text/css" href="../../../widget/artDialog/6.0.5/css/ui-dialog.min.css">
 
		<link rel="stylesheet" href="../css/payment.css" />		
	</head>
 
	<style>
 
		body:after{
 
			background: none;
 
		}
 
	</style>
 
	<body class="bgc-f2f3f4">
 
		<div id="app" v-cloak>
 
@ -43,7 +48,7 @@
 
				</div>
 
			</div>
 
			<div :class="BtnClass" class="c-100">	
				<div class="pb20 plr15" style="margin: 0 auto 20px;">					
				<div class="pb20 plr15" style="margin: 0 auto 10px;">					
			<button type="button" class="c-btn-fff c-btn-full c-btn-big" style="height: 45px;color:#999999;" @click="gotoBindingCard"><img src="../images/tianjia_icon.png" width="22" class="mr10"/>添加就诊卡</button>
 
					<div class="mt10 c-t-center c-c8c8c8 c-f14">还可以添加<span class="c-4dcd70">{{surplus}}</span>张</div>
 
				</div>

+ 2 - 2
html/payment/html/payment.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">
 
@ -24,7 +24,7 @@
 
				<div class="c-border-b  ptb10">
 
					<span class="c-333333">{{cardNo}}&nbsp;({{data.name}})&nbsp;</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 class="c-999 surplusMoney">余额:<span class="c-ff9526">￥&nbsp;{{surplusMoney}}元</span></div>						
				</div>	
				<div class="c-999 mt7">
 
					<img src="../images/feiyong_icon.png" width="17" style="margin-right: 10px;"/><span class="c-f14" style="position: relative;top: -3px;">预交金额</span>

+ 10 - 5
html/payment/html/paymentList.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">
 
@ -29,8 +29,8 @@
 
			</div>
 
			<div class="c-mor-hold c-border-tb">
 
		        <ul class="c-lab-mor c-f15">
 
		            <li :class="{curr:queryList.chargeType==1}" @click="queryList.chargeType=1;getList(1)">门诊缴费</li>
 
		            <li :class="{curr:queryList.chargeType==2}" @click="queryList.chargeType=2;getList(1)">住院缴费</li>
 
		            <li :class="{curr:queryList.chargeType==1}" @click="queryList.chargeType=1;getList(1)">门诊充值</li>
 
		            <li :class="{curr:queryList.chargeType==2}" @click="queryList.chargeType=2;getList(1)">住院充值</li>
 
		        </ul>
 
		    </div>
 
			<div id="wrapper" class="mui-scroll-wrapper" style="top: 90px;">
 
@ -62,9 +62,14 @@
 
					</div>
 
				</div>
 
			</div>
 
			<a href="javascript:;" class="circle-btn"  @click="gotoCards">
 
			<div class="c-100 p-fix-bottom-0 bgc-fff" style="z-index: 2;">
 
				<div class="mtb5 plr30">
 
					<button type="button" class="c-btn-4dcd70 c-btn-arc c-btn-full  c-btn-big" style="height: 45px;" @click="gotoCards">我的就诊卡</button>
 
				</div>
 
			</div>
 
			<!--<a href="javascript:;" class="circle-btn"  @click="gotoCards">
 
				<span style="position: relative;top: 3px;left: 1px;">我的<br/>就诊卡</span>
 
			</a>
 
			</a>-->
 
		</div>
 
		<script src="../../../js/post.js"></script>

+ 8 - 4
html/payment/html/paymentResult.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">
 
@ -27,9 +27,6 @@
 
					<div class="mt10 c-999 c-f14" style="line-height: 24px;">{{result.msg}}</div>
 
				</div>
 
			</div>
 
			<div class="p30 failure-btn">
 
				<button type="button" class="c-btn-4dcd70 c-btn-arc c-btn-full  c-btn-big" style="height: 45px;" @click="backClick">返回</button>
 
			</div>
 
			<div class="mt10 success-list">				
				<ul class="c-list  c-border-b">
 
					<li class="ptb13">
 
@ -56,8 +53,15 @@
 
						<div class="c-list-info">充值流水号</div>
 
			            <div class="c-list-key c-999">{{data.seqNo}}</div>					
					</li>
 
					<li class="ptb13">
 
						<div class="c-list-info">充值渠道</div>
 
			            <div class="c-list-key c-999">{{payTypeList[data.payType]?payTypeList[data.payType].text:''}}</div>					
					</li>
 
				</ul>
 
			</div>
 
			<div class="p30 failure-btn">
 
				<button type="button" class="c-btn-4dcd70 c-btn-arc c-btn-full  c-btn-big" style="height: 45px;" @click="backClick">返回</button>
 
			</div>
 
		</div>
 
		<script src="../../../js/post.js"></script>

+ 1 - 0
html/payment/js/patientIDCards-pay.js
파일 보기 

@ -30,6 +30,7 @@ var loading = dialog({
 
		},
 
		mounted:function(){
 
			var vm = this
 
			loading.showModal();
 
			checkUserAgent();
 
			vm.code=JSON.parse(localStorage.getItem("wlyyAgent")).uid
 
			vm.checkType()

+ 5 - 5
html/payment/js/payment.js
파일 보기 

@ -63,7 +63,7 @@ var loading = dialog({
 
							            },
 
							        }).showModal()
 
			        			}
 
			        		}
 
			        		}							
			        		vm.cardId=vm.data.id
 
			        		vm.getCardInfo()
 
			        	}else{
 
@ -108,13 +108,13 @@ var loading = dialog({
 
			toPayment:function(){
 
				var vm=this
 
				loading.showModal();
 
				if(vm.payMoney){					
				if(vm.payMoney&&vm.payMoney>0){					
					if(judgeWxVersion()){
 
						vm.getWeixinSign()
 
					}
 
				}else{
 
				 	 loading.close();
 
					 dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:'请输入充值金额'}).show();
 
					 dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:'请输入正确的充值金额'}).show();
 
				}
 
			},
 
			//获得微信sdk信息
 
@ -177,7 +177,7 @@ var loading = dialog({
 
							paySign: data.sign, // 支付签名
 
							success: function (res) {
 
								// 支付成功后的回调函数
 
	                               window.location.href='../../payment/html/paymentResult.html?seqNo='+data.seqNo+"&payStatus=1";									
	                               window.location.href='../../payment/html/paymentResult.html?seqNo='+data.seqNo+"&payStatus=1&cardId="+vm.cardId;
 
							},
 
							cencel:function(res){
 
								// 支付取消回调函数
 
@ -189,7 +189,7 @@ var loading = dialog({
 
								sendPost("third/hy/pay/setPayLogWxFail", errorparams, "json", "post",function(){  
							    	dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:'请求失败'}).show();
 
							     }, function(res){
 
							     	window.location.href='../../payment/html/paymentResult.html?seqNo='+data.seqNo+"&payStatus=2";
 
							     	window.location.href='../../payment/html/paymentResult.html?seqNo='+data.seqNo+"&payStatus=2&cardId="+vm.cardId;
 
							    })
 
							}
 
						});

+ 5 - 4
html/payment/js/paymentList.js
파일 보기 

@ -41,7 +41,7 @@ var iscrollState='';//判断滑动方向
 
			dataList:[],
 
			length:1,
 
			cardlenght:0,
 
			id:"",
 
			cardId:"",
 
			queryList:{
 
				month:"",
 
				healthNo:"",
 
@ -51,7 +51,7 @@ var iscrollState='';//判断滑动方向
 
			},
 
			code:"",
 
			payTypeList:[{},{type:"weixin",Img:"../images/weixinzhifu_icon.png",text:"微信支付"},{type:"xianjin",Img:"../images/xianjichongzhi_icon.png",text:"现金支付"},{type:"yinlian",Img:"../images/yinlianzhifu_icon.png",text:"银联支付"},{type:"zhifubao",Img:"../images/zhifubaozhifu_icon.png",text:"支付宝支付"}],
 
			healthType:["","门诊缴费","住院缴费"],
 
			healthType:["","门诊充值","住院充值"],
 
			isUPsuccess:true,   //上拉锁，搜索成功则释放   
		},
 
		mounted: function() {
 
@ -91,11 +91,12 @@ var iscrollState='';//判断滑动方向
 
							if(!vm.data){
 
			        			vm.data=res.data[0]
 
			        		}
 
							vm.cardId=vm.data.id
 
			        		vm.queryList.healthNo=vm.data.cardNo
 
			        		vm.getList(1)
 
			        	}else{
 
			        		dialog({
 
					            content: "请先绑定就诊卡，再查看就诊缴费信息！", 
					            content: "请先绑定就诊卡，再查看就诊充值信息！", 
					            okValue: '确定',
 
					            ok: function(){
 
									window.location.href='../../payment/html/patientIDCards.html';
 
@ -154,7 +155,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+"&hyStatus="+item.hyStatus;
 
				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+"&payStatus="+item.payStatus+"&payType="+item.payType+"&cardId="+this.cardId;
 
			},
 
			//跳转切换就诊卡
 
			changeCards:function(){

+ 3 - 2
html/payment/js/paymentResult.js
파일 보기 

@ -39,6 +39,7 @@ var loading = dialog({
 
				pageNo:1,
 
				pageSize:1,
 
			},
 
			payTypeList:[{},{type:"weixin",Img:"../images/weixinzhifu_icon.png",text:"微信支付"},{type:"xianjin",Img:"../images/xianjichongzhi_icon.png",text:"现金支付"},{type:"yinlian",Img:"../images/yinlianzhifu_icon.png",text:"银联支付"},{type:"zhifubao",Img:"../images/zhifubaozhifu_icon.png",text:"支付宝支付"}],
 
		},
 
		mounted: function() {
 
			var vm = this
 
@ -75,7 +76,7 @@ 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'),"hyStatus":Request.hyStatus}
 
				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}
 
				vm.result=vm.successResult
 
//				if(Request.hyStatus==1){
 
//					vm.result=vm.successResult
 
@ -99,7 +100,7 @@ var loading = dialog({
 
			},
 
			//
 
			backClick:function(){
 
				window.history.back();
 
				window.location.href='../../payment/html/patientIDCards-pay.html?id='+Request.cardId;
 
			},
 
			//判断是否验证登录通过
 
			checkType:function(){