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

html/payment/css/payment.css

@@ -83,7 +83,9 @@
}
.w3-rest{overflow:hidden}
a:active{
	color:#FFFFFF;
}
/*缺省页*/
.default-div{
@@ -206,7 +208,9 @@
   background-image: url(../images/biaoqian_lvse_img.png);
   background-size: 100% 100%;
   padding:1px  10px 1px 18px;
   color:#ffffff;
   color:#ffffff;   
   height: 20px;
   line-height: 20px;
}
.jiuzhen .c-btn-full,.jiuzhen .c-btn-big{
	background: #4dcd70;
@@ -223,7 +227,9 @@
   background-image: url(../images/biaoqian_hongse_img.png);
   background-size: 100% 100%;
   padding:1px  10px 1px 18px;
   color:#ffffff;
   color:#ffffff;  
   height: 20px;
   line-height: 20px;
}
.zhuyuan .c-btn-full,.zhuyuan .c-btn-big{
	background: #17B3EC;

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">

html/payment/js/changeCards.js

@@ -37,6 +37,7 @@ var checktype=false;
			        			item.cardNo=item.inpCardNo
			        			return item.inpCardNo
			        		})
			        		$(document).attr('title','选择住院号');
			        	}
			        }else{
			          dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:'数据获取失败'}).show();

html/payment/js/payment.js

@@ -177,7 +177,7 @@ var loading = dialog({
							paySign: data.sign, // 支付签名
							success: function (res) {
								// 支付成功后的回调函数
	                               window.location.href='../../payment/html/paymentResult.html?seqNo='+data.seqNo;									
	                               window.location.href='../../payment/html/paymentResult.html?seqNo='+data.seqNo+"&payStatus=1";									
							},
							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;
							     	window.location.href='../../payment/html/paymentResult.html?seqNo='+data.seqNo+"&payStatus=2";
							    })
							}
						});

html/payment/js/paymentResult.js

@@ -50,9 +50,9 @@ var loading = dialog({
			getData:function(){
				var vm=this
				if(!Request.healthNo){
					vm.gerPayOrder()   //从缴费列表进入
					vm.gerPayOrder()   //从支付进入
				}else{
					vm.gerPayOrderList()  //从支付进入
					vm.gerPayOrderList()  //从缴费列表进入
				}
			},
			//从支付进入
@@ -86,15 +86,15 @@ var loading = dialog({
			filterData:function(){				
				var vm=this
				if(!vm.data){vm.data=vm.initdata}
	        	if(vm.data.payStatus==1){   //充值状态，0未完成，1已完成，2失败
	        	if(Request.payStatus==1){   //充值状态，0未完成，1已完成，2失败
	        		vm.result=vm.successResult
	        	}else{
	        		if(vm.data.wechatStatus==1){     //未同步
	        			vm.result=vm.successResult
	        			vm.data.hyStatus=0
	        		}else{
//	        		if(vm.data.wechatStatus==1){     //未同步
//	        			vm.result=vm.successResult
//	        			vm.data.hyStatus=0
//	        		}else{
	        			vm.result=vm.failureResult
	        		}	        		
//	        		}	        		
	        	}
			},
			//