Home Explore Help
Register Sign In
Amoy2
/
sr-iHealthwx
Watch 2
Star 0
Fork 1
Files
Browse Source

【优化】调整“充值查询”查询时间的选择范围
【优化】调整微信公众号“就医服务→就诊缴费”功能菜单
【优化】优化结算缴费流程，显示结算结果及充值进度提醒

chenyue 6 years ago
parent
167170ae5f
commit
a71f08f7cd
24 changed files with 387 additions and 58 deletions
Unified View Show Diff Stats
  1. 9 0
      html/grzx/html/my-detail.html
  2. BIN
      html/grzx/images/jiaofeichaxuan_icon.png
  3. BIN
      html/grzx/images/jiaofeijiesuan_icon.png
  4. 35 1
      html/payment/css/payment.css
  5. 69 0
      html/payment/html/electronicHealthCard.html
  6. 1 0
      html/payment/html/patientIDCards-pay.html
  7. 4 1
      html/payment/html/patientIDCards.html
  8. 2 1
      html/payment/html/paymentResult.html
  9. 43 35
      html/payment/html/repaymentResult.html
  10. BIN
      html/payment/images/createcarding.gif
  11. BIN
      html/payment/images/dianzika_bg_img.png
  12. BIN
      html/payment/images/dianzizhang_img.png
  13. BIN
      html/payment/images/jiankangkabao_img.png
  14. BIN
      html/payment/images/jiankazhong_bg_img.png
  15. BIN
      html/payment/images/jiesuanzhong_icon.png
  16. BIN
      html/payment/images/shiyongshuoming_icon.png
  17. BIN
      html/payment/images/tiaozhuan_icon.png
  18. 90 0
      html/payment/js/electronicHealthCard.js
  19. 19 0
      html/payment/js/patientIDCards-pay.js
  20. 4 0
      html/payment/js/patientIDCards.js
  21. 2 1
      html/payment/js/payment.js
  22. 14 12
      html/payment/js/paymentList.js
  23. 6 1
      html/payment/js/paymentResult.js
  24. 89 6
      html/payment/js/repaymentResult.js

+ 9 - 0
html/grzx/html/my-detail.html
View File 

@ -64,6 +64,15 @@
 
						<img src="../images/tiaozhuan_icon.png" width="7" height="14" class="mr15 fr mt5" />
 
						<img src="../images/tiaozhuan_icon.png" width="7" height="14" class="mr15 fr mt5" />
 
					</div>
 
					</div>
 
				</li>
 
				</li>
 
                <li class="cur-pit clearfix" onclick="goPage('../../payment/html/repayment.html')">
 
                    <div class="c-list-key">
 
                        <img src="../images/jiaofeijiesuan_icon.png" width="20" height="20" class="" />
 
                    </div>
 
                    <div class="c-list-info">
 
                        <span class="c-f17 c-333">缴费结算</span>
 
                        <img src="../images/tiaozhuan_icon.png" width="7" height="14" class="mr15 fr mt5" />
 
                    </div>
 
                </li>
 
				<li class="cur-pit clearfix" onclick="goPage('../../informationSearch/html/waitingDoctorList.html')">
 
				<li class="cur-pit clearfix" onclick="goPage('../../informationSearch/html/waitingDoctorList.html')">
 
					<div class="c-list-key">
 
					<div class="c-list-key">
 
						<img src="../images/houzhenchaxuan_icon.png" width="20" height="20" class="" />
 
						<img src="../images/houzhenchaxuan_icon.png" width="20" height="20" class="" />

BIN
html/grzx/images/jiaofeichaxuan_icon.png
View File


BIN
html/grzx/images/jiaofeijiesuan_icon.png
View File


+ 35 - 1
html/payment/css/payment.css
View File 

@ -11,6 +11,9 @@
 
.c-ff5e6c{
 
.c-ff5e6c{
 
	color: #ff5e6c;	
	color: #ff5e6c;	
}
 
}
 
.c-FF6A56{
 
color: #FF6A56; 
}
 
.c-f25{
 
.c-f25{
 
	font-size: 25px;
 
	font-size: 25px;
 
}
 
}
 
