丹阳分支

songchongxian
1 parent 161b02bc
Showing 36 changed files with 541 additions and 389 deletions
js/ajax.js
js/url.js
more/.DS_Store
more/VipCardtwo/Vipcard.html
more/VipCardtwo/css/Vipcard.html
more/VipCardtwo/css/minec.html
more/VipCardtwo/css/searchVip.html
more/VipCardtwo/css/vcard.html
more/VipCardtwo/css/vipcardpay.html
more/VipCardtwo/minec.html
more/VipCardtwo/searchVip.html
more/VipCardtwo/vcard.html
more/VipCardtwo/vippay.html
more/fanxtc/bf/fxone.html
more/fanxtc/fxone.html
more/self/.DS_Store
more/self/Vehiclemanagement/EditCar.html
more/self/fapiao/Billinghistory/BhistoryInfo.html
more/self/fapiao/Billinghistory/Ticketopeningrules.html
more/self/fapiao/Billinghistory/kaipiao/Viptjf.html
 var jsajax = jsajax || {};
-jsajax.appID = 'wx1e9001e5940605b1';//'wxe98c8ee886986377';
-//任你停wx1e9001e5940605b1
+jsajax.appID = 'wxb207fd26449b20bc';//'wxe98c8ee886986377';
+//任你2停wx1e9001e5940605b1
 //丹阳通wxb207fd26449b20bc
 //获取openid
 jsajax.getopenid = function (code,fn) {
@@ -116,7 +116,7 @@ jsajax.setcss = function(strpath){
 };
 /* 默认请求*/
-jsajax.defaultReq=function(url, data, successfn,errorfn) {
+jsajax.defaultReq=function(url, data, successfn) {
     data = (data==null || data=="" || typeof(data)=="undefined")? {"date": new Date().getTime()} : data;
     $.ajax({
         type: "post",
@@ -129,11 +129,8 @@ jsajax.defaultReq=function(url, data, successfn,errorfn) {
             successfn(d);
         },
         error: function(e){
-            //alert(JSON.stringify(e));
+        	//alert(JSON.stringify(e));
             console.log(JSON.stringify(e));
-            if (typeof (errorfn) != "undefined") {
-                errorfn(JSON.stringify(e));
-            }
         },
         complete:function (e) {}
     });
 var mUrl = mUrl || {};
-
-//songcxa 15801541129
-mUrl.testtoken = "a49e4835f5184f0fb5d0aba2a30bca8b";
-mUrl.testdeviceInfo = "868869021179618";//android
+/*
+    @songcxa
+    @2018/10/8
+    @PC端测试使用
+*/
+mUrl.testtoken = "21f2ee47e3a34f93838b37fce4bbeba6";//用户登录tocken
+mUrl.testdeviceInfo = "868869021179618";//当前用户设备号
+//谢建朋
+//mUrl.testtoken = "1935117c009c4efb9cee2ea9e68db42d";
+//mUrl.testdeviceInfo = "866822033228388";
+//曹郎鹏
+//mUrl.testtoken = "7551e008856e4a388d7ae8e91e1c6c55";
+//mUrl.testdeviceInfo = "99575C3E-3F7F-4521-B6FB-AEDD26350ACA";//IOS
+//END
 /*获取设置openid  start*/
 mUrl.GetOpenid = function(){
@@ -86,8 +96,12 @@ mUrl.getJx = function(){
 }
 /*end*/
+//测试环境
+//var cepath = 'http://39.98.54.240:8090';
+//正式环境
+var cepath = 'http://app.api.dyszt.com:8090';
-var cepath = 'http://39.98.54.240:8090';//http://pay.service.renniting.cn//http://39.98.54.240:8090//http://app.api.dyszt.com:8090//var cepath = 'http://app.api.dyszt.com:8090';//https://pay.service.rnting.com//'http://47.96.41.38:8090';
+//https://pay.service.rnting.com//'http://47.96.41.38:8090';
 /*----------------------------------------------登录登出绑定手机号  start*/
 //发送验证码
 mUrl.sendRandCode = cepath + '/user/sendverificode';//webPath + '/binding/sendRandCode'+mUrl.getCommonParam();
@@ -104,7 +118,7 @@ mUrl.tcgettoken =cepath+&#39;/wxPublicUser/getTokenByOpenId&#39;;
 mUrl.tcpaysuccess = cepath+'/query/Issued';//目前暂时不用//无用
 //mUrl.tcwxpay = cepath+ '/weixinPublicPay/unifiedOrder';
 mUrl.tcwxpay = cepath+ '/weixinpay/publicUnifiedOrder';//修改 添加字段
- mUrl.SelectCar = cepath +'/user/queryUserCars';//车辆信息查询（查看是否绑定车牌号）无用
+ mUrl.SelectCar = cepath +'/user/queryUserCars';////车辆信息查询（查看是否绑定车牌号）无用
  mUrl.SelectOrder = cepath +'/query/queryOrderByCarNumbers';//查询订单 （查询待支付订单）//无用
 /*----------------------支付页面所需接口 end*/
@@ -155,10 +169,13 @@ mUrl.loginOut = cepath+&#39;/user/logout&#39;;//退出登录  //个人信息目前无用
   mUrl.deleteaddress = cepath+'/invoice/deleteCustMailingAddressInfoByID';//删除一条邮寄地址
   mUrl.checkAddress = cepath+'/invoice/queryCustMailingAddressInfoById';//'/invoice/queryCustrMailingAddressInfoById';//根据id查询出地址详情信息
-//mUrl.vipkpList = cepath+'/invoice/queryVipCardTicketList';//获取会员卡开票列表[old]
-  mUrl.vipkpList = cepath + '/invoice/queryRntPayOrderForInvoice';//获取会员卡开票列表[new]
-  mUrl.kaipaioHistory = cepath + '/invoice/insertCustInvoiceHisInfo';//•记录客户开发票历史信息及开票历史详情信息
-  mUrl.queryAppOrgs = cepath + '/appOrg/queryAppOrgs';//获取区域列表songcxa
+mUrl.vipkpList = cepath+'/invoice/queryVipCardTicketList';//获取会员卡开票列表
+//mUrl.vipkpList = cepath+'/invoice/queryRntPayOrderForInvoice';//获取会员卡开票列表
+//开票列表songcx 2018-10-8
+mUrl.vipkpList2 = cepath + '/invoice/queryRntPayOrderForInvoice';//获取开票列表
+mUrl.kaipaioHistory2 = cepath + '/invoice/openTicketForCustInvoiceHisInfo';//确认提交开票
+
+  mUrl.kaipaioHistory = cepath+'/invoice/insertCustInvoiceHisInfo';//•记录客户开发票历史信息及开票历史详情信息
   mUrl.gethistorylist = cepath+'/invoice/queryCustInvoiceHistoryList';//获取所有的历史接口
@@ -118,7 +118,7 @@
 		background: -webkit-linear-gradient(-45deg, rgba(252,116,147,1),rgba(185,92,193,1));
 		background:  linear-gradient(-45deg, rgba(185,92,193,1),rgba(252,116,147,1));/*linear-gradient(-45deg, rgba(252,116,147,1),rgba(185,92,193,1));*/
 	}
-	.mylistdata .list{
+	/*.mylistdata .list{
 	    float: left;
 	    position: relative;
 		width: 100%;
@@ -129,13 +129,13 @@
 		border-radius: 8px;
 		background: url(imgs/shuiyy.png)no-repeat center center;
 		background-size: 90% !important;
-	}
-	.mylistdata .list .cardstype{
+	}*/
+	/*.mylistdata .list .cardstype{
 		padding: 0;
 		margin-bottom: 59.3px;
 		background:  url(imgs/ztesy.png)no-repeat top right ;
 		background-size: 61px !important;
-	}
+	}*/
 	.mylistdata .list .cardstype li{
 		padding:0 4px;
 		padding-left: 0;
@@ -118,7 +118,7 @@
 		background: -webkit-linear-gradient(-45deg, rgba(252,116,147,1),rgba(185,92,193,1));
 		background:  linear-gradient(-45deg, rgba(185,92,193,1),rgba(252,116,147,1));/*linear-gradient(-45deg, rgba(252,116,147,1),rgba(185,92,193,1));*/
 	}
-	.mylistdata .list{
+	/*.mylistdata .list{
 	    float: left;
 	    position: relative;
 		width: 100%;
@@ -129,13 +129,13 @@
 		border-radius: 8px;
 		background: url(imgs/shuiyy.png)no-repeat center center;
 		background-size: 90% !important;
-	}
-	.mylistdata .list .cardstype{
+	}*/
+	/*.mylistdata .list .cardstype{
 		padding: 0;
 		margin-bottom: 59.3px;
 		background:  url(imgs/ztesy.png)no-repeat top right ;
 		background-size: 61px !important;
-	}
+	}*/
 	.mylistdata .list .cardstype li{
 		padding:0 4px;
 		padding-left: 0;
@@ -65,7 +65,7 @@
 			background: -webkit-linear-gradient(-45deg, #bd5ebe, #fc7493);
 			background: linear-gradient(-45deg, #bd5ebe, #fc7493); 
 		}
-		.mineclist .list{
+		/*.mineclist .list{
 		    float: left;
 		    position: relative;
 			width: 100%;
@@ -76,7 +76,7 @@
 			border-radius: 8px;
 			background: url(imgs/shuiyy.png)no-repeat center center;
 			background-size: 90% !important;
-		}
+		}*/
 		.mineclist .list>span{
 			position: absolute;
 			right: 0;
@@ -88,12 +88,12 @@
 			text-align: center;
 			color: #fff;
 		}
-		.mineclist .list .cardstype{
+		/*.mineclist .list .cardstype{
 			padding: 0;
 			margin-bottom: 20.3px;
 			background:  url(imgs/ztesy.png)no-repeat top right ;
 			background-size: 61px !important;
-		}
+		}*/
 		.mineclist .list .cardstype li{
 			padding-right: 8px;
 			padding-left: 0;
@@ -124,7 +124,7 @@
 		background: -webkit-linear-gradient(-45deg, rgba(252,116,147,1),rgba(185,92,193,1));
 		background:  linear-gradient(-45deg, rgba(185,92,193,1),rgba(252,116,147,1));/*linear-gradient(-45deg, rgba(252,116,147,1),rgba(185,92,193,1));*/
 	}
-	.mylistdata .list{
+	/*.mylistdata .list{
 	    float: left;
 	    position: relative;
 		width: 100%;
@@ -135,7 +135,7 @@
 		border-radius: 8px;
 		background: url(imgs/shuiyy.png)no-repeat center center;
 		background-size: 90% !important;
-	}
+	}*/
 	.mylistdata .list .cardstype{
 		padding: 0;
 		margin-bottom: 59.3px;
@@ -47,7 +47,7 @@
 		    background: -webkit-linear-gradient(-45deg, rgba(252,116,147,1),rgba(185,92,193,1));
 		    background:  linear-gradient(-45deg, rgba(185,92,193,1),rgba(252,116,147,1));
 		}
-		.list{
+		/*.list{
 		    float: left;
 		    position: relative;
 			width: 100%;
@@ -58,13 +58,13 @@
 			border-radius: 8px;
 			background: url(imgs/shuiyy.png)no-repeat center center;
 			background-size: 90% !important;
-		}
-		.list .cardstype{
+		}*/
+		/*.list .cardstype{
 			padding: 0;
 			margin-bottom: 59.3px;
 			background:  url(imgs/ztesy.png)no-repeat top right ;
 			background-size: 61px !important;
-		}
+		}*/
 		.list .cardstype li{
 			padding:0 4px;
 			padding-left: 0;
@@ -674,7 +674,7 @@
 		                            var orderId = datas.orderId;
 		                            var apporwx = mUrl.getApporWX();
 						        	if(apporwx=='wx'){
-						        		var src = 'http://wxgzh.renniting.cn/wechatwuxi/Threewf/WEB-INF/pages/elsepages/cards_pages/confirmp.html?orderId='+orderId+"&orderFee="+orderFee+"&carNumber="+carNumber+"&startDate="+startd+"&endDate="+endDate+"&optType=1&openid="+func.openid+"&token="+func.token+"&";
+						        		var src = 'http://wxgzh.rnting.com/ceshi/wechatthree/Threewf/WEB-INF/pages/elsepages/cards_pages/confirmp.html?orderId='+orderId+"&orderFee="+orderFee+"&carNumber="+carNumber+"&startDate="+startd+"&endDate="+endDate+"&optType=1&openid="+func.openid+"&token="+func.token+"&";
 		                            	//window.location.assign(encodeURI(src));
 						        	}else{
 						        		isAndroidorios(function(data){
@@ -75,7 +75,7 @@
 			padding: 11px;
 			box-sizing: border-box;
 			border-radius: 8px;
-			background: url(imgs/shuiyy.png)no-repeat center center;
+			background: url(imgs/shuiyy11.png)no-repeat center center;
 			background-size: 90% !important;
 		}
 		.mineclist .list>span{
@@ -92,7 +92,7 @@
 		.mineclist .list .cardstype{
 			padding: 0;
 			margin-bottom: 20.3px;
-			background:  url(imgs/ztesy.png)no-repeat top right ;
+			background:  url(imgs/ztesy9.png)no-repeat top right ;
 			background-size: 61px !important;
 		}
 		.mineclist .list .cardstype li{
@@ -153,8 +153,10 @@
 	</style>
 	<body onclick="">
 		<div class="minectop">
-			<i class="icon iconfont" onclick="javascript:window.history.go(-1)">&#xe65a;</i>
-		</div>
+							<i class="icon iconfont" onclick="vipback()">&#xe65a;</i>
+
+<!--			<i class="icon iconfont" onclick="javascript:window.history.go(-1)">&#xe65a;</i>
+-->		</div>
 		<div class="mineclist">
 			<!--<div class="oned">
 				<div class="list">
@@ -185,8 +187,13 @@
 <script src="../../js/ajax.js"></script>
 <script>
 	$(function(){
+		
+				//初始化
+		initlist();
 		//获取数据
-		var apporwx = mUrl.getApporWX();
+	    var apporwx = mUrl.getApporWX();
+        //songcxa测试
+	    //var apporwx = "wx";
 		if(apporwx){
 			if(apporwx=='wx'){
 				getMyParkCardInfo();
@@ -209,8 +216,11 @@
 			//div.setAttribute('data-parkAddr',parkAddr);//停车场位置
 			//若不在此判断token则下个页面就没有选择车牌
-			if(token&&token!='null'&&token!=''){
-				var href = 'vipbuyedpay.html';//'vipbuyedpay.html';
+			if (token && token != 'null' && token != '') {
+			    //改前是[续费]vipbuyedpay.html
+			    //var href = 'myVipCardInfo.html';//'vipbuyedpay.html';
+			    //改后是[详情]vipDetail.html
+			    var href = 'vipDetail.html';
 				var datasrc = '?custCardNo='+custCardNo;
 				//var datasrc = '?plNo='+plNo+'&cardNo='+cardNo+'&cardprice='+danjia+'&cardType='+cardType+'&carType='+carType+'&carNumber='+carNumber+'&cardCouponsId='+cardCouponsId+'&optType=2&expDate='+expDate+'&parkname='+parkname+'&effDate='+effDate+'&';
 				window.location.assign(encodeURI(href+datasrc));
@@ -243,6 +253,105 @@
 	    	}
 		});
 	}
+	//app点击返回按钮调用该函数
+	function vipback(){
+		var s = mUrl.getApporWX();
+		console.log("调用返回函数   "+s);
+
+		if(s=='android'){
+			JSInterface.Vback();
+		}else if(s=='ios'){
+			window.webkit.messageHandlers.Vback.postMessage(null);
+		}else if(s=='wx'){
+			var src = document.referrer;
+			if(src&&src.length>5){
+				window.history.go(-1);
+			}else{
+				if(typeof(WeixinJSBridge)!="undefined"){
+		        	WeixinJSBridge.call('closeWindow');
+		        }else{
+		            if (navigator.userAgent.indexOf("MSIE") > 0) {  
+		                if (navigator.userAgent.indexOf("MSIE 6.0") > 0) {
+		                    window.opener = null; window.close();  
+		                }  
+		                else {  
+		                    window.open('', '_top'); window.top.close();  
+		                }  
+		            }  
+		            else if (navigator.userAgent.indexOf("Firefox") > 0) {  
+		                window.location.href = 'about:blank ';  
+		            }  
+		            else {  
+		                window.opener = null;   
+		                window.open('', '_self', '');  
+		                window.close();  
+		            }
+		        }
+			}
+		}
+	}
+	
+	
+		//初始化界面数据
+	function initlist(){
+		//若为微信回去微信中的用户信息
+		
+		var getcode = location.href;
+	    var datacoded = getcode.split('?')[1];
+	    var openid = mUrl.GetOpenid();
+	    if(openid&&openid!=''&&openid!='null'&&openid!='undefined'){
+			var pt = 'wx';mUrl.setApporWX(pt);
+		 	gett(openid);
+		}else{
+			if(datacoded&&datacoded!=''){
+		    	var datacode = datacoded.split('&')[0].split('=')[1];
+		    	if(datacoded.split('&')[0].split('=')[0]=='code'){
+		    		console.log('1');
+		    		var pt = 'wx';mUrl.setApporWX(pt);
+		    		jsajax.getopenid(datacode,function(openid){
+		    			console.log('1'+openid);
+						gett(openid);
+				    });//获取openid  token
+		    	}else{
+		    		console.log('2');
+		    		var openid = mUrl.GetOpenid();
+		    		if(openid&&openid!=''&&openid!='null'&&openid!='undefined'){
+		    			var pt = 'wx';mUrl.setApporWX(pt);
+		    		 	gett(openid);
+		    		}
+		    	}
+		    }else{
+		    	isAndroidorios(function(data){
+					console.log('huoqu '+data);
+			    	var sx = mUrl.getApporWX();
+			    	if(sx!='wx'){
+			    		console.log('执行不是微信的');
+			    		mUrl.setApporWX(data);
+			    	}
+			    	console.log("微信还是app"+mUrl.getApporWX());
+			    });
+		    }
+		}
+//	    setTimeout(function(){
+//	    	var sx = mUrl.getApporWX();
+//	    	if(sx=='wx'){
+//	    		var lonlat = sessionStorage.getItem('lonandlat');
+//			    if(lonlat&&lonlat!=''){
+//			    	var slonlat = JSON.parse(lonlat);
+//			    	if(slonlat.lon&&slonlat.lon!=''){getParkInfoList(lonlat)}else{
+//			    		func.getLocation();
+//			    	}
+//			    }else{
+//			    	func.getLocation();
+//			    }
+//	    	}
+//	    	var openid = mUrl.GetOpenid();
+//	    	
+//	    	console.log('openid'+openid);
+//	    },200);
+	    
+	}
+	
 	//获取用户购买会员卡
 	function getMyParkCardInfo() {
@@ -335,7 +444,7 @@
 							  		+'<div class="parksname">'+carstr+cardtstr+'</div>'
 							  		/*+'<div class="parksaddr">'+parkAddr+'</div>'*/
 							    +'</div>'
-							    +'<div class="enddate">有效期：<span>'+expDate+'</span></div>'
+							    +'<div class="enddate">有效期至：<span>'+expDate+'</span></div>'
 					    	+'</div>';
 					    	$('.mineclist').append(div);
 	        			}
@@ -124,7 +124,7 @@
 		background: -webkit-linear-gradient(-45deg, rgba(252,116,147,1),rgba(185,92,193,1));
 		background:  linear-gradient(-45deg, rgba(185,92,193,1),rgba(252,116,147,1));/*linear-gradient(-45deg, rgba(252,116,147,1),rgba(185,92,193,1));*/
 	}
-	.mylistdata .list{
+	/*.mylistdata .list{
 	    float: left;
 	    position: relative;
 		width: 100%;
@@ -135,13 +135,13 @@
 		border-radius: 8px;
 		background: url(imgs/shuiyy.png)no-repeat center center;
 		background-size: 90% !important;
-	}
-	.mylistdata .list .cardstype{
+	}*/
+	/*.mylistdata .list .cardstype{
 		padding: 0;
 		margin-bottom: 59.3px;
 		background:  url(imgs/ztesy.png)no-repeat top right ;
 		background-size: 61px !important;
-	}
+	}*/
 	.mylistdata .list .cardstype li{
 		padding:0 4px;
 		padding-left: 0;
@@ -47,7 +47,7 @@
 		    background: -webkit-linear-gradient(-45deg, rgba(252,116,147,1),rgba(185,92,193,1));
 		    background:  linear-gradient(-45deg, rgba(185,92,193,1),rgba(252,116,147,1));
 		}
-		.list{
+		/*.list{
 		    float: left;
 		    position: relative;
 			width: 100%;
@@ -58,13 +58,13 @@
 			border-radius: 8px;
 			background: url(imgs/shuiyy.png)no-repeat center center;
 			background-size: 90% !important;
-		}
-		.list .cardstype{
+		}*/
+		/*.list .cardstype{
 			padding: 0;
 			margin-bottom: 59.3px;
 			background:  url(imgs/ztesy.png)no-repeat top right ;
 			background-size: 61px !important;
-		}
+		}*/
 		.list .cardstype li{
 			padding:0 4px;
 			padding-left: 0;
@@ -478,7 +478,7 @@
 					        	if(apporwx=='wx'){
 					        		var src = '../../pay/confirmxc.html?orderId='+orderId+"&orderFee="+orderFee+"&carNumber="+carNumber+"&startDate="+startd+"&endDate="+endDate+"&optType=1&openid="+func.openid+"&token="+func.token+"&";
                         			window.location.assign(encodeURI(src));
-					        		/*var src = 'http://wxgzh.renniting.cn/ceshi/wechatthree/Threewf/WEB-INF/pages/elsepages/cards_pages/confirmxz.html?orderId='+orderId+"&orderFee="+orderFee+"&carNumber="+carNumber+"&startDate="+startd+"&endDate="+endDate+"&optType=1&openid="+func.openid+"&token="+func.token+"&";
+					        		/*var src = 'http://wxgzh.rnting.com/ceshi/wechatthree/Threewf/WEB-INF/pages/elsepages/cards_pages/confirmxz.html?orderId='+orderId+"&orderFee="+orderFee+"&carNumber="+carNumber+"&startDate="+startd+"&endDate="+endDate+"&optType=1&openid="+func.openid+"&token="+func.token+"&";
 	                            	window.location.assign(encodeURI(src));*/
 					        	}else{
 					        		isAndroidorios(function(data){
@@ -43,7 +43,7 @@
 			<img src="imgs/bg.png" class="fobg"/>
 			<img src="imgs/yu.png" class="foyu"/>
 		</div>
-		<p style="text-align: center;color: #fff;">未找到车辆位置，请确认已驶入任你停停车场</p>
+		<p style="text-align: center;color: #fff;">未找到车辆位置，请确认已驶入丹阳行停车场</p>
 	</body>
 </html>
 <script src="../../js/jquery-3.2.1.min.js"></script>
@@ -45,7 +45,7 @@
 			<img src="imgs/bg.png" class="fobg"/>
 			<img src="imgs/yu.png" class="foyu"/>
 		</div>
-		<p style="text-align: center;color: #fff;">未找到车辆位置，请确认已驶入任你停停车场</p>
+		<p style="text-align: center;color: #fff;">未找到车辆位置，请确认已驶入丹阳行停车场</p>
 	</body>
 </html>
 <script src="../../js/jquery-3.2.1.min.js"></script>
@@ -30,25 +30,6 @@
 		.dialog{
 		}
-		
-		.clapninfo{
-						position: absolute;
-			bottom: 200px;
-			left: 10px;
-		}
-		
-				.clapninfo1{
-						position: absolute;
-			bottom: 200px;
-			left: 10px;
-		}
-		
-				.clapninfo2{
-						position: absolute;
-			bottom: 200px;
-			left: 10px;
-		}
-		
 		.carbd li{
 			/*width: 100%;*/
 			padding: 10px;
@@ -91,8 +72,8 @@
 	</style>
 	<body>
 		<div>
-<!--			<p  class="clapninfo" style="color: #fff;padding: 10px;">每人最多可以绑定三个车牌</p>
--->			<ul class="carbd row">
+			<p style="color: #fff;padding: 10px;">每人最多可以绑定三个车牌</p>
+			<ul class="carbd row">
 				<!--<li class="col-xs-4">1</li>
 				<li class="col-xs-4">2</li>
 				<li class="col-xs-4">3</li>-->
@@ -112,17 +93,6 @@
 					<div class="libottom">添加车辆</div>
 				</li>-->
 			</ul>
-			
-			
-			<div class="clapninfo"  style="color: #fff;padding: 10px;">
-		
-            友情提示：<br />
-			1) 每个账号可绑定3个车牌，未经车主同意，不得擅自绑定他人车牌，如因私自绑定他人车牌所产生的后果由责任人自行承担。<br />
-			2) 账号绑定3个车牌的功能，是为方便1个账号可以为3辆车购买月租卡或付停车费，并非1卡共享2或3个车位，如需添加辅牌，请联系车场运营管理方。<br />
-
-		</div>
-
-
 			<div class="btn"></div>
 		</div>
 		<div></div>
@@ -82,7 +82,8 @@
 						</table>
 					</div>
 					<div class="fpinfo bder97 beizhu" style="display: none;">
-						<p class="">一张发票，含<span id="fpinfocishu"></span>次余额充值</p>
+						<!--<p class="">一张发票，含<span id="fpinfocishu"></span>次余额充值</p>-->
+                        <p class="">详情：</p>
 						<ul class="fplist">
 							<!--<li>2017/11/11 12:12:2充值600.00元</li>
 							<li>2017/11/11 12:12:2充值600.00元</li>-->
@@ -222,9 +223,10 @@
 								var createDate = cIHisD[k].createDate;
 								orderDate = new Date(orderDate).toLocaleString();
+								var _orderActFee = cIHisD[k].orderActFee;
 								li.setAttribute('data-id',id);
 								li.setAttribute('data-orderId',orderId);
-								li.innerHTML = (k+1)+'、'+orderDate+"充值"+jsajax.fenToYuan(orderTotalFee)+"元";
+								li.innerHTML = (k + 1) + '、' + orderDate + "支付" + jsajax.fenToYuan(_orderActFee) + "元";
 								/*if(orderType=='1'){chongztype = '停车订单';}
 								else if(orderType=='2'){chongztype = '年卡订单';}
 								else if(orderType=='3'){chongztype = '月卡订单';}
@@ -29,10 +29,10 @@
 	<body>
 		<p class="rulestopp">开票规则</p>
 		<p>
-			1.线上发票申领暂时不支持电子发票，请您选择开具纸质发票，任你停将在3个工作日内为你安排发票打印并寄出。
+			1.线上发票申领暂时不支持电子发票，请您选择开具纸质发票，丹阳行将在3个工作日内为你安排发票打印并寄出。
 		</p>
 		<p>
-			2.根据相关政策规定，发片内容仅支持开具“停车服务费”。
+			2.根据相关政策规定，发票内容仅支持开具“停车服务费”。
 		</p>
 		<p>
 			3.停车消费中，各种形式的折扣券金额不支持开具发票。
@@ -44,16 +44,16 @@
 			5.如您开具的增值税普通发票用于企业报销，根据国家税务相关政策要求请填写纳税人识别号；如您的单位是非企业性质或您要求开具个人名义抬头，您可以选择“个人/非企业单位”的开票选项，则无需填写纳税人识别号。
 		</p>
 		<p>
-			6.您每次提交申请的纸质发票金额累计满200元时由任你停包邮；单次申请不满200元时您可以选择在线支付快递费，任你停将为您开具内容为”服务费”的发票，您也可以选择收到发票后自行支付快递费给快递公司，快递费发票请您向及时快递公司索要。暂不支持港、澳、台地区邮寄。
+			6.您每次提交申请的纸质发票金额累计满200元时由丹阳行包邮；单次申请不满200元时您可以选择在线支付快递费，丹阳行将为您开具内容为”服务费”的发票，您也可以选择收到发票后自行支付快递费给快递公司，快递费发票请您向及时快递公司索要。暂不支持港、澳、台地区邮寄。
 		</p>
 		<p>
-			7. 如您错填发票抬头信息需要进行修改，请您及时联系任你停客服人员为您处理；如果发票已经寄出，还请您收到发票后立即跟客服人员联系。
+			7. 如您错填发票抬头信息需要进行修改，请您及时联系丹阳行客服人员为您处理；如果发票已经寄出，还请您收到发票后立即跟客服人员联系。
 		</p>
 		<p>
 			8.因您个人填写发票信息和快递信息有误等原因产生的发票退票及重寄的往来费用，需由您本人自行承担。
 		</p>
 		<p>
-			9. 任你停客服电话为400-690-0899。
+			9. 丹阳行客服电话为0511-86903456。
 		</p>
 	</body>
@@ -2,7 +2,7 @@
 <html>
 	<head>
 		<meta charset="UTF-8">
-	    <title>会员卡开票</title>
+	    <title>开票</title>
 	    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
 	    <meta name="format-detection" content="telephone=no" />
 	    <meta name="format-detection" content="email=no" />
@@ -28,6 +28,9 @@
 		    border: 1px solid #f5a623;
 		    color: #f5a623;
 		}
+        .viplist li, .resultsd .dcheck {
+            cursor: pointer;
+        }
 	</style>
 	<body>
 		<p id="tipt" style="text-align: right;padding: 20px 10px 0;margin-bottom: -17px;font-size: 13px;" onclick="">开票金额说明</p>
@@ -37,42 +40,42 @@
 				<p>暂无记录</p>
 			</div>
 		</div>
-		<ul class="viplist">
-			<!--<li data-checked="0" data-id="1" data-carnum='苏B' data-money="900.00">
-				<p>2017/02/12&nbsp;11:11:11</p>
-				<table>
-					<tr>
-						<td rowspan="7">
-							<span class="dcheck" data-name="">
-								<i class="icon iconfont">&#xe685;</i>
-							</span>
-						</td>
-						<td>卡&nbsp;类&nbsp;型&nbsp;：<span>蓝牌包月卡</span></td>
-						<td rowspan="7">
-							<span class="vipmonrynum">900.00</span>元
-						</td>
-					</tr>
-					<tr>
-						<td>绑定车牌：<span>苏B12345</span></td>
-					</tr>
-					<tr>
-						<td>单&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;价：<span>100.00元</span></td>
-					</tr>
-					<tr>
-						<td>购买数量：<span>10个月</span></td>
-					</tr>
-					<tr>
-						<td>优惠活动：<span>9折</span></td>
-					</tr>
-					<tr>
-						<td>优惠金额：<span>-100.00元</span></td>
-					</tr>
-					<tr>
-						<td>实付金额：<span>900.00元(微信)</span></td>
-					</tr>
-				</table>
-			</li>-->
-		</ul>
+        <ul class="viplist kpDefaultColor">
+            <!--<li data-checked="0" data-id="1" data-carnum='苏B' data-money="900.00">
+            <p>2017/02/12&nbsp;11:11:11</p>
+            <table>
+                <tr>
+                    <td rowspan="7">
+                        <span class="dcheck" data-name="">
+                            <i class="icon iconfont">&#xe685;</i>
+                        </span>
+                    </td>
+                    <td>卡&nbsp;类&nbsp;型&nbsp;：<span>蓝牌包月卡</span></td>
+                    <td rowspan="7">
+                        <span class="vipmonrynum">900.00</span>元
+                    </td>
+                </tr>
+                <tr>
+                    <td>绑定车牌：<span>苏B12345</span></td>
+                </tr>
+                <tr>
+                    <td>单&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;价：<span>100.00元</span></td>
+                </tr>
+                <tr>
+                    <td>购买数量：<span>10个月</span></td>
+                </tr>
+                <tr>
+                    <td>优惠活动：<span>9折</span></td>
+                </tr>
+                <tr>
+                    <td>优惠金额：<span>-100.00元</span></td>
+                </tr>
+                <tr>
+                    <td>实付金额：<span>900.00元(微信)</span></td>
+                </tr>
+            </table>
+        </li>-->
+        </ul>
 		<div class="resultsd container-fluid row" style="display: none;">
 			<div class="col-xs-9">
 				<p style="padding: 5px 0;">
@@ -83,7 +86,7 @@
 				</p>
 				<p>
 					<span id="vipnums">0</span>个会员卡
-				共<span id="totalm">0.00</span>元（满200可申请）
+				共<span id="totalm">0.00</span>元（满500可申请）
 				</p>
 			</div>
 			<div class="col-xs-3">
@@ -132,7 +135,8 @@
 <script>
 	var func = {
 		index:'',
-		jixing:''
+		jixing: '',
+		tmpPayOrderList: []//临时开票列表
 	}
 	function isAndroid_ios(){  
 		var u = navigator.userAgent, app = navigator.appVersion;  
@@ -143,6 +147,12 @@
 			func.jixing = 'ios';
 		}
 	}  
+	window.onpageshow=function(e){
+	    var a=e||window.event;
+	    if(a.persisted){
+	    	window.location.reload();
+	    }
+	}
 	$(function(){ 
 		isAndroid_ios();
 		if(func.jixing=='android'){
@@ -228,7 +238,14 @@
 						id:id,
 						carnumer:carnumer
 					}
-					orderids.push(id);
+					var tmpObj = null;
+					$.each(func.tmpPayOrderList, function (i, v) {
+					    if (id == v.rltOrderId) {
+					        tmpObj = v;
+					        return false;
+					    }
+					});
+					orderids.push(tmpObj);
 					datas.push(obj);
 				}
 			});		
@@ -277,7 +294,7 @@
 		//vipnums totalm
 		$('#vipnums').text(lend);
 		$('#totalm').text(allm);
-		if(lend>0&&allm>=0.01){
+		if(lend>0&&allm>=500){
 			$('#nextbtn').removeAttr('disabled');
 			$('#nextbtn').removeClass('disabled');
 		}else{
@@ -310,93 +327,188 @@
 		}
 		console.log('数据 '+JSON.stringify(jsond));
 		jsajax.defaultReq(
-			mUrl.vipkpList,
+			mUrl.vipkpList2,
 			JSON.stringify(jsond),
-			function(data){
+			function (data) {
+			    getViplistCallBack(data);
 				//alert(JSON.stringify(data));
-				console.log(JSON.stringify(data));
-				if(data.code==0){
-					var datas = data.data;//
-					document.querySelector('.viplist').innerHTML = '';
-					if(datas&&datas.length>0){
-						//tipnull
-						$('.resultsd').css('display','block');
-						for(var i=0;i<datas.length;i++){
-							var li = document.createElement('li');
-							var cardAmount = datas[i].cardAmount;//单价
-							var buyNum = datas[i].buyNum;//购买数量
-							var cardTotalAmount = datas[i].cardTotalAmount;//实付
-							var orderId =  datas[i].orderId;//订单id
-							var cardTypeName = datas[i].cardTypeName;//卡类型名称
-							var cardType = datas[i].cardType;//卡类型
-							var discount = datas[i].discount;//优惠折扣
-							var discountAmount = datas[i].discountAmount;//优惠金额
-							var carNumber = datas[i].carNumber;//车牌
-							var createDate = datas[i].createDate;//购买时间
-							createDate = new Date(createDate).toLocaleString();
-						    cardAmount = jsajax.fenToYuan(cardAmount);//
-						    cardTotalAmount = jsajax.fenToYuan(cardTotalAmount);
-						    discountAmount==0?discountAmount='0元':discountAmount="-"+jsajax.fenToYuan(discountAmount)+'元';
+				//console.log(JSON.stringify(data));
+				//if(data.code==0){
+				//	var datas = data.data;//
+				//	document.querySelector('.viplist').innerHTML = '';
+				//	if(datas&&datas.length>0){
+				//		//tipnull
+				//		$('.resultsd').css('display','block');
+				//		for(var i=0;i<datas.length;i++){
+				//			var li = document.createElement('li');
+				//			var cardAmount = datas[i].cardAmount;//单价
+				//			var buyNum = datas[i].buyNum;//购买数量
+				//			var cardTotalAmount = datas[i].cardTotalAmount;//实付
+				//			var orderId =  datas[i].orderId;//订单id
+				//			var cardTypeName = datas[i].cardTypeName;//卡类型名称
+				//			var cardType = datas[i].cardType;//卡类型
+				//			var discount = datas[i].discount;//优惠折扣
+				//			var discountAmount = datas[i].discountAmount;//优惠金额
+				//			var carNumber = datas[i].carNumber;//车牌
+				//			var createDate = datas[i].createDate;//购买时间
+				//			createDate = new Date(createDate).toLocaleString();
+				//		    cardAmount = jsajax.fenToYuan(cardAmount);//
+				//		    cardTotalAmount = jsajax.fenToYuan(cardTotalAmount);
+				//		    discountAmount==0?discountAmount='0元':discountAmount="-"+jsajax.fenToYuan(discountAmount)+'元';
-						    li.setAttribute('data-checked','0');//
-						    li.setAttribute('data-cardAmount',cardAmount);//单价
-						    li.setAttribute('data-buyNum',buyNum);//购买数量
-						    li.setAttribute('data-cardTotalAmount',cardTotalAmount);//实付
-						    li.setAttribute('data-orderId',orderId);//订单id
-						    li.setAttribute('data-cardTypeName',cardTypeName);//卡类型名称
-						    li.setAttribute('data-cardType',cardType);//卡类型
-						    li.setAttribute('data-discount',discount);//优惠折扣
-						    li.setAttribute('data-discountAmount',discountAmount);//优惠金额
-						    li.setAttribute('data-carNumber',carNumber);//购买数量
-						    li.setAttribute('data-createDate',createDate);//购买时间
-						    li.setAttribute('onclick','');//购买时间
-						    li.innerHTML = '<p>'+createDate+'</p>'
-								+'<table>'
-									+'<tr>'
-										+'<td rowspan="7">'
-											+'<span class="dcheck" data-name="">'
-												+'<i class="icon iconfont">&#xe685;</i>'
-											+'</span>'
-										+'</td>'
-										+'<td>卡&nbsp;类&nbsp;型&nbsp;：<span>'+cardTypeName+'</span></td>'
-										+'<td rowspan="7">'
-											+'<span class="vipmonrynum">'+cardTotalAmount+'</span>元'
-										+'</td>'
-									+'</tr>'
-									+'<tr>'
-										+'<td>绑定车牌：<span>'+carNumber+'</span></td>'
-									+'</tr>'
-									+'<tr>'
-										+'<td>单&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;价：<span>'+cardAmount+'元</span></td>'
-									+'</tr>'
-									+'<tr>'
-										+'<td>购买数量：<span>'+buyNum+'</span></td>'
-									+'</tr>'
-									+'<tr>'
-										+'<td>优惠活动：<span>'+discount+'</span></td>'
-									+'</tr>'
-									+'<tr>'
-										+'<td>优惠金额：<span>'+discountAmount+'</span></td>'
-									+'</tr>'
-									+'<tr>'
-										+'<td>实付金额：<span>'+cardTotalAmount+'元</span></td>'
-									+'</tr>'
-								+'</table>'; 
+				//		    li.setAttribute('data-checked','0');//
+				//		    li.setAttribute('data-cardAmount',cardAmount);//单价
+				//		    li.setAttribute('data-buyNum',buyNum);//购买数量
+				//		    li.setAttribute('data-cardTotalAmount',cardTotalAmount.replace(",",""));//实付
+				//		    li.setAttribute('data-orderId',orderId);//订单id
+				//		    li.setAttribute('data-cardTypeName',cardTypeName);//卡类型名称
+				//		    li.setAttribute('data-cardType',cardType);//卡类型
+				//		    li.setAttribute('data-discount',discount);//优惠折扣
+				//		    li.setAttribute('data-discountAmount',discountAmount);//优惠金额
+				//		    li.setAttribute('data-carNumber',carNumber);//购买数量
+				//		    li.setAttribute('data-createDate',createDate);//购买时间
+				//		    li.setAttribute('onclick','');//购买时间
+				//		    li.innerHTML = '<p>'+createDate+'</p>'
+				//				+'<table>'
+				//					+'<tr>'
+				//						+'<td rowspan="7">'
+				//							+'<span class="dcheck" data-name="">'
+				//								+'<i class="icon iconfont">&#xe685;</i>'
+				//							+'</span>'
+				//						+'</td>'
+				//						+'<td>卡&nbsp;类&nbsp;型&nbsp;：<span>'+cardTypeName+'</span></td>'
+				//						+'<td rowspan="7">'
+				//							+'<span class="vipmonrynum">'+cardTotalAmount.replace(",","")+'</span>元'
+				//						+'</td>'
+				//					+'</tr>'
+				//					+'<tr>'
+				//						+'<td>绑定车牌：<span>'+carNumber+'</span></td>'
+				//					+'</tr>'
+				//					+'<tr>'
+				//						+'<td>单&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;价：<span>'+cardAmount+'元</span></td>'
+				//					+'</tr>'
+				//					+'<tr>'
+				//						+'<td>购买数量：<span>'+buyNum+'</span></td>'
+				//					+'</tr>'
+				//					+'<tr>'
+				//						+'<td>优惠活动：<span>'+discount+'折</span></td>'
+				//					+'</tr>'
+				//					+'<tr>'
+				//						+'<td>优惠金额：<span>'+discountAmount+'</span></td>'
+				//					+'</tr>'
+				//					+'<tr>'
+				//						+'<td>实付金额：<span>'+cardTotalAmount+'元</span></td>'
+				//					+'</tr>'
+				//				+'</table>'; 
-								document.querySelector('.viplist').appendChild(li);
-						}
-					}else{
-						$('.tipnull').css('display','block');
-						$('.resultsd').css('display','none');
-					}
-				}else{
-					document.querySelector('.viplist').innerHTML = '';
-					$('.tipnull').css('display','block');
-					$('.resultsd').css('display','none');
-				}
+				//				document.querySelector('.viplist').appendChild(li);
+				//		}
+				//	}else{
+				//		$('.tipnull').css('display','block');
+				//		$('.resultsd').css('display','none');
+				//	}
+				//}else{
+				//	document.querySelector('.viplist').innerHTML = '';
+				//	$('.tipnull').css('display','block');
+				//	$('.resultsd').css('display','none');
+				//}
 			}
 		);
 	}
+	//格式化返回值
+	function getViplistCallBack(data) {
+	    if (data.code == 0) {
+	        var datas = data.data;//
+	        func.tmpPayOrderList = datas;
+	        document.querySelector('.viplist').innerHTML = '';
+	        if (datas && datas.length > 0) {
+	            //tipnull
+	            $('.resultsd').css('display', 'block');
+	            for (var i = 0; i < datas.length; i++) {
+	                var li = document.createElement('li');
+	                //1
+	                //var cardAmount = datas[i].cardAmount;//单价
+	                //var buyNum = datas[i].buyNum;//购买数量
+	                //var cardTotalAmount = datas[i].cardTotalAmount;//实付
+	                //var orderId = datas[i].orderId;//订单id
+	                //var cardTypeName = datas[i].cardTypeName;//卡类型名称
+	                //var cardType = datas[i].cardType;//卡类型
+	                //var discount = datas[i].discount;//优惠折扣
+	                //var discountAmount = datas[i].discountAmount;//优惠金额
+	                //var carNumber = datas[i].carNumber;//车牌
+	                //var createDate = datas[i].createDate;//购买时间
+	                //createDate = new Date(createDate).toLocaleString();
+	                //cardAmount = jsajax.fenToYuan(cardAmount);//
+	                //cardTotalAmount = jsajax.fenToYuan(cardTotalAmount);
+	                //discountAmount == 0 ? discountAmount = '0元' : discountAmount = "-" + jsajax.fenToYuan(discountAmount) + '元';
+
+	                //2
+	                var _createDate = new Date(datas[i].createDate).toLocaleString();//创建时间
+	                var _payFinishTime = new Date(datas[i].payFinishTime).toLocaleString();//支付完成时间
+	                var _payOrderType = datas[i].payOrderType;//支付单类型[字典表:PAY_ORDER_TYPE]:101:停车付款单,102：停车预付单，103:停车补缴单；201：余额充值单,202：押金充值；301：会员卡购买单，302：会员卡续费.
+	                var _rltOrderId = datas[i].rltOrderId;//关联订单id
+	                var _plName = datas[i].plName == "" ? "--" : datas[i].plName;//停车场名称
+	                var _chepaiNum = datas[i].carNumber == "" ? "--" : datas[i].carNumber;//车牌号
+	                var _orderActFee = jsajax.fenToYuan(datas[i].orderActFee);//支付单实收 单位:分
+	                var _orderDicountFee = jsajax.fenToYuan(datas[i].orderDicountFee);//优惠金额 单位:分
+	                //debugger;
+	                li.setAttribute('data-checked', '0');//
+	                //li.setAttribute('data-cardAmount', cardAmount);//单价
+	                //li.setAttribute('data-buyNum', buyNum);//购买数量
+	                li.setAttribute('data-cardTotalAmount', _orderActFee.replace(",", ""));//实付
+	                li.setAttribute('data-cardType', _payOrderType);//支付单类型
+	                li.setAttribute('data-orderId', _rltOrderId);//关联订单id
+	                //li.setAttribute('data-cardTypeName', cardTypeName);//卡类型名称
+	                //li.setAttribute('data-discount', discount);//优惠折扣
+	                //li.setAttribute('data-discountAmount', discountAmount);//优惠金额
+	                li.setAttribute('data-carNumber', _chepaiNum);//购买数量
+	                //li.setAttribute('data-createDate', createDate);//购买时间
+	                //li.setAttribute('onclick', '');//购买时间
+	                li.innerHTML = '<p>' + _createDate + '</p>'
+	    				+ '<table>'
+	    					+ '<tr>'
+	    						+ '<td rowspan="7">'
+	    							+ '<span class="dcheck" data-name="">'
+	    								+ '<i class="icon iconfont">&#xe685;</i>'
+	    							+ '</span>'
+	    						+ '</td>'
+	    						+ '<td>车&nbsp;牌&nbsp;号&nbsp;：<span>' + _chepaiNum + '</span></td>'
+	    						+ '<td rowspan="7">'
+	    							+ '<span class="vipmonrynum">' + _orderActFee.replace(",", "") + '</span>元'
+	    						+ '</td>'
+	    					+ '</tr>'
+	    					//+ '<tr>'
+	    					//	+ '<td>停&nbsp;车&nbsp;场&nbsp;：<span>' + _plName + '</span></td>'
+	    					//+ '</tr>'
+	    					//+ '<tr>'
+	    					//	+ '<td>单&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;价：<span>' + cardAmount + '元</span></td>'
+	    					//+ '</tr>'
+	    					//+ '<tr>'
+	    					//	+ '<td>购买数量：<span>' + buyNum + '</span></td>'
+	    					//+ '</tr>'
+	    					//+ '<tr>'
+	    					//	+ '<td>优惠活动：<span>' + discount + '折</span></td>'
+	    					//+ '</tr>'
+	    					+ '<tr>'
+	    						+ '<td>优惠金额：<span>' + _orderDicountFee + '</span></td>'
+	    					+ '</tr>'
+	    					+ '<tr>'
+	    						+ '<td>实付金额：<span>' + _orderActFee + '元</span></td>'
+	    					+ '</tr>'
+	    				+ '</table>';
+
+	                document.querySelector('.viplist').appendChild(li);
+	            }
+	        } else {
+	            $('.tipnull').css('display', 'block');
+	            $('.resultsd').css('display', 'none');
+	        }
+	    } else {
+	        document.querySelector('.viplist').innerHTML = '';
+	        $('.tipnull').css('display', 'block');
+	        $('.resultsd').css('display', 'none');
+	    }
+	}
 </script>
@@ -27,11 +27,10 @@
 			background: #fff;
 			padding:20px 10px;
 			box-sizing: border-box;
-            text-align:center;
 		}
 		.invoice a,.invoice a:active{
 			display: inline-block;
-			width: 33%;
+			width: 100%;
 			font-size: 14px;
 			text-align: center;
 			color: #000;
@@ -77,8 +76,11 @@
 	</style>
 	<body>
 		<div class="invoice">
-			<!--<a class="" onclick="toast()">
-				<div>
+<!--			<a class="" onclick="toast()">
+-->		
+			<!--<a class="" href="kaipiao/Viptjf.html">
+
+                <div>
 					<img src="imgs/yue.png" />
 				</div>
 				<span>余额开票</span>
@@ -87,10 +89,12 @@
 				<div>
 					<img src="imgs/huiyuan.png" />
 				</div>
-				<span>会员卡开票</span>
+				<span>发票申领</span>
 			</a>
-			<!--<a class="" onclick="toast()">
-				<div>
+<!--			<a class="" onclick="toast()">
+-->
+			<!--<a class="" href="kaipiao/Viptjf.html">
+                <div>
 					<img src="imgs/linting.png" />
 				</div>
 				<span>临停开票</span>
@@ -28,12 +28,12 @@
 	</style>
 	<body>
 		<p class="rulestopp">开票规则</p>
-		<p>尊敬的用户，欢迎阅读任你停发票申领开票规则，本规则阐述的条款和条件适用于您使用任你停发票申领所提供的服务。</p>
+		<p>尊敬的用户，欢迎阅读丹阳行发票申领开票规则，本规则阐述的条款和条件适用于您使用丹阳行发票申领所提供的服务。</p>
 		<p>
-			1.线上发票申领暂时不支持电子发票，请您选择开具纸质发票，任你停将在一个月内为你安排发票打印并寄出。
+			1.线上发票申领暂时不支持电子发票，请您选择开具纸质发票，丹阳行将在一个月内为你安排发票打印并寄出。
 		</p>
 		<p>
-			2.根据相关政策规定，发片内容仅支持开具“停车服务费”。
+			2.根据相关政策规定，发票内容仅支持开具“停车服务费”。
 		</p>
 		<p>
 			3.停车消费中，各种形式的折扣券金额不支持开具发票。
@@ -48,13 +48,13 @@
 			6.您每次提交申请的纸质发票可以选择快递到付或上门取票，到付发票自行支付快递费给快递公司，快递费发票请您及时向快递公司索要。暂不支持港、澳、台地区邮寄。
 		</p>
 		<p>
-			7. 如您错填发票抬头信息需要进行修改，请您及时联系任你停客服人员为您处理；如果发票已经寄出，还请您收到发票后立即跟客服人员联系。
+			7. 如您错填发票抬头信息需要进行修改，请您及时联系丹阳行客服人员为您处理；如果发票已经寄出，还请您收到发票后立即跟客服人员联系。
 		</p>
 		<p>
 			8.因您个人填写发票信息和快递信息有误等原因产生的发票退票及重寄的往来费用，需由您本人自行承担。
 		</p>
 		<p>
-			9. 任你停客服电话为400-690-0899。
+			9. 丹阳行客服电话为0511-86903456。
 		</p>
 	</body>
@@ -2,7 +2,7 @@
 <html>
 	<head>
 		<meta charset="UTF-8">
-	    <title>会员卡开票</title>
+	    <title>开票</title>
 	    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
 	    <meta name="format-detection" content="telephone=no" />
 	    <meta name="format-detection" content="email=no" />
@@ -28,31 +28,8 @@
 		    border: 1px solid #f5a623;
 		    color: #f5a623;
 		}
-        .viplist li, .resultsd .dcheck {
-            cursor: pointer;
-        }
-        .selRegionBox {
-            padding: 10px 10px 0 10px;
-            text-align:center;
-        }
-
-        .selCity {
-            height: 38px;
-            line-height: 1.3;
-            border: 1px solid #e6e6e6;
-            border-radius: 2px;
-            color: #999;
-            width: 100%;
-            outline: none;
-            cursor: pointer;
-        }
 	</style>
 	<body>
-        <div class="selRegionBox">
-            <select name="city" lay-verify="" class="selCity" id="selCity">
-                <option value="0" selected>数据加载中</option>
-            </select>  
-        </div>
 		<p id="tipt" style="text-align: right;padding: 20px 10px 0;margin-bottom: -17px;font-size: 13px;" onclick="">开票金额说明</p>
 		<div class="tipnull" style="display: none;">
 			<div class="nullimg">
@@ -60,42 +37,42 @@
 				<p>暂无记录</p>
 			</div>
 		</div>
-		<ul class="viplist">
-			<!--<li data-checked="0" data-id="1" data-carnum='苏B' data-money="900.00">
-				<p>2017/02/12&nbsp;11:11:11</p>
-				<table>
-					<tr>
-						<td rowspan="7">
-							<span class="dcheck" data-name="">
-								<i class="icon iconfont">&#xe685;</i>
-							</span>
-						</td>
-						<td>卡&nbsp;类&nbsp;型&nbsp;：<span>蓝牌包月卡</span></td>
-						<td rowspan="7">
-							<span class="vipmonrynum">900.00</span>元
-						</td>
-					</tr>
-					<tr>
-						<td>绑定车牌：<span>苏B12345</span></td>
-					</tr>
-					<tr>
-						<td>单&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;价：<span>100.00元</span></td>
-					</tr>
-					<tr>
-						<td>购买数量：<span>10个月</span></td>
-					</tr>
-					<tr>
-						<td>优惠活动：<span>9折</span></td>
-					</tr>
-					<tr>
-						<td>优惠金额：<span>-100.00元</span></td>
-					</tr>
-					<tr>
-						<td>实付金额：<span>900.00元(微信)</span></td>
-					</tr>
-				</table>
-			</li>-->
-		</ul>
+        <ul class="viplist kpDefaultColor">
+            <!--<li data-checked="0" data-id="1" data-carnum='苏B' data-money="900.00">
+            <p>2017/02/12&nbsp;11:11:11</p>
+            <table>
+                <tr>
+                    <td rowspan="7">
+                        <span class="dcheck" data-name="">
+                            <i class="icon iconfont">&#xe685;</i>
+                        </span>
+                    </td>
+                    <td>卡&nbsp;类&nbsp;型&nbsp;：<span>蓝牌包月卡</span></td>
+                    <td rowspan="7">
+                        <span class="vipmonrynum">900.00</span>元
+                    </td>
+                </tr>
+                <tr>
+                    <td>绑定车牌：<span>苏B12345</span></td>
+                </tr>
+                <tr>
+                    <td>单&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;价：<span>100.00元</span></td>
+                </tr>
+                <tr>
+                    <td>购买数量：<span>10个月</span></td>
+                </tr>
+                <tr>
+                    <td>优惠活动：<span>9折</span></td>
+                </tr>
+                <tr>
+                    <td>优惠金额：<span>-100.00元</span></td>
+                </tr>
+                <tr>
+                    <td>实付金额：<span>900.00元(微信)</span></td>
+                </tr>
+            </table>
+        </li>-->
+        </ul>
 		<div class="resultsd container-fluid row" style="display: none;">
 			<div class="col-xs-9">
 				<p style="padding: 5px 0;">
@@ -155,7 +132,8 @@
 <script>
 	var func = {
 		index:'',
-		jixing:''
+		jixing: '',
+		tmpPayOrderList: []//临时开票列表
 	}
 	function isAndroid_ios(){  
 		var u = navigator.userAgent, app = navigator.appVersion;  
@@ -179,17 +157,7 @@
 		}else{
 			jsajax.setcss("css/Viptjf3.css");
 		}
-		//getViplist();
-	    /*songcxa*/
-	    //选择区域
-		getRegion();
-		$('#selCity').on("change", function (ev) {
-		    var val = $(this).val();
-		    console.log("orgId:" + val);
-		    if (val !=0) {
-		        getViplist(val);
-		    }
-		});
+		getViplist();
 		//点击开票说明
 		$('body').on('click','#tipt',function(){
 			func.index = layer.open({
@@ -267,7 +235,14 @@
 						id:id,
 						carnumer:carnumer
 					}
-					orderids.push(id);
+					var tmpObj = null;
+					$.each(func.tmpPayOrderList, function (i, v) {
+					    if (id == v.rltOrderId) {
+					        tmpObj = v;
+					        return false;
+					    }
+					});
+					orderids.push(tmpObj);
 					datas.push(obj);
 				}
 			});		
@@ -327,18 +302,18 @@
 	}
 	//获取会员卡开票列表
-	function getViplist(orgId) {
+	function getViplist(){
 		var salt = jsajax.salt(32);
 		var token = mUrl.GetToken();
 		var deviceInfo = mUrl.getDevice();
-		var _orgId = orgId;
+		var defaultOrgId=10003;//默认orgId【10003】丹阳行
 		var sortd = [
 			{keyname:'app_id',value:'0eca8f5373ca4866aec2f8e9d9367104'},
 			{keyname:'deviceInfo',value:deviceInfo},
 			{keyname:'salt',value:salt},
 			{keyname:'sign_type',value:'md5'},
 			{ keyname: 'token', value: token },
-            { keyname: 'orgId', value: _orgId },
+            { keyname: 'orgId', value: defaultOrgId },//添加默认orgId【10003】丹阳行
 		];
 		var mdsign = jsajax.getsign(sortd);
 		var jsond = {
@@ -348,17 +323,16 @@
 			sign:mdsign,
 			sign_type:'md5',
 			token: token,
-			orgId: _orgId
+			orgId: defaultOrgId
 		}
-		console.log('数据 ' + JSON.stringify(jsond));
-		document.querySelector('.viplist').innerHTML = '';
+		console.log('数据 '+JSON.stringify(jsond));
 		jsajax.defaultReq(
-			mUrl.vipkpList,
+			mUrl.vipkpList2,
 			JSON.stringify(jsond),
-			function(data){
-				//alert(JSON.stringify(data));
-			    console.log(JSON.stringify(data));
+			function (data) {
 			    getViplistCallBack(data);
+				//alert(JSON.stringify(data));
+				//console.log(JSON.stringify(data));
 				//if(data.code==0){
 				//	var datas = data.data;//
 				//	document.querySelector('.viplist').innerHTML = '';
@@ -443,18 +417,33 @@
 		);
 	}
-    //格式化返回值
+	//格式化返回值
 	function getViplistCallBack(data) {
 	    if (data.code == 0) {
 	        var datas = data.data;//
 	        func.tmpPayOrderList = datas;
-	        //document.querySelector('.viplist').innerHTML = '';
+	        document.querySelector('.viplist').innerHTML = '';
 	        if (datas && datas.length > 0) {
 	            //tipnull
-	            $('.tipnull').css('display', 'none');
 	            $('.resultsd').css('display', 'block');
 	            for (var i = 0; i < datas.length; i++) {
 	                var li = document.createElement('li');
+	                //1
+	                //var cardAmount = datas[i].cardAmount;//单价
+	                //var buyNum = datas[i].buyNum;//购买数量
+	                //var cardTotalAmount = datas[i].cardTotalAmount;//实付
+	                //var orderId = datas[i].orderId;//订单id
+	                //var cardTypeName = datas[i].cardTypeName;//卡类型名称
+	                //var cardType = datas[i].cardType;//卡类型
+	                //var discount = datas[i].discount;//优惠折扣
+	                //var discountAmount = datas[i].discountAmount;//优惠金额
+	                //var carNumber = datas[i].carNumber;//车牌
+	                //var createDate = datas[i].createDate;//购买时间
+	                //createDate = new Date(createDate).toLocaleString();
+	                //cardAmount = jsajax.fenToYuan(cardAmount);//
+	                //cardTotalAmount = jsajax.fenToYuan(cardTotalAmount);
+	                //discountAmount == 0 ? discountAmount = '0元' : discountAmount = "-" + jsajax.fenToYuan(discountAmount) + '元';
+
 	                //2
 	                var _createDate = new Date(datas[i].createDate).toLocaleString();//创建时间
 	                var _payFinishTime = new Date(datas[i].payFinishTime).toLocaleString();//支付完成时间
@@ -522,59 +511,4 @@
 	        $('.resultsd').css('display', 'none');
 	    }
 	}
-
-    //获取区域下拉选项
-	function getRegion() {
-	    $('#selCity').empty();
-	    var salt = jsajax.salt(32);
-	    var token = mUrl.GetToken();
-	    var deviceInfo = mUrl.getDevice();
-	    var sortd = [
-			{ keyname: 'app_id', value: '0eca8f5373ca4866aec2f8e9d9367104' },
-			{ keyname: 'deviceInfo', value: deviceInfo },
-			{ keyname: 'salt', value: salt },
-			{ keyname: 'sign_type', value: 'md5' },
-			{ keyname: 'token', value: token }
-	    ];
-	    var mdsign = jsajax.getsign(sortd);
-	    var jsond = {
-	        app_id: '0eca8f5373ca4866aec2f8e9d9367104',
-	        deviceInfo: deviceInfo,
-	        salt: salt,
-	        sign: mdsign,
-	        sign_type: 'md5',
-	        token: token
-	    }
-	    console.log('数据 ' + JSON.stringify(jsond));
-	 
-	    jsajax.defaultReq(
-			mUrl.queryAppOrgs,
-			JSON.stringify(jsond),
-			function (data) {
-			    //alert(JSON.stringify(data));
-			    console.log(JSON.stringify(data));
-			    if (data.code == 0) {
-			        setRegionOption(data.data);
-			    } else {
-			        $("#selCity").prepend("<option value='0'>暂无数据</option>");
-			    }
-			}, function (err) {
-			    $("#selCity").prepend("<option value='0'>暂无数据</option>");
-			    console.log(err);
-			}
-		);
-	}
-	function setRegionOption(arr) {
-	    var selCity = $("#selCity");
-	    if (arr.length > 0) {
-	        for (var i = 0; i < arr.length; i++) {
-	            var tmpObj = arr[i];
-	            selCity.append("<option value='" + tmpObj.orgId + "'>" + tmpObj.orgName + "</option>");
-	        }
-	        //搜索改组织下的发票列表[默认值]
-	        getViplist(arr[0].orgId);
-	    } else {
-	        selCity.prepend("<option value='0'>暂无数据</option>");
-	    }
-	}
 </script>
@@ -3,7 +3,7 @@ body{
 			height: auto;
 		}
 		.viplist{
-			margin-bottom: 80px;
+			/*margin-bottom: 80px;*/
 			/*padding-bottom: 80px;*/
 		}
 		.viplist li{
@@ -129,4 +129,8 @@ body{
 		}
 		.layui-layer-ico {
 		    display: none !important;
-		}
 \ No newline at end of file
+		}
+
+.kpDefaultColor {
+color:#4c4c4c;
+}
 \ No newline at end of file
@@ -416,7 +416,8 @@
 			//{keyname:'sign',value:''},
 			{keyname:'token',value:token},
 			//{keyname:'recipients',value:recipients}
-			{keyname:'orderIds',value:orderIds},
+			//{keyname:'orderIds',value:orderIds},
+            { keyname: 'orderList', value: orderIds },
 			{keyname:'invoiceTotalFee',value:invoiceTotalFee},//
 			{keyname:'invoiceState',value:'1'},
@@ -437,7 +438,8 @@
 			salt:salt,
 			sign_type:'md5',
 			token:token,
-			orderIds:orderIds,
+		    //orderIds: orderIds,
+			orderList: orderIds,//songcxa_2018-10-9新增
 			invoiceState:'1',
 			invoiceType:invoiceType,
 			applyDate:applyDate,
@@ -473,7 +475,8 @@
 		console.log('数据1 '+JSON.stringify(sortd));
 		console.log('数据 '+JSON.stringify(jsond));
 		jsajax.defaultReq(
-			mUrl.kaipaioHistory,
+			//mUrl.kaipaioHistory,
+            mUrl.kaipaioHistory2,
 			JSON.stringify(jsond),
 			function(data){
 				console.log('返回 '+JSON.stringify(data));
@@ -97,7 +97,7 @@
 			<p class="sjhbing" style="height: 25px;text-align: right;">
 				<span style="display: none;text-align: right;padding-right: 10px;box-sizing: border-box;">
 					<a href="../../commonp/binding.html">
-						绑定任你停账号使用更多功能
+						绑定丹阳行账号使用更多功能
 						<i class="icon iconfont">&#xe61e;</i>
 					</a>
 				</span>
@@ -113,7 +113,7 @@
 				<span><img src="fapiao/imgs/selfcar.png"/></span>车辆管理
 				<i class="icon iconfont">&#xe61e;</i>
 			</li>
-			<li data-href="https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx1e9001e5940605b1&redirect_uri=http://wxgzh.renniting.cn/wechatwuxi/Threewf/WEB-INF/pages/mylist.html&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect" data-token='0'>
+			<li data-href="https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx1e9001e5940605b1&redirect_uri=http://wxgzh.rnting.com/ceshi/wechatthree/Threewf/WEB-INF/pages/mylist.html&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect" data-token='0'>
 				<span><img src="fapiao/imgs/vip.png"/></span>会员卡
 				<i class="icon iconfont">&#xe61e;</i>
 			</li>
@@ -753,9 +753,9 @@
     		$('#photo').attr('src',headPicUrl);
     	}else {
     		var radom = Math.floor(Math.random()*3);
-    		if(radom=='0'||radom==0){$('#photo').attr('src','http://wxgzh.renniting.cn/wechatwuxi/Threewfx/more/self/imgs/toux/one.png');}
-    		if(radom=='1'||radom==1){$('#photo').attr('src','http://wxgzh.renniting.cn/wechatwuxi/Threewfx/more/self/imgs/toux/zero.png');}
-    		if(radom=='2'||radom==2){$('#photo').attr('src','http://wxgzh.renniting.cn/wechatwuxi/Threewfx/more/self/imgs/toux/two.png');}
+    		if(radom=='0'||radom==0){$('#photo').attr('src','http://wxgzh.rnting.com/ceshi/wechatthree/Threewfx/more/self/imgs/toux/one.png');}
+    		if(radom=='1'||radom==1){$('#photo').attr('src','http://wxgzh.rnting.com/ceshi/wechatthree/Threewfx/more/self/imgs/toux/zero.png');}
+    		if(radom=='2'||radom==2){$('#photo').attr('src','http://wxgzh.rnting.com/ceshi/wechatthree/Threewfx/more/self/imgs/toux/two.png');}
     		//if(phonelast=)
     	}
     	//alert($('#photo').attr('src'));
@@ -349,7 +349,7 @@
 			<div>
 				<p>1、优惠券新老用户同享</p>
 				<p>2、优惠券不可与其他优惠叠加使用</p>
-				<p>3、优惠券仅限在任你停最新客户端下单且选择在线支付时使用</p>
+				<p>3、优惠券仅限在丹阳行最新客户端下单且选择在线支付时使用</p>
 				<p>4、仅限在线支付使用，且车主手机号、领取红包时输入的手机号和账号对应的手机号需为同一个手机号</p>
 				<p>5、其他未尽事宜，请咨询客服</p>
 				<p>6、本活动与Apple Inc无关</p>
@@ -361,7 +361,7 @@
 <script src="../../js/bootstrap/bootstrap.js"></script>
 <script src="../../js/layui/layui/layui.js"></script>
 <script src="../../js/md5.min.js"></script>
-<script src="http://wxgzh.renniting.cn/wechatwuxi/Threewf/js/url.js"></script>
+<script src="http://wxgzh.rnting.com/ceshi/wechatthree/Threewf/js/url.js"></script>
 <script src="../../js/ajax.js"></script>
 <script>
 /*	mUrl.yearjudge = cepath+'/yearActivity/judgeGetCouponOrScore';//判断当前用户今天是否已经领取积分或者卡劵
@@ -71,7 +71,7 @@ function  wktrnt(name,juli,positiona){
 		+'<div class="col-xs-4">停车诱导</div><div class="col-xs-4">'
 			+'<span class="tipseconds"><span style="color: #f00;">10s</span>后自动进入导航</span>'
 		+'</div> </div> <div class="hhbcontent row"> <div class="col-xs-12">'
-			+'<div>'+name+'</div><p>（因暂未开通任你停，数据可能不准确）</p>'
+			+'<div>'+name+'</div><p>（因暂未开通丹阳行，数据可能不准确）</p>'
 		+'</div> <div class="col-xs-4"> <img src="imgs/a23.png" /> </div> <div class="col-xs-4"> <img src="imgs/a1x.png" />'
 			+'<div style="padding-top: 8px;">距您'+juli+'km</div>'
 		+'</div> <div class="col-xs-4"> <div>空闲</div> <span style="display: inline-block;padding-top: 8px;">空位</span>'
@@ -249,7 +249,7 @@
 							//potop = idleberths;
 							kt = '<span> 当前车位数： <span style="color: #00ff00;">'+idleberths+'</span> / <span>'+totalberths+'</span> </span>';
 						}else{
-							kt = '<span class="flan"> 暂未开通任你停</span>';
+							kt = '<span class="flan"> 暂未开通丹阳行</span>';
 						}
@@ -694,7 +694,7 @@
         	//console.log(totalberths+"  "+idleberths+"  "+yt);
         }else{
         	$(".onepark").attr('data-status','0');
-			$(".lnum").html('<span class="flan">暂未开通任你停</span>');
+			$(".lnum").html('<span class="flan">暂未开通丹阳行</span>');
         }
         $("#laddre").text(address);
@@ -187,7 +187,7 @@ overflow: hidden;
 			<div class="hhbcontent row">
 				<div class="col-xs-12">
 					<div>中国传感网创新园停车场</div>
-					<p>（因暂未开通任你停，数据可能不准确）</p>
+					<p>（因暂未开通丹阳行，数据可能不准确）</p>
 				</div>
 				<div class="col-xs-4">
 					<img src="imgs/a23.png" />
@@ -235,7 +235,7 @@ overflow: hidden;
 			<div class="hhbcontent row">
 				<div class="col-xs-12">
 					<div>中国传感网创新园停车场</div>
-					<p class="katrnt" style="display: none;">（因暂未开通任你停，数据可能不准确）</p>
+					<p class="katrnt" style="display: none;">（因暂未开通丹阳行，数据可能不准确）</p>
 				</div>
 				<div class="col-xs-4">
 					<img src="imgs/a23.png" />
@@ -807,7 +807,7 @@
         	//console.log(totalberths+"  "+idleberths+"  "+yt);
         }else{
         	$(".onepark").attr('data-status','0');
-			//$(".lnum").html('<span class="flan">暂未开通任你停</span>');
+			//$(".lnum").html('<span class="flan">暂未开通丹阳行</span>');
         }
         $("#laddre").text(address);
@@ -311,7 +311,7 @@
 							kt = '<span> 当前车位数： <span style="color: #00ff00;">'+idleberths+'</span> / <span>'+totalberths+'</span> </span>';
 							div.setAttribute('data-status','1');
         				}else{
-							kt = '<span class="flan"> 暂未开通任你停</span>';
+							kt = '<span class="flan"> 暂未开通丹阳行</span>';
 							div.setAttribute('data-status','0');
 						}
@@ -311,7 +311,7 @@
 							kt = '<span> 当前车位数： <span style="color: #00ff00;">'+idleberths+'</span> / <span>'+totalberths+'</span> </span>';
 							div.setAttribute('data-status','1');
         				}else{
-							kt = '<span class="flan"> 暂未开通任你停</span>';
+							kt = '<span class="flan"> 暂未开通丹阳行</span>';
 							div.setAttribute('data-status','0');
 						}
@@ -261,7 +261,7 @@
 			jsondata,
 			function (res) {
 				if(res.code=='0'){
-	                window.location.href = 'http://wxgzh.renniting.cn/wechatwuxi/Threewfx/more/xinban/minec.html';//mUrl.myParkCardView;
+	                window.location.href = 'http://wxgzh.rnting.com/ceshi/wechatthree/Threewfx/more/xinban/minec.html';//mUrl.myParkCardView;
 	            }else{}
 	        }
 		);