chenyue 6 роки тому
батько
коміт
4753a17bb9

+ 10 - 7
html/informationSearch/js/waitingDoctorList.js

@ -10,7 +10,7 @@ var loading = dialog({
		data: {
			data:{},
			dataList:[],
			length:1,
			length:0,
			code:"",
			TypeList:[{},{type:"jiuzhen",text:"门诊",pretext:"候诊"},{type:"jiancha",text:"检查检验",pretext:"候检"}],
		},
@ -44,8 +44,7 @@ var loading = dialog({
				        			vm.data=res.data[0]
				        		}
							}
//			        		vm.queryList.healthNo=vm.data.cardNo
//			        		vm.getList()
			        		vm.getList()
			        	}else{
			        		vm.gotoCards()
			        	}
@ -58,14 +57,18 @@ var loading = dialog({
			//获取列表数据
			getList:function(){
				var vm=this
				 sendPost("third/hy/pay/gerPayOrderList", vm.queryList, "json", "get",function(){
				 sendPost("patient/diag/waitVisit", {cardNo:vm.data.cardNo}, "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=JSON.parse(res.data)
			        	vm.length=vm.dataList.length
			        if(res.status == 200){
			        	if(res.data.code=="0"){
			        		vm.dataList=res.data
			        		vm.length=vm.dataList.length
			        	}else{
			        		 dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:res.data.message}).show();
			        	}
			        }else{
			          dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:'数据获取失败'}).show();
			        }

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

@ -117,7 +117,7 @@
}
.circle-btn{
	position: absolute;
	position: fixed;
    bottom: 80px;
    right: 20px;
    width: 45px;
@ -128,6 +128,7 @@
    font-size: 12px;
    color: #FFFFFF;    
    text-align: center;
    z-index: 2;
}
/*缴费查询*/

+ 2 - 2
html/payment/html/patientIDCards-pay.html

@ -27,7 +27,7 @@
						<span class="card-icon" style="float: right;">就诊</span>
					</div>
					<div class="pb10 c-t-center c-ff9526 c-f25">
						¥{{data.cardMoney?data.cardMoney:0}}元
						¥ {{data.cardMoney?data.cardMoney:0}} 元
					</div>
					<div class="pb10 c-999 pr10 c-f12 c-t-right createdata">
						{{data.createDate}} 创建
@ -43,7 +43,7 @@
						<span class="card-icon" style="float: right;">住院</span>
					</div>
					<div class="pb10 c-t-center c-ff9526 c-f25">
						¥{{data.cardInpMoney}} 元
						¥ {{data.cardInpMoney}} 元
					</div>
					<div class="pb10 c-999 pr10 c-f12 c-t-right createdata">						
					</div>

+ 23 - 18
html/payment/html/paymentList.html

@ -11,6 +11,7 @@
		<meta name="keywords" content="">
		<meta name="description" content="">
		<link rel="shortcut icon" href="../../../favicon.ico">
		<link rel="stylesheet" type="text/css" href="../../../css/mui.min.css"/>
		<link rel="stylesheet" type="text/css" href="../../../css/cross.css" />
		<link rel="stylesheet" type="text/css" href="../../../widget/artDialog/6.0.5/css/ui-dialog.min.css">
		<link rel="stylesheet" type="text/css" href="../../../css/mobiscroll.css" />
@ -22,24 +23,28 @@
			<div class="bgc-fff c-f17 plr15 ptb10" >
				<span class="c-333">{{data.cardNo}}&nbsp;({{data.name}})&nbsp;</span>
				<span class="qiehuan-txt" @click="changeCards">切换</span>
				<span><img src="../images/rili_icon.png" class="date-icon"/></span>				
			</div>			
			<ul class="plr15 pb15"  v-if="length!=0">
				<li class="labelIcon" :class="payTypeList[item.payType]?payTypeList[item.payType].type:''"  v-for="(item,i) in dataList" v-key="i"  @click="gotoResult(item.seqNo)">
					<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>
					</div>	
					<div class="mt5">
						<span class="c-f20">¥&nbsp;{{item.payAmount}} 元</span>
						<span class="c-f14 mt5" style="float: right;">{{healthType[item.healthType]}}-{{item.patientName}}</span>
					</div>	
					<div class="mt5 c-f12">
						<span>{{item.hospitalName}}</span>
						<span style="float: right;">{{item.payTimeStart}}</span>
					</div>	
				</li>	
			</ul>
				<img src="../images/rili_icon.png" class="date-icon"/>			
			</div>
			<div id="wrapper" class="mui-scroll-wrapper" style="top: 50px;"  v-if="length!=0">
				<div class="mui-scroll">
					<ul class="plr15 pb15">
						<li class="labelIcon" :class="payTypeList[item.payType]?payTypeList[item.payType].type:''"  v-for="(item,i) in dataList" v-key="i"  @click="gotoResult(item.seqNo)">
							<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>
							</div>	
							<div class="mt5">
								<span class="c-f20">¥&nbsp;{{item.payAmount}} 元</span>
								<span class="c-f14 mt5" style="float: right;">{{healthType[item.healthType]}}-{{item.patientName}}</span>
							</div>	
							<div class="mt5 c-f12">
								<span>{{item.hospitalName}}</span>
								<span style="float: right;">{{item.payTimeStart}}</span>
							</div>	
						</li>	
					</ul>
				</div>
			</div>
			<div class="default-div" v-else>
				<img src="../images/wushuju.png" width="222"/>
				<div class="c-999 c-f14 pt30">

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

@ -50,7 +50,7 @@ var checktype=false;
				if(Request.pre=="paymentList"){   //跳到缴费查询页面
					window.location.href='../../payment/html/paymentList.html?id='+id;
				}else if(Request.pre=="waitingDoctorList"){   //跳到候诊查询页面
					window.location.href='../../payment/html/waitingDoctorList.html?id='+id;
					window.location.href='../../informationSearch/html/waitingDoctorList.html?id='+id;
				}else{
					
				}

+ 30 - 15
html/payment/js/payment.js

@ -23,6 +23,7 @@ var loading = dialog({
			checkUserAgent();
			vm.code=JSON.parse(localStorage.getItem("wlyyAgent")).uid
			vm.checkType()
			$(".c-ser-input").focus()
		},
		methods: {
			//获取列表数据
@ -36,10 +37,10 @@ var loading = dialog({
				 	    loading.close();
			        	vm.data=res.data 
			        	if(vm.paytype=="1"){
			        		vm.surplusMoney=vm.data.cardMoney
			        		vm.surplusMoney=vm.data.cardMoney?vm.data.cardMoney:0
			        		vm.cardNo=vm.data.cardNo
			        	}else{
			        		vm.surplusMoney=vm.data.cardInpMoney
			        		vm.surplusMoney=vm.data.cardInpMoney?vm.data.cardInpMoney:0
			        		vm.cardNo=vm.data.inpCardNo
			        	}
			        }else{
@ -53,10 +54,10 @@ var loading = dialog({
				var vm=this
				loading.showModal();
				if(vm.payMoney){					
//					if(judgeWxVersion()){
//						vm.getWeixinSign()
//					}
					vm.getWeixinSign()
					if(judgeWxVersion()){
						vm.getWeixinSign()
					}
//					vm.getWeixinSign()
				}else{
				 	 loading.close();
					 dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:'请输入充值金额'}).show();
@ -97,7 +98,7 @@ var loading = dialog({
			wxReady:function(){
				var vm=this
				var params = {
					patientName:vm.data.name,
					patient:vm.data.patient,
					healthNo:vm.cardNo,
					healthType:vm.paytype,
					payAmount:parseFloat(vm.payMoney).toFixed(2),
@ -105,10 +106,11 @@ var loading = dialog({
					code:getUrlParam("code"),
					openid:JSON.parse(localStorage.getItem("wlyyAgent")).openid
				};
				sendPost("third/hy/pay/createPayOrder", params, "json", "post",function(){
				sendPost("third/hy/pay/createPayOrder", params, "json", "post",function(){        	
				    loading.close();
			    	dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:'请求失败'}).show();
			      }, function(res){
			        if(res.status == 200) {			        	
			        if(res.status == 200) {
				 		loading.close();
						var data = res.data;
						wx.chooseWXPay({
@ -120,15 +122,26 @@ var loading = dialog({
							paySign: data.sign, // 支付签名
							success: function (res) {
								// 支付成功后的回调函数
								window.location.href='../../payment/html/paymentResult.html?seqNo='+data.seqNo;
								alert(JSON.stringify(res))
								if(res.errMsg == "chooseWXPay:ok"){
	                               window.location.href='../../payment/html/paymentResult.html?seqNo='+data.seqNo;
	                            }else{
		
									var errorparams={seqNo:data.seqNo,wxErrorMsg:res.errMsg}
									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;
								    })
	                            }
							},
							cencel:function(res){
								// 支付取消回调函数
//								alert("支付过程中用户取消");
								//alert("支付过程中用户取消");
							},
							fail: function(res){
								// 支付失败回调函数
//								alert(JSON.stringify(res));
								//alert(JSON.stringify(res));
							}
						});
					}else{		        	
@ -139,6 +152,10 @@ var loading = dialog({
			},
			//强制设定最多只能输入两位小数
			checkNumber:function(payMoney){
				var myreg=/^[0][0-9]{1}$/; 
				if(myreg.test(payMoney)){
					payMoney="0"
				}
		        this.payMoney= (payMoney.match(/^\d*(\.?\d{0,2})/g)[0]) || null                  
		    },
			//判断是否验证登录通过
@ -151,9 +168,6 @@ var loading = dialog({
					}
				},10);
			},
			clearMoney:function(){
				this.payMoney = "";
			}
		},
	})
@ -167,6 +181,7 @@ function queryInit(){
function getUrlParam(name){
    //构造一个含有目标参数的正则表达式对象
    var reg = new RegExp("(^|&)"+name+"=([^&]*)(&|$)");
    alert(window.location.search)
    //匹配目标参数
    var r = window.location.search.substr(1).match(reg);
    //返回参数值

+ 47 - 7
html/payment/js/paymentList.js

@ -4,8 +4,38 @@ var loading = dialog({
	contentType: 'load',
	skin: 'bk-popup',
});
var iscrollState='';//判断滑动方向
(function() {
	new Vue({
	mui.init({
		pullRefresh : {
		    container:'#wrapper',
		    down : {
			    height:50,
			    auto: false,
			    contentdown : "下拉可以刷新",
			    contentover : "释放立即刷新",
			    contentrefresh : "正在刷新...",
			    callback: function(){
			    	id = 0;
			    	iscrollState='down'
			    	myVue.isdown()
				}
		    },
		    up : {
			    height:50,
			    contentinit: '',
				contentdown: '',
			    contentrefresh : "正在加载...",
			    contentnomore:'没有更多数据了',
			    callback: function() {
			    	iscrollState='up'
			    	myVue.isup()
				}
		    }
		}
	})
	
	var myVue=new Vue({
		el: "#app",
		data: {
			data:{},
@ -25,7 +55,7 @@ var loading = dialog({
			checkUserAgent();
			vm.checkType()
			vm.code=JSON.parse(localStorage.getItem("wlyyAgent")).uid
			vm.queryList.month=new Date().getFullYear()+"-"+new Date().getMonth()			
			vm.queryList.month=new Date().getFullYear()+"-"+(new Date().getMonth()+1)			
			vm.eventClick()
		},
		methods: {	
@ -71,7 +101,7 @@ var loading = dialog({
			      }, function(res){
			   		loading.close();
			        if(res.status == 200){ 
			        	vm.dataList=JSON.parse(res.data)
			        	vm.dataList=res.data
			        	vm.length=vm.dataList.length
			        }else{
			          dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:'数据获取失败'}).show();
@ -95,12 +125,13 @@ var loading = dialog({
			        dateFormat: 'yy-mm',
			        theme: 'ios',
			        lang:'zh',
			        minDate: new Date(2017,1),
			        minDate: new Date(2015,1),
			        maxDate: new Date(),
			        onSelect: function(valueText, inst){
						console.info(valueText)						
						vm.queryList.month=valueText	
						vm.getList()
						if(vm.queryList.month!=valueText){
							vm.queryList.month=valueText	
							vm.getList()							
						}
					},
	           });
			},
@ -118,6 +149,15 @@ var loading = dialog({
					}
				},10);
			},
			isdown:function(){alert(123)
				setTimeout(function(){
					mui('#wrapper').pullRefresh().endPulldownToRefresh(false);
					mui('#wrapper').pullRefresh().enablePullupToRefresh();//重置
				},1000)},
			isup:function(){alert(456)
				setTimeout(function(){
					mui('#wrapper').pullRefresh().endPullupToRefresh(false);//true表示没有更多数据了
				},1000)},
		},
	})

+ 8 - 2
html/payment/js/paymentResult.js

@ -24,7 +24,8 @@ var loading = dialog({
			},
			healthType:["","就诊卡缴费充值","住院缴费充值"],
			initdata:{seqNo:"","patientName":"","healthNo":"","healthType":1,"payAmount":"","payTimeStart":"",},
			data:{}
			data:{},
			frompay:false,
		},
		mounted: function() {
			var vm = this
@ -44,7 +45,12 @@ var loading = dialog({
			        if(res.status == 200){
			        	vm.data=JSON.parse(res.data)
			        	if(!vm.data){vm.data=vm.initdata}
			        	vm.result=vm.successResult
			        	if(vm.data.payStatus==1){
			        		vm.result=vm.successResult
			        	}else{
			        		vm.result=vm.failureResult
			        		vm.result.msg=vm.data.wechatMsg
			        	}			        	
			        }else{
			          dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:'数据获取失败'}).show();
			        }