@ -73,6 +76,8 @@
 
	padding-top: 13px;
 
	padding-top: 13px;
 
	padding-bottom: 13px;	
	padding-bottom: 13px;	
}
 
}
 
.pl25{
 
padding-left: 25px;}
 
.mt7{
 
.mt7{
 
	margin-top: 7px;
 
	margin-top: 7px;
 
@ -471,4 +476,33 @@ a:active{
 
}
 
}
 
.c-list > .c-list-link:active {
 
.c-list > .c-list-link:active {
 
    background-color: #ffffff;
 
    background-color: #ffffff;
 
    }
 
    }
 
    
.dianzikaBg{
 
  background-repeat: no-repeat;
 
  background-image: url(../images/dianzika_bg_img.png);
 
  background-size: 100% 100%;
 
  padding:72px  10px 68px 15px;
 
  /*height: 100px;*/
 
  position: relative;
 
  text-align: center;
 
}
 
.dianzikaFont{
 
 color: #333333;
 
 font-size: 14px;
 
 text-align: left;
 
 padding-left: 20px;
 
}
 
@media screen and (max-width: 330px) {
 
    .dianzikaFont{
 
     font-size: 12px;
 
     padding-left: 10px;
 
    }
 
}
 
.c-border-r-5{
 
    border-radius: 5px;
 
}
 
.c-border-r-10{
 
    border-radius: 10px;
 
}

+ 69 - 0
html/payment/html/electronicHealthCard.html
View File 

@ -0,0 +1,69 @@
 
<!DOCTYPE html>
 
<html>
 
	<head>
 
		<meta charset="utf-8">
 
        <meta name="format-detection" content="telephone=no"/>
 
        <meta name="viewport"
 
              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>
 
		<meta name="keywords" content="">
 
		<meta name="description" content="">
 
		<link rel="shortcut icon" href="../../../favicon.ico">
 
		<link rel="stylesheet" type="text/css" href="../../../css/cross.css" />
 
		<link rel="stylesheet" type="text/css" href="../../../css/cross.ui.css" />
 
		<link rel="stylesheet" type="text/css" href="../../../css/flex.css" />
 
		<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>
 
	
	<body class="bgc-f2f3f4">
 
		<div id="app" v-cloak>
 
			<div class="pt100 plr15 c-t-center" v-if="isloading">
 
			    <img src="../images/jiankazhong_bg_img.png"  style="width:100%;"/>
 
			    <div style="margin-top: -40px;">
 
                    <div class="c-f12">建卡中...</div>
 
                    <img src="../images/createcarding.gif" style="width:161px;"/>			        
			    </div>
 
			</div>
 
			<div v-else>
 
			    <div class="pt10 plr15">
 
                    <div class="dianzikaBg">
 
                        <div style="padding-left: 10px;" class="flex">    
                            <div class="f_s_0" style="width:80px;">
 
                                <img src="../../../images/p-default.png" style="width:60px;height:80px;"/>
 
                            </div>
 
                            <div class="f_g_1 dianzikaFont">
 
                                <div>姓名：xxx</div>
 
                                <div class="mt10">性别：男</div>
 
                                <div class="mt10">卡号：6*************0018</div>
 
                            </div>
 
                        </div>
 
                        <div class="c-position-a" style="margin-top: -40px;">
 
                            <img src="../images/dianzizhang_img.png" style="width:60px;height: 60px;"/>
 
                        </div>
 
                    </div>
 
                    <div class="c-border-r-10 bgc-fff  c-t-center ptb20 mt10 c-border">
 
                        <img src="../images/dianzizhang_img.png"  style="width:180px;height: 180px;"/>
 
                        <div class="mt15 c-f14 c-333">就诊码</div>
 
                    </div>                    
                </div>
 
                <div class="c-border-tb flex bgc-fff mt10 c-positon-r">
 
                    <div class="f_g_1 ptb12 plr15">
 
                        <img src="../images/shiyongshuoming_icon.png" style="width: 19px;margin-top: 2px;"/>
 
                        <span class="c-f17 pl25 c-positon-a" >使用说明</span>
 
                        <img src="../images/tiaozhuan_icon.png" width="7" height="14" class="fr mr15 mt5" />                       
                    </div>
 
                </div>
 
			</div>
 
			
		</div>
 
		<script src="../../../js/post.js"></script>
 
		<script src="../../../widget/artDialog/6.0.5/js/dialog-plus.js"></script>
 
		<script src="../js/electronicHealthCard.js"></script>
 
	</body>
 
</html>

+ 1 - 0
html/payment/html/patientIDCards-pay.html
View File 

@ -20,6 +20,7 @@
 
	<body class="bgc-f2f3f4">
 
	<body class="bgc-f2f3f4">
 
		<div id="app" v-cloak>
 
		<div id="app" v-cloak>
 
		    <div class="c-f14 c-666666 ptb10 bgc-fff c-border-b pl15" v-if="hyStatusLength>0"><img src="../images/tishi_icon.png" width="13" class="mr10"/>您有{{hyStatusLength}}笔充值款正在同步，点击查看<span class="c-17B3EC" @click="gotoList()">到款进度</span></div>
 
			<div class="plr15">
 
			<div class="plr15">
 
				<div class="labelIcon mt10 jiuzhen2 c-radius-5 c-fff">
 
				<div class="labelIcon mt10 jiuzhen2 c-radius-5 c-fff">
 
					<div class="c-f14 pt12 pl10">
 
					<div class="c-f14 pt12 pl10">

+ 4 - 1
html/payment/html/patientIDCards.html
View File 

@ -26,7 +26,10 @@
 
	<body class="bgc-f2f3f4">
 
	<body class="bgc-f2f3f4">
 
		<div id="app" v-cloak>
 
		<div id="app" v-cloak>
 
			<div class="c-f14 c-fff ptb10 bgc-000 pl15"><img src="../images/tishi02_icon.png" width="13" class="mr10"/>查看就诊卡信息，快速进行在线缴费</div>
 
			<div class="c-f14 c-fff ptb10 bgc-000 pl15"><img src="../images/tishi02_icon.png" width="13" class="mr10"/>查看就诊卡信息，快速进行在线缴费</div>
 
			<div  class="plr15" v-show="length!=0">				
			<div  class="plr15" v-show="length!=0">	
			    <!--<div class="mt10" @click="gotoEHCard">
 
			        <img src="../images/jiankangkabao_img.png" style="width: 100%;"/>
 
			    </div>-->
 
				<div class="bgc-fff mt10 jiuzhen c-radius-20 c-f14" v-for="(item,i) in dataList" v-key="i"  @click="gotoPay(item.id)">
 
				<div class="bgc-fff mt10 jiuzhen c-radius-20 c-f14" v-for="(item,i) in dataList" v-key="i"  @click="gotoPay(item.id)">
 
					<div class="pt12 pb5 pl15">
 
					<div class="pt12 pb5 pl15">
 
						<span class="c-333333">{{item.cardNo}}&nbsp;({{item.name}})&nbsp;</span>
 
						<span class="c-333333">{{item.cardNo}}&nbsp;({{item.name}})&nbsp;</span>

+ 2 - 1
html/payment/html/paymentResult.html
View File 

@ -60,7 +60,8 @@
 
				</ul>
 
				</ul>
 
			</div>
 
			</div>
 
			<div class="p30 failure-btn">
 
			<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>
 
				<button type="button" class="c-btn-4dcd70 c-btn-arc c-btn-full  c-btn-big" style="height: 45px;" @click="backClick">缴费查询</button>
 
                <button type="button" class="c-btn-fff c-btn-arc c-btn-full  c-btn-big mt20" style="height: 45px;color:#4dcd70;" @click="gotoPatientIDCard">返回就诊卡</button>
 
			</div>
 
			</div>
 
		</div>
 
		</div>

+ 43 - 35
html/payment/html/repaymentResult.html
View File 

@ -19,41 +19,49 @@
 
	</head>
 
	</head>
 
	<body class="bgc-f2f3f4">
 
	<body class="bgc-f2f3f4">
 
		<div id="app"  v-cloak :class="result.status">			
			<div class="bgc-fff c-f14 plr35">
 
				<div class="c-t-center pt10 pb20">						
					<img :src="result.Img" width="46"/>
 
					<div class="mt7 c-f20 txtColor">{{result.txt}}</div>
 
					<div class="mt10 c-999 c-f14" style="line-height: 24px;">{{result.msg}}</div>
 
				</div>
 
			</div>
 
			<div class="mt10 success-list">				
				<ul class="c-list  c-border-b">
 
					<li class="ptb13">
 
						<div class="c-list-info">缴费说明</div>
 
			            <div class="c-list-key c-999">{{healthType[data.healthType]}}</div>					
					</li>
 
					<li class="ptb13">
 
						<div class="c-list-info">订单金额</div>
 
			            <div class="c-list-key c-999">{{data.payAmount}} 元</div>					
					</li>
 
					<li class="ptb13">
 
						<div class="c-list-info">就诊人</div>
 
			            <div class="c-list-key c-999">{{data.patientName}}</div>					
					</li>
 
					<li class="ptb13">
 
						<div class="c-list-info">就诊卡号</div>
 
			            <div class="c-list-key c-999">{{data.healthNo}}</div>					
					</li>
 
					<li class="ptb13">
 
						<div class="c-list-info">缴费时间</div>
 
			            <div class="c-list-key c-999">{{data.createDate}}</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 id="app"  v-cloak :class="result.status">
 
		    <div v-if="isloading" class="c-t-center pt50 plr35">
 
		        <img src="../images/jiesuanzhong_icon.png" width="50"/>
 
		        <div class="c-f20 c-4dcd70">结算中...</div>
 
		        <div class="c-999 c-f14 mt15">微信充值已成功，系统<span class="plr15 c-FF6A56">{{countTime}}秒</span>后完成缴费结算，请稍等~</div>
 
		    </div>
 
		    <div v-else>
 
		        <div class="bgc-fff c-f14 plr35">
 
                    <div class="c-t-center pt10 pb20">                      
                        <img :src="result.Img" width="46"/>
 
                        <div class="mt7 c-f20 txtColor">{{result.txt}}</div>
 
                        <div class="mt10 c-999 c-f14" style="line-height: 24px;">{{result.msg}}</div>
 
                    </div>
 
                </div>
 
                <div class="mt10 success-list">             
                    <ul class="c-list  c-border-b">
 
                        <li class="ptb13">
 
                            <div class="c-list-info">缴费说明</div>
 
                            <div class="c-list-key c-999">{{healthType[data.healthType]}}</div>                 
                        </li>
 
                        <li class="ptb13">
 
                            <div class="c-list-info">订单金额</div>
 
                            <div class="c-list-key c-999">{{data.payAmount}} 元</div>                    
                        </li>
 
                        <li class="ptb13">
 
                            <div class="c-list-info">就诊人</div>
 
                            <div class="c-list-key c-999">{{data.patientName}}</div>                    
                        </li>
 
                        <li class="ptb13">
 
                            <div class="c-list-info">就诊卡号</div>
 
                            <div class="c-list-key c-999">{{data.healthNo}}</div>                   
                        </li>
 
                        <li class="ptb13">
 
                            <div class="c-list-info">缴费时间</div>
 
                            <div class="c-list-key c-999">{{data.createDate}}</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>
 
                    <button type="button" class="c-btn-fff c-btn-arc c-btn-full  c-btn-big mt20" style="height: 45px;color:#4dcd70;" @click="gotoPatientIDCard">返回就诊卡</button>
 
                </div>
 
		    </div>			
		</div>
 
		</div>
 
		<script src="../../../js/post.js"></script>
 
		<script src="../../../js/post.js"></script>

BIN
html/payment/images/createcarding.gif
View File


BIN
html/payment/images/dianzika_bg_img.png
View File


BIN
html/payment/images/dianzizhang_img.png
View File


BIN
html/payment/images/jiankangkabao_img.png
View File


BIN
html/payment/images/jiankazhong_bg_img.png
View File


BIN
html/payment/images/jiesuanzhong_icon.png
View File


BIN
html/payment/images/shiyongshuoming_icon.png
View File


BIN
html/payment/images/tiaozhuan_icon.png
View File


+ 90 - 0
html/payment/js/electronicHealthCard.js
View File 

@ -0,0 +1,90 @@
 
var checktype=false;
 
(function() {
 
	myvue=new Vue({
 
		el: "#app",
 
		data: {
 
		    isloading:true,
 
		},
 
		mounted:function(){
 
			var vm = this
 
			checkUserAgent();
 
			vm.code=JSON.parse(localStorage.getItem("wlyyAgent")).uid
 
			vm.checkType()
 
		},
 
		methods: {
 
			//获取列表数据
 
			getData:function(){
 
				var vm=this
 
				var loading = dialog({
 
					contentType: 'load',
 
					skin: 'bk-popup'
 
				});
 
				loading.showModal();
 
				 sendPost("patient/card/getCardList", {patient:vm.code}, "json", "get",function(){
 
				 	loading.close();
 
			    	dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:'请求失败'}).show();
 
			       }, function(res){
 
			   		loading.close();
 
			        if(res.status == 200){ 
			        	vm.dataList=res.data
 
			            vm.length=vm.dataList.length
 
		                vm.surplus=5-vm.length	
			        }else{
 
			          dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:'数据获取失败'}).show();
 
			        }
 
			    })
 
			},
 
			//设置默认就诊卡
 
			setDefault:function(id,isDefault){
 
				var vm=this				
				var loading = dialog({
 
					contentType: 'load',
 
					skin: 'bk-popup',
 
					content:'设置中...'
 
				});
 
				loading.showModal()
 
				sendPost("/patient/card/defaultOpe", {id:id,isDefault:isDefault}, "json", "post",function(){
 
		          }, function(res){
 
		          	loading.close()
 
	                if(res.status == 200){
 
	                  dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:res.msg}).show();
 
					  vm.getData()
 
	                }else{
 
	                  dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:'数据获取失败'}).show();
 
	                }
 
	            })				
			},
 
			//跳转绑定就诊卡
 
			gotoBindingCard:function(){
 
				var vm=this
 
				if(vm.surplus>0){
 
					window.location.href='../../payment/html/bindingCard.html';
 
				}else{
 
					dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:"最多只能绑定5张就诊卡"}).show();
 
				}				
			},
 
			//前往电子健康卡
 
			gotoEHCard:function(){
 
			    window.location.href='../../payment/html/electronicHealthCard.html';
 
			},
 
			gotoPay:function(id){
 
				window.location.href='../../payment/html/patientIDCards-pay.html?id='+id;
 
			},
 
			//判断是否验证登录通过
 
			checkType:function(){
 
				var vm=this
 
				var timer = setInterval(function(){
 
					if(checktype){
 
						clearInterval(timer);
 
						vm.getData()
 
					}
 
				},10);
 
			},
 
		},
 
	})
 
})()
 
