From 890143c36ccf61f1b5a7229150ff8ff0c928e17b Mon Sep 17 00:00:00 2001
From: liuqimichale <123456lq>
Date: Wed, 5 Dec 2018 20:51:50 +0800
Subject: [PATCH] originid

---
 .gitignore                             |   4 ++++
 more/self/fapiao/kaipiao/Viptjf.html   |  56 ++++++++++++++++++++++++++++++--------------------------
 more/self/fapiao/kaipiao/tjfapiao.html | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------
 3 files changed, 87 insertions(+), 73 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5c79c9b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+.idea
+
+
+/Threewf.iml
diff --git a/more/self/fapiao/kaipiao/Viptjf.html b/more/self/fapiao/kaipiao/Viptjf.html
index 10638f6..862b192 100644
--- a/more/self/fapiao/kaipiao/Viptjf.html
+++ b/more/self/fapiao/kaipiao/Viptjf.html
@@ -51,7 +51,7 @@
         <div class="selRegionBox">
             <select name="city" lay-verify="" class="selCity" id="selCity">
                 <option value="0" selected>数据加载中</option>
-            </select>  
+            </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;">
@@ -125,7 +125,7 @@
 							<span id="vipnums">0</span>个会员卡
 						共<span id="totalm">0.00</span>元（满200可申请）
 						</p>
-						
+
 					</td>
 					<td>
 						<button id="nextbtn" class="disabled" disabled="disabled">下一步</button>
@@ -157,22 +157,22 @@
 		index:'',
 		jixing:''
 	}
-	function isAndroid_ios(){  
-		var u = navigator.userAgent, app = navigator.appVersion;  
-		var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Linux') > -1; //android终端或者uc浏览器  
-		var isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios终端  
+	function isAndroid_ios(){
+		var u = navigator.userAgent, app = navigator.appVersion;
+		var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Linux') > -1; //android终端或者uc浏览器
+		var isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios终端
 		isAndroid==true?true:false;
 		if(isAndroid){func.jixing = 'android';}else if(isiOS){
 			func.jixing = 'ios';
 		}
-	}  
+	}
 	window.onpageshow=function(e){
 	    var a=e||window.event;
 	    if(a.persisted){
 	    	window.location.reload();
 	    }
 	}
