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

html/informationSearch/html/waitingDoctorList.html

@@ -20,30 +20,30 @@
		<div id="app" v-cloak>
			<div class="bgc-fff c-f17 ptb10 pl15 jiuzhen">
				<span class="c-333">{{data.cardNo}}&nbsp;({{data.name}})&nbsp;</span>
				<span class="qiehuan-txt" @click="changeCards">切换</span>
				<span v-if="cardlenght>1" class="qiehuan-txt" @click="changeCards">切换</span>
				<span class="card-icon c-f14" style="float: right;">就诊</span>				
			</div>
			<div class="waitingDoctorList" v-if="length!=0">							
				<ul class="plr15 pb15">		
					<li class="bgc-fff c-radius-5 jiuzhen mt15">
					<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;"><!--门诊--></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">6人</span>
								<img src="../images/paidui_icon.png" width="20" class="mr5" />前方排队:&nbsp;<span class="c-ff5e6c">{{item.wait_no}}人</span>
							</div>
							<div class="pt15">
								<span>候诊人:&nbsp;王小建</span>
								<span style="float: right;">候诊科室：呼吸道科</span>
							<div class="pt15 pb10">
								<span>候诊人:&nbsp;{{data.name}}</span>
								<span style="float: right;">候诊科室：{{item.dept_name}}</span>
							</div>
							<div class="ptb10">
							<!--<div class="ptb10">
								就诊时间:&nbsp;2018-08-29 14:20-15:00
							</div>
							</div>-->
						</div>
					</li>	
					<li class="bgc-fff c-radius-5 jiancha mt15">
					<!--<li class="bgc-fff c-radius-5 jiancha mt15">
						<div class="c-fff c-f14 top-div">
							<span>上饶县人民医院</span>
							<span style="float: right;">检查检验</span>
@@ -60,7 +60,7 @@
								就诊时间:&nbsp;2018-08-29 14:20-15:00
							</div>
						</div>
					</li>	
					</li>	-->
				</ul>
			</div>
			<div class="default-div" v-else>

html/informationSearch/js/waitingDoctorList.js

@@ -12,6 +12,7 @@ var loading = dialog({
			dataList:[],
			length:0,
			code:"",
			cardlenght:0,
			TypeList:[{},{type:"jiuzhen",text:"门诊",pretext:"候诊"},{type:"jiancha",text:"检查检验",pretext:"候检"}],
		},
		mounted: function() {
@@ -31,7 +32,8 @@ var loading = dialog({
			       }, function(res){
				 	loading.close();
			        if(res.status == 200){ 
			        	if(res.data.length>0){			        		
			        	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
@@ -64,7 +66,7 @@ var loading = dialog({
			   		loading.close();
			        if(res.status == 200){
			        	if(res.data.code=="0"){
			        		vm.dataList=res.data
			        		vm.dataList=res.data.data
			        		vm.length=vm.dataList.length
			        	}else{
			        		 dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:res.data.message}).show();
@@ -76,7 +78,7 @@ var loading = dialog({
			},
			//跳转切换就诊卡
			changeCards:function(){
				window.location.href='../../payment/html/changeCards.html?pre=waitingDoctorList';
				window.location.href='../../payment/html/changeCards.html?pre=waitingDoctorList';				
			},
			//判断是否验证登录通过
			checkType:function(){

html/payment/css/payment.css

@@ -125,11 +125,29 @@
    border-radius: 50%;
    background-color: #4DCD70;
    border: 1px solid #12AA3C;
    font-size: 12px;
    font-size: 11px;
    color: #FFFFFF;    
    text-align: center;
    z-index: 2;
}
.mask{
	background-color: rgba(0,0,0,.5);
    font-size: 17px;
    line-height: 104px;
    color: #FFFFFF;
    text-align: center;
    position: absolute;
    top: 15px;
    left: 0px;
    margin: 0px 15px;
    width: -webkit-fill-available;
    width: -webkit-fill-available;
    width: -moz-fill-available;
    width: -moz-available;    /* FireFox目前这个生效 */
    width: fill-available;
    border-radius: 5px;
}
/*缴费查询*/
/*就诊卡缴费*/

html/payment/html/paymentList.html

@@ -40,7 +40,8 @@
							<div class="mt5 c-f12">
								<span>{{item.hospitalName}}</span>
								<span style="float: right;">{{item.payTimeStart}}</span>
							</div>	
							</div>
							<div v-if="item.hyStatus!=1" class="mask">正在同步至医院... ...</div>
						</li>					
					</ul>					
					<div class="default-div" v-else>
@@ -51,7 +52,9 @@
					</div>
				</div>
			</div>
			<a href="javascript:;" class="circle-btn"  @click="gotoCards"><span style="margin-top: 1px;">我的<br/>就诊卡</span></a>
			<a href="javascript:;" class="circle-btn"  @click="gotoCards">
				<span style="position: relative;top: 5px;left: 1px;">我的<br/>就诊卡</span>
			</a>
		</div>
		<script src="../../../js/post.js"></script>

html/payment/js/paymentResult.js

@@ -43,7 +43,7 @@ var loading = dialog({
			       }, function(res){
				 	loading.close();
			        if(res.status == 200){
			        	vm.data=JSON.parse(res.data)
			        	vm.data=res.data
			        	if(!vm.data){vm.data=vm.initdata}
			        	if(vm.data.payStatus==1){   //充值状态，0未完成，1已完成，2失败
			        		vm.result=vm.successResult