function queryInit(){
 
	checktype=true
 
}

+ 19 - 0
html/payment/js/patientIDCards-pay.js
View File 

@ -27,6 +27,7 @@ var loading = dialog({
 
		   },
 
		   },
 
			BtnClass:"p-fix-bottom-0",
 
			BtnClass:"p-fix-bottom-0",
 
			length:1,
 
			length:1,
 
			hyStatusLength:0,
 
		},
 
		},
 
		mounted:function(){
 
		mounted:function(){
 
			var vm = this
 
			var vm = this
 
@ -101,6 +102,7 @@ var loading = dialog({
 
			          dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:'数据获取失败'}).show();
 
			          dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:'数据获取失败'}).show();
 
			        }
 
			        }
 
			    })
 
			    })
 
                vm.getHyStatusNum()  //获取未同步缴费数
 
			},
 
			},
 
			//解绑就诊卡
 
			//解绑就诊卡
 
			untieCard:function(){
 
			untieCard:function(){
 
@ -120,6 +122,23 @@ var loading = dialog({
 
			        }
 
			        }
 
			    })
 
			    })
 
			},
 
			},
 
			getHyStatusNum(){
 
			    var vm=this  
                var hyParams={
 
                    healthNo:vm.cardId,
 
                    chargeType:"",   //1：门诊，2：住院，
 
                    patient:vm.code,
 
                }
 
                sendPost("third/hy/pay/gerUnpayOrderList", hyParams, "json", "get",function(){
 
                    dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:'请求失败'}).show();
 
                  }, function(res){
 
                    if(res.status == 200){ 
                        vm.hyStatusLength =res.data            
                    }else{
 
                        dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:res.msg}).show();
 
                    }
 
                })
 
			},
 
			gotoRepay:function(paytype){ //paytype 1为门诊缴费  2为住院缴费
 
			gotoRepay:function(paytype){ //paytype 1为门诊缴费  2为住院缴费
 
				var vm=this
 
				var vm=this
 
				window.location.href='../../payment/html/repayment.html?id='+vm.cardId;				
				window.location.href='../../payment/html/repayment.html?id='+vm.cardId;

+ 4 - 0
html/payment/js/patientIDCards.js
View File 

@ -72,6 +72,10 @@ var checktype=false;
 
					dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:"最多只能绑定5张就诊卡"}).show();
 
					dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:"最多只能绑定5张就诊卡"}).show();
 
				}				
				}				
			},
 
			},
 
			//前往电子健康卡
 
			gotoEHCard:function(){
 
			    window.location.href='../../payment/html/electronicHealthCard.html';
 
			},
 
			gotoPay:function(id){
 
			gotoPay:function(id){
 
				window.location.href='../../payment/html/patientIDCards-pay.html?id='+id;
 
				window.location.href='../../payment/html/patientIDCards-pay.html?id='+id;
 
			},
 
			},