-	$(function(){ 
+	$(function(){
 		isAndroid_ios();
 		if(func.jixing=='android'){
 			jsajax.setcss("css/Viptjf3.css");
@@ -184,10 +184,11 @@
 	    //选择区域
 		getRegion();
 		$('#selCity').on("change", function (ev) {
-		    var val = $(this).val();
-		    console.log("orgId:" + val);
-		    if (val !=0) {
-		        getViplist(val);
+            var orgIdval = $(this).val();
+		    console.log("orgId:" + orgIdval);
+            localStorage.setItem("orgIdval",orgIdval)
+		    if (orgIdval !=0) {
+		        getViplist(orgIdval);
 		    }
 		});
 		//点击开票说明
@@ -203,7 +204,7 @@
 		$('body').on('click','.zdclose',function(){
 			layer.close(func.index);
 		});
-		
+
 		//点击全选时
 		$('body').on('click','.resultsd .dcheck',function(){
 			var status = $(this).attr('data-status');
@@ -218,7 +219,7 @@
 				if(status=="0"){
 					$(this).attr('data-checked','1');
 					$(this).children('table').children().children().children().children('.dcheck').addClass('actived');
-					
+
 				}else if(status=="1"){
 					$(this).attr('data-checked','0');
 					$(this).children('table').children().children().children().children('.dcheck').removeClass('actived');
@@ -228,8 +229,8 @@
 		});
 		//多选
 		$('body').on('click','.viplist li',function(){
-			var check = $(this).attr('data-checked'); 
-			
+			var check = $(this).attr('data-checked');
+
 			if(check=='0'){
 				$(this).attr('data-checked','1');
 				$(this).children('table').children().children().children().children('.dcheck').addClass('actived');
@@ -248,7 +249,7 @@
 			}
 			results();
 		});
-		
+
 		//点击下一步
 		$('body').on('click','#nextbtn',function(){
 			var datas = [];
@@ -270,10 +271,10 @@
 					orderids.push(id);
 					datas.push(obj);
 				}
-			});		
+			});
 			dataobjs.orderIds = orderids;
 			dataobjs.invoiceTotalFee = parseFloat($('#totalm').text()*100);
-			
+
 			for(var i=0;i<datas.length;i++){
 				console.log(i);
 				if(i==0){
@@ -296,7 +297,7 @@
 			//console.log(JSON.stringify(datas));
 			console.log(JSON.stringify(carn));
 			console.log('数据 '+JSON.stringify(dataobjs));
-			
+
 			//确认发票提交时所需的部分数据
 			sessionStorage.setItem('Vipcars',JSON.stringify(carn));
 			sessionStorage.setItem('tjfaBFdatas',JSON.stringify(dataobjs));
@@ -325,7 +326,7 @@
 		}
 		console.log('总金额 '+allm);
 	}
-	
+
 	//获取会员卡开票列表
 	function getViplist(orgId) {
 		var salt = jsajax.salt(32);
@@ -381,8 +382,8 @@
 				//		    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);//购买数量
@@ -426,8 +427,8 @@
 				//					+'<tr>'
 				//						+'<td>实付金额：<span>'+cardTotalAmount+'元</span></td>'
 				//					+'</tr>'
-				//				+'</table>'; 
-								
+				//				+'</table>';
+
 				//				document.querySelector('.viplist').appendChild(li);
 				//		}
 				//	}else{
@@ -546,7 +547,7 @@
 	        token: token
 	    }
 	    console.log('数据 ' + JSON.stringify(jsond));
-	 
+
 	    jsajax.defaultReq(
 			mUrl.queryAppOrgs,
 			JSON.stringify(jsond),
@@ -566,6 +567,7 @@
 	}
 	function setRegionOption(arr) {
 	    var selCity = $("#selCity");
+
 	    if (arr.length > 0) {
 	        for (var i = 0; i < arr.length; i++) {
 	            var tmpObj = arr[i];
@@ -573,6 +575,8 @@
 	        }
 	        //搜索改组织下的发票列表[默认值]
 	        getViplist(arr[0].orgId);
+          localStorage.setItem("orgIdval",arr[0].orgId)
+
 	    } else {
 	        selCity.prepend("<option value='0'>暂无数据</option>");
 	    }
diff --git a/more/self/fapiao/kaipiao/tjfapiao.html b/more/self/fapiao/kaipiao/tjfapiao.html
index 0539b5e..40d70ad 100644
--- a/more/self/fapiao/kaipiao/tjfapiao.html
+++ b/more/self/fapiao/kaipiao/tjfapiao.html
@@ -22,7 +22,7 @@
 		}
 		.dcheck.actived span div{
 		    width: 10px;
-		    height: 10px; 
+		    height: 10px;
 		    margin: 3px;
 		    background: #4A4A4A;
 		    border-radius: 10px;
@@ -72,7 +72,7 @@
 					</td>
 				</tr>
 			</table>
-			<table class="selectAddress shAr2" style="display: none;"  onclick=""> 
+			<table class="selectAddress shAr2" style="display: none;"  onclick="">
 				<tr>
 					<td>
 						<div style="height: 44px;margin:  0 auto;width: 120px;color: #75CBBE;border-radius: 6px;text-align: center;line-height: 44px;padding: 0 20px;border: 1px solid #75CBBE;">
@@ -109,7 +109,7 @@
 					个人信息
 				</div>
 				<div class="danweiResults">
-					
+
 					<table class="danwei danwei1"  onclick="">
 						<tr>
 							<td>
@@ -145,7 +145,7 @@
 				</div>
 				<!--<div class="geren"></div>
 				-->
-				
+
 			</div>
 		</div>
 		<table class="ftable ftable3">
@@ -178,7 +178,7 @@
 				</td>
 			</tr>
 		</table>
-		
+
 		<table class="ftable ftable2 checkgroup">
 			<tr>
 				<td>
@@ -267,7 +267,7 @@
 	$(function(){
 		jsajax.setcss("css/tjfapiao2.css");
 		gethuancun();
-		layui.use(['layer'], function(){ 
+		layui.use(['layer'], function(){
 		  //向世界问个好
 		});
 		var an = mUrl.getApporWX();
@@ -281,7 +281,7 @@
 			$(this).attr('data-checkname',dname);
 			console.log(dname);
 		});
-		
+
 		//选择发票支付类型
 		$('.ftable2 tr').on('click',function(){
 			console.log( $(this).children().children('.dcheck').attr('data-name'));
@@ -308,17 +308,17 @@
 			}
 			console.log(dname);
 		});
-		
+
 		//重新选择收货地址
 		$('body').on('click','.shAddressresults .selectAddress',function(){
 			window.location.href = '../mailingaddress/selectaddress.html';
 		});
-		
+
 		//重选抬头
 		$('body').on('click','.danweiResults .danwei',function(){
 			window.location.href = '../invoicetitle/selecttaitou.html';
 		});
-		
+
 		//点击提交时获取到数据后弹出确认框
 		$('body').on('click','.tjfbtn',function(){
 			var str = '';
@@ -356,7 +356,7 @@
 				fstr = '<tr><td>收件人</td><td>'+func.shoujr+'</td> </tr>'
 			   	+'<tr> <td>收件地址</td><td>'+func.shoujiandz+'</td> </tr>';
 			}
-			
+
 			func.index = layer.open({
 			   type: 1,
 			  //skin: 'layui-layer-rim', //加上边框
@@ -374,7 +374,7 @@
 			   +'<button class="cbtn" onclick="tijiaobtn()">确认提交</button> </div>'
 			});
 		});
-		
+
 		//点击头部关闭提示
 		$('body').on('click','.tjclose',function(){
 			$('.toptip').slideUp(300);
@@ -388,7 +388,7 @@
 		/*$('body').on('click','.zzbtn .cbtn',function(){
 		});*/
 	})
-	
+
 	//点击确认提交将数据提交到后台
 	function tijiaobtn(){
 		var salt = jsajax.salt(32);//mUrl.kaipaioHistory
@@ -400,7 +400,7 @@
 		var recipients = func.shoujr;//收件人
 		var recipientsAddress = func.shoujiandz;//收货地址
 		var ticketContent = $.trim($('#ticketContent').val()) ;//发票内容
-		
+
 		var applyDate = Date.parse( new Date());
 		var invoiceType = '0';
 		var fetchTicketWay  = '1';
@@ -408,6 +408,9 @@
 			invoiceType = '1';
 		}
 		if(func.ftname=='自主取票'){fetchTicketWay  = '2';}
+      	localStorage.getItem("orgIdval")
+	  	//alert(localStorage.getItem("orgIdval"))
+	  	var orgIdval = localStorage.getItem("orgIdval")
 		var sortd = [
 			{keyname:'app_id',value:'0eca8f5373ca4866aec2f8e9d9367104'},
 			{keyname:'salt',value:salt},
@@ -419,7 +422,7 @@
 			{keyname:'orderIds',value:orderIds},
 			{keyname:'invoiceTotalFee',value:invoiceTotalFee},//
 			{keyname:'invoiceState',value:'1'},
-			
+
 			//{keyname:'custName',value:token},//购买方名称
 			{keyname:'invoiceType',value:invoiceType},
 			{keyname:'applyDate',value:applyDate},
@@ -427,10 +430,10 @@
 			{keyname:'recipients',value:recipients},//收件人
 			{keyname:'recipientsAddress',value:recipientsAddress},//收件地址
 			{keyname:'fetchTicketWay',value:fetchTicketWay},
-			{keyname:'terminalSource',value:func.terminalSource}
-			
+			{keyname:'terminalSource',value:func.terminalSource},
+          	{keyname:'orgId',value:orgIdval}
 		];
-		
+
 		var jsond = {
 			app_id:'0eca8f5373ca4866aec2f8e9d9367104',
 			deviceInfo:deviceInfo,
@@ -447,7 +450,8 @@
 			//orderActFee:orderActFee,
 			invoiceTotalFee:invoiceTotalFee,
 			fetchTicketWay:fetchTicketWay,
-			terminalSource:func.terminalSource
+			terminalSource:func.terminalSource,
+          	orgId:orgIdval
 		};
 		if(ticketContent&&ticketContent!=''){
 			var ticketContents = {keyname:'ticketContent',value:ticketContent};
@@ -472,6 +476,8 @@
 		jsond.sign = mdsign;
 		console.log('数据1 '+JSON.stringify(sortd));
 		console.log('数据 '+JSON.stringify(jsond));
+
+        console.log(jsond.orgId)
 		jsajax.defaultReq(
 			mUrl.kaipaioHistory,
 			JSON.stringify(jsond),
@@ -479,7 +485,7 @@
 				console.log('返回 '+JSON.stringify(data));
 				if(data.code=='0'){
 					layer.close(func.index);
-					
+
 					setTimeout(function(){
 						layer.msg('数据提交成功', {
 							icon: 1,
@@ -489,7 +495,7 @@
 							window.location.href = document.referrer;
 						});
 					})
-					
+
 					//window.history.go(-1);
 				}else{
 					alert(data.message);
@@ -497,25 +503,25 @@
 			}
 		)
 	}
-	
-	
-	
-	
+
+
+
+
 	/*
-	 * 首先获取缓存中是否有数据 
+	 * 首先获取缓存中是否有数据
 	 * 缓存抬头数据   selectTtResults
 	 * 缓存地址数据   selectAdressresults
 	 * 若有则将数据填充进去，若没有则进行选择
-	 * 
+	 *
 	 * 点击单位时显示单位抬头的信息
 	 * 点击个人时判断是余额还是会员或临停若为余额的话则个人中心显示的手机号若不是则显示的车牌号
-	 * 
-	 * 
+	 *
+	 *
 	 1.先获取默认的详情地址若没有的话则进入选择页面进行选择 selecttaitou.html
 	 2.若没有默认抬头则点击进入选择默认抬头页面 selectaddress.html
-	 
+
 	 * */
-	
+
 	//获取缓存中的数据
 	function gethuancun(){
 		//获取上个页面值
@@ -551,12 +557,12 @@
 					}else{
 						getAddress();
 					}
-					
+
 				}else{
 					getAddress();
 				}
 			});
-			
+
 		}else{
 			getAddress();
 		}
@@ -579,12 +585,12 @@
 					}else{
 						getUplist();
 					}