+ 2 - 1
html/payment/js/payment.js
View File 

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

+ 14 - 12
html/payment/js/paymentList.js
View File 

@ -43,11 +43,12 @@ var iscrollState='';//判断滑动方向
 
			cardlenght:0,
 
			cardlenght:0,
 
			cardId:"",
 
			cardId:"",
 
			queryList:{
 
			queryList:{
 
				month:"",
 
//				month:"",
 
				healthNo:"",
 
				healthNo:"",
 
				chargeType:"1",   //1：门诊，2：住院，
 
				chargeType:"1",   //1：门诊，2：住院，
 
				pageNo:1,
 
				pageNo:1,
 
				pageSize:10,
 
				pageSize:10,
 
				year:"",
 
			},
 
			},
 
			code:"",
 
			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:"支付宝支付"}],
 
			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:"支付宝支付"}],
 
@ -59,11 +60,11 @@ var iscrollState='';//判断滑动方向
 
			checkUserAgent();
 
			checkUserAgent();
 
			vm.checkType()
 
			vm.checkType()
 
			vm.code=JSON.parse(localStorage.getItem("wlyyAgent")).uid
 
			vm.code=JSON.parse(localStorage.getItem("wlyyAgent")).uid
 
			var month=new Date().getMonth()+1
 
			if(month<=9){
 
			   month="0"+month
 
			}
 
			vm.queryList.month=new Date().getFullYear()+"-"+month			
//			var month=new Date().getMonth()+1
 
//			if(month<=9){
 
//			   month="0"+month
 
//			}
 
			vm.queryList.year=new Date().getFullYear() //+"-"+month			
			vm.eventClick()
 
			vm.eventClick()
 
		},
 
		},
 
		methods: {	
		methods: {	
@ -123,7 +124,8 @@ var iscrollState='';//判断滑动方向
 
					vm.dataList=[]
 
					vm.dataList=[]
 
					vm.isUPsuccess=true
 
					vm.isUPsuccess=true
 
				}
 
				}
 
				sendPost("third/hy/pay/gerPayOrderList", vm.queryList, "json", "get",function(){
 
//				sendPost("third/hy/pay/gerPayOrderList", vm.queryList, "json", "get",function(){
 
                sendPost("third/hy/pay/gerPayOrderListByYear", vm.queryList, "json", "get",function(){
 
			   		loading.close();
 
			   		loading.close();
 
			   		mui('#wrapper').pullRefresh().endPulldownToRefresh(false);
 
			   		mui('#wrapper').pullRefresh().endPulldownToRefresh(false);
 
					mui('#wrapper').pullRefresh().enablePullupToRefresh();//重置
 
					mui('#wrapper').pullRefresh().enablePullupToRefresh();//重置
 
@ -170,15 +172,15 @@ var iscrollState='';//判断滑动方向
 
				var vm=this
 
				var vm=this
 
				$('.date-icon').mobiscroll({
 
				$('.date-icon').mobiscroll({
 
	                preset: 'date',
 
	                preset: 'date',
 
			        dateOrder: 'yymm',
 
			        dateFormat: 'yy-mm',
 
			        dateOrder: 'yy',
 
			        dateFormat: 'yy',
 
			        theme: 'ios',
 
			        theme: 'ios',
 
			        lang:'zh',
 
			        lang:'zh',
 
			        minDate: new Date(2015,1),
 
			        minDate: new Date(2015),
 
			        maxDate: new Date(),
 
			        maxDate: new Date(),
 
			        onSelect: function(valueText, inst){
 
			        onSelect: function(valueText, inst){
 
						if(vm.queryList.month!=valueText){
 
							vm.queryList.month=valueText	
						if(vm.queryList.year!=valueText){
 
							vm.queryList.year=valueText	
							vm.getList(1)							
							vm.getList(1)							
						}
 
						}
 
					},
 
					},

+ 6 - 1
html/payment/js/paymentResult.js
View File 

@ -100,8 +100,13 @@ var loading = dialog({
 
			},
 
			},
 
			//
 
			//
 
			backClick:function(){
 
			backClick:function(){
 
				window.location.href='../../payment/html/patientIDCards-pay.html?id='+Request.cardId;
 
//				window.location.href='../../payment/html/patientIDCards-pay.html?id='+Request.cardId;  //就诊充值页面
 
                window.location.href='../../payment/html/paymentList.html?id='+Request.cardId; //缴费查询页面
 
			},
 
			},
 
			//就诊卡页面
 
			gotoPatientIDCard:function(){
 
                window.location.href='../../payment/html/patientIDCards.html';
 
            },
 
			//判断是否验证登录通过
 
			//判断是否验证登录通过
 
			checkType:function(){
 
			checkType:function(){
 
				var vm=this
 
				var vm=this

+ 89 - 6
html/payment/js/repaymentResult.js
View File 

@ -9,6 +9,9 @@ var loading = dialog({
 
	new Vue({
 
	new Vue({
 
		el: "#app",
 
		el: "#app",
 
		data: {
 
		data: {
 
		    cardId:"", //当前cardid
 
		    isloading:true,
 
		    countTime:6,		    
			result:{},
 
			result:{},
 
			successResult:{
 
			successResult:{
 
				status:"success-pay",
 
				status:"success-pay",
 
@ -18,7 +21,7 @@ var loading = dialog({
 
			},			
			},			
			synchronizationResult:{
 
			synchronizationResult:{
 
				status:"synchronization-pay",
 
				status:"synchronization-pay",
 
				msg:"系统繁忙，请重新充值缴费。",
 
				msg:"很抱歉，结算系统繁忙，充值款仍在同步至就诊卡，无法自动完成结算。稍后您可以返回就诊卡查看到款进度，到款后再次发起结算缴费。",
 
				Img:"../images/jiaofeishibai_icon.png",	
				Img:"../images/jiaofeishibai_icon.png",	
				txt:"缴费失败",				
				txt:"缴费失败",				
			},
 
			},
 
@ -30,14 +33,91 @@ var loading = dialog({
 
			},
 
			},
 
			healthType:["","账单结算缴费","住院缴费充值"],
 
			healthType:["","账单结算缴费","住院缴费充值"],
 
			initdata:{"patientName":"","healthNo":"","healthType":1,"payAmount":"","createDate":"",},
 
			initdata:{"patientName":"","healthNo":"","healthType":1,"payAmount":"","createDate":"",},
 
			data:{},
 
			carddata:{},
 
		},
 
		},
 
		mounted: function() {
 
		mounted: function() {
 
			var vm = this
 
			var vm = this
 
			checkUserAgent();
 
			checkUserAgent();
 
			vm.checkType()
 
			vm.checkType()
 
			vm.cardId=Request.cardId
 
		},
 
		},
 
		methods: {
 
		methods: {		    
            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){
 
                    loading.close();
 
                    if(res.status == 200){ 
                        vm.carddata=res.data  
                        if(parseFloat(Request.payAmount)<=vm.carddata.cardMoney){
 
//                          vm.countTime=0
 
                            vm.isloading=false
 
                            vm.data=vm.initdata
 
                            vm.torePay()
 
                        }else{
 
//                          vm.showTime()
 
                            //每秒执行一次,showTime()
 
                            setTimeout(function(){
 
                                vm.showTime()
 
                            },1000);
 
                        }
 
                    }else{
 
                      dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:'数据获取失败'}).show();
 
                    }
 
                })
 
            },
 
            showTime:function(){            
                var vm=this
 
                vm.countTime -= 1;
 
                if(vm.countTime<=0){
 
                    vm.isloading=false
 
                    vm.getData()
 
                    vm.result=vm.synchronizationResult
 
                }else{
 
                    vm.getCardInfo()                    
                }
 
            },
 
            //缴费结算
 
            torePay: function() {
 
                var vm = this
 
                var reloading = dialog({
 
                    contentType: 'load',
 
                    skin: 'bk-popup',
 
                    content:'缴费结算中...'
 
                });
 
                reloading.showModal();
 
                sendPost("/third/hy/paySettle/outpSettle", {
 
                    hisId: vm.carddata.hisId
 
                }, "json", "get", function() {
 
                    reloading.close();
 
                    dialog({
 
                        contentType: 'tipsbox',
 
                        bottom: true,
 
                        skin: 'bk-popup',
 
                        content: '请求失败'
 
                    }).show();
 
                }, function(res) {
 
                    reloading.close();
 
                    if(res.status == 200) {
 
                        if(res.data.code == 0) {
 
                            vm.getData()
 
                        }else{    
                            vm.getData()
 
                            vm.result=vm.synchronizationResult
 
                            vm.result.msg=res.data.message
 
                        }
 
                    } else {
 
                        dialog({
 
                            contentType: 'tipsbox',
 
                            bottom: true,
 
                            skin: 'bk-popup',
 
                            content: res.msg || '数据查询失败'
 
                        }).show();
 
                    }
 
                })
 
            },
 
			//获取数据
 
			//获取数据
 
			getData:function(){
 
			getData:function(){
 
				var vm=this
 
				var vm=this
 
@ -45,15 +125,18 @@ var loading = dialog({
 
				vm.data={"patientName":getQueryString('patientName'),"healthNo":Request.healthNo,"payAmount":Request.payAmount,"createDate":getQueryString('createDate'),"healthType":1,}
 
				vm.data={"patientName":getQueryString('patientName'),"healthNo":Request.healthNo,"payAmount":Request.payAmount,"createDate":getQueryString('createDate'),"healthType":1,}
 
			},
 
			},
 
			backClick:function(){
 
			backClick:function(){
 
				window.location.href='../../payment/html/repayment.html?id='+Request.cardId;
 
			},
 
				window.location.href='../../payment/html/paymentList.html?id='+Request.cardId; //缴费查询页面
 
			},//就诊卡页面
 
            gotoPatientIDCard:function(){
 
                window.location.href='../../payment/html/patientIDCards.html';
 
            },
 
			//判断是否验证登录通过
 
			//判断是否验证登录通过
 
			checkType:function(){
 
			checkType:function(){
 
				var vm=this
 
				var vm=this
 
				var timer = setInterval(function(){
 
				var timer = setInterval(function(){
 
					if(checktype){
 
					if(checktype){
 
						clearInterval(timer);
 
						clearInterval(timer);
 
						vm.getData()
 
						vm.getCardInfo()
 
					}
 
					}
 
				},10);
 
				},10);
 
			},
 
			},