-					
+
 				}else{
 					getUplist();
 				}
 			});
-			
+
 			/*setTimeout(function(){
 				sessionStorage.setItem('selectTtResults','');
 				console.log("获取缓存信息 "+sessionStorage.getItem('selectTtResults'));
@@ -592,7 +598,7 @@
 		}else{
 			getUplist();
 		}
-		
+
 		//获取类型为个人时的信息
 		console.log(sessionStorage.getItem('Vipcars'));
 		var tjdatas = sessionStorage.getItem('tjfaBFdatas');
@@ -611,7 +617,7 @@
 				if(Vipcars.length<3){
 					len = Vipcars.length;
 				}
-				
+
 				for(var i=0;i<len;i++){
 					cars += Vipcars[i]+" ";
 				}
@@ -634,7 +640,7 @@
 				if(Vipcars.length<3){
 					len = Vipcars.length;
 				}
-				
+
 				for(var i=0;i<len;i++){
 					cars += Vipcars[i]+" ";
 				}
@@ -648,10 +654,10 @@
 			var phone = mUrl.GetPhone();
 			$('.checkResults .geren').text('手机号：'+phone);
 		}*/
-		
-		
+
+
 	}
-	
+
 	//获取默认地址
 	function getAddress(){
 		var salt = jsajax.salt(32);
@@ -692,7 +698,7 @@
 				 			var phone = datas[i].phone;
 				 			var recipient = datas[i].recipient;
 				 			var id = datas[i].id;
-				 			
+
 				 			if(isDefault==1){
 				 				var sphone = phone;
 				 				$('.shAr1').attr('data-id',id);
@@ -721,7 +727,7 @@
 		);
 
 	}
-	
+
 	//获取默认的发票抬头
 	function getUplist(){
 		var salt = jsajax.salt(32);
@@ -783,7 +789,7 @@
 		);
 
 	}
-	
+
 	//根据id查询是否有该抬头
 	function  getinfobyid(id,fn){
 		var salt = jsajax.salt(32);
@@ -816,7 +822,7 @@
 			}
 		);
 	}
-	
+
 	//根据id查询是否有该地址
 	//根据id获取收货地址详情
 	function getAddressby(id,fn){
@@ -831,7 +837,7 @@
 			{keyname:'token',value:token},
 			{keyname:'id',value:id},
 		];
-		
+
 		var mdsign = jsajax.getsign(sortd);
 		var jsond = {
 			app_id:'0eca8f5373ca4866aec2f8e9d9367104',
@@ -851,4 +857,4 @@
 			}
 		);
 	}
-</script>
\ No newline at end of file
+</script>
--
libgit2 0.21.4