Commit 890143c36ccf61f1b5a7229150ff8ff0c928e17b

Authored by liuqimichale
1 parent 29ae26f6

originid

.gitignore 0 → 100644
  1 +.idea
  2 +
  3 +
  4 +/Threewf.iml
... ...
more/self/fapiao/kaipiao/Viptjf.html
... ... @@ -51,7 +51,7 @@
51 51 <div class="selRegionBox">
52 52 <select name="city" lay-verify="" class="selCity" id="selCity">
53 53 <option value="0" selected>数据加载中</option>
54   - </select>
  54 + </select>
55 55 </div>
56 56 <p id="tipt" style="text-align: right;padding: 20px 10px 0;margin-bottom: -17px;font-size: 13px;" onclick="">开票金额说明</p>
57 57 <div class="tipnull" style="display: none;">
... ... @@ -125,7 +125,7 @@
125 125 <span id="vipnums">0</span>个会员卡
126 126 共<span id="totalm">0.00</span>元(满200可申请)
127 127 </p>
128   -
  128 +
129 129 </td>
130 130 <td>
131 131 <button id="nextbtn" class="disabled" disabled="disabled">下一步</button>
... ... @@ -157,22 +157,22 @@
157 157 index:'',
158 158 jixing:''
159 159 }
160   - function isAndroid_ios(){
161   - var u = navigator.userAgent, app = navigator.appVersion;
162   - var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Linux') > -1; //android终端或者uc浏览器
163   - var isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios终端
  160 + function isAndroid_ios(){
  161 + var u = navigator.userAgent, app = navigator.appVersion;
  162 + var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Linux') > -1; //android终端或者uc浏览器
  163 + var isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios终端
164 164 isAndroid==true?true:false;
165 165 if(isAndroid){func.jixing = 'android';}else if(isiOS){
166 166 func.jixing = 'ios';
167 167 }
168   - }
  168 + }
169 169 window.onpageshow=function(e){
170 170 var a=e||window.event;
171 171 if(a.persisted){
172 172 window.location.reload();
173 173 }
174 174 }
175   - $(function(){
  175 + $(function(){
176 176 isAndroid_ios();
177 177 if(func.jixing=='android'){
178 178 jsajax.setcss("css/Viptjf3.css");
... ... @@ -184,10 +184,11 @@
184 184 //选择区域
185 185 getRegion();
186 186 $('#selCity').on("change", function (ev) {
187   - var val = $(this).val();
188   - console.log("orgId:" + val);
189   - if (val !=0) {
190   - getViplist(val);
  187 + var orgIdval = $(this).val();
  188 + console.log("orgId:" + orgIdval);
  189 + localStorage.setItem("orgIdval",orgIdval)
  190 + if (orgIdval !=0) {
  191 + getViplist(orgIdval);
191 192 }
192 193 });
193 194 //点击开票说明
... ... @@ -203,7 +204,7 @@
203 204 $('body').on('click','.zdclose',function(){
204 205 layer.close(func.index);
205 206 });
206   -
  207 +
207 208 //点击全选时
208 209 $('body').on('click','.resultsd .dcheck',function(){
209 210 var status = $(this).attr('data-status');
... ... @@ -218,7 +219,7 @@
218 219 if(status=="0"){
219 220 $(this).attr('data-checked','1');
220 221 $(this).children('table').children().children().children().children('.dcheck').addClass('actived');
221   -
  222 +
222 223 }else if(status=="1"){
223 224 $(this).attr('data-checked','0');
224 225 $(this).children('table').children().children().children().children('.dcheck').removeClass('actived');
... ... @@ -228,8 +229,8 @@
228 229 });
229 230 //多选
230 231 $('body').on('click','.viplist li',function(){
231   - var check = $(this).attr('data-checked');
232   -
  232 + var check = $(this).attr('data-checked');
  233 +
233 234 if(check=='0'){
234 235 $(this).attr('data-checked','1');
235 236 $(this).children('table').children().children().children().children('.dcheck').addClass('actived');
... ... @@ -248,7 +249,7 @@
248 249 }
249 250 results();
250 251 });
251   -
  252 +
252 253 //点击下一步
253 254 $('body').on('click','#nextbtn',function(){
254 255 var datas = [];
... ... @@ -270,10 +271,10 @@
270 271 orderids.push(id);
271 272 datas.push(obj);
272 273 }
273   - });
  274 + });
274 275 dataobjs.orderIds = orderids;
275 276 dataobjs.invoiceTotalFee = parseFloat($('#totalm').text()*100);
276   -
  277 +
277 278 for(var i=0;i<datas.length;i++){
278 279 console.log(i);
279 280 if(i==0){
... ... @@ -296,7 +297,7 @@
296 297 //console.log(JSON.stringify(datas));
297 298 console.log(JSON.stringify(carn));
298 299 console.log('数据 '+JSON.stringify(dataobjs));
299   -
  300 +
300 301 //确认发票提交时所需的部分数据
301 302 sessionStorage.setItem('Vipcars',JSON.stringify(carn));
302 303 sessionStorage.setItem('tjfaBFdatas',JSON.stringify(dataobjs));
... ... @@ -325,7 +326,7 @@
325 326 }
326 327 console.log('总金额 '+allm);
327 328 }
328   -
  329 +
329 330 //获取会员卡开票列表
330 331 function getViplist(orgId) {
331 332 var salt = jsajax.salt(32);
... ... @@ -381,8 +382,8 @@
381 382 // cardAmount = jsajax.fenToYuan(cardAmount);//
382 383 // cardTotalAmount = jsajax.fenToYuan(cardTotalAmount);
383 384 // discountAmount==0?discountAmount='0元':discountAmount="-"+jsajax.fenToYuan(discountAmount)+'元';
384   -
385   -
  385 +
  386 +
386 387 // li.setAttribute('data-checked','0');//
387 388 // li.setAttribute('data-cardAmount',cardAmount);//单价
388 389 // li.setAttribute('data-buyNum',buyNum);//购买数量
... ... @@ -426,8 +427,8 @@
426 427 // +'<tr>'
427 428 // +'<td>实付金额:<span>'+cardTotalAmount+'元</span></td>'
428 429 // +'</tr>'
429   - // +'</table>';
430   -
  430 + // +'</table>';
  431 +
431 432 // document.querySelector('.viplist').appendChild(li);
432 433 // }
433 434 // }else{
... ... @@ -546,7 +547,7 @@
546 547 token: token
547 548 }
548 549 console.log('数据 ' + JSON.stringify(jsond));
549   -
  550 +
550 551 jsajax.defaultReq(
551 552 mUrl.queryAppOrgs,
552 553 JSON.stringify(jsond),
... ... @@ -566,6 +567,7 @@
566 567 }
567 568 function setRegionOption(arr) {
568 569 var selCity = $("#selCity");
  570 +
569 571 if (arr.length > 0) {
570 572 for (var i = 0; i < arr.length; i++) {
571 573 var tmpObj = arr[i];
... ... @@ -573,6 +575,8 @@
573 575 }
574 576 //搜索改组织下的发票列表[默认值]
575 577 getViplist(arr[0].orgId);
  578 + localStorage.setItem("orgIdval",arr[0].orgId)
  579 +
576 580 } else {
577 581 selCity.prepend("<option value='0'>暂无数据</option>");
578 582 }
... ...
more/self/fapiao/kaipiao/tjfapiao.html
... ... @@ -22,7 +22,7 @@
22 22 }
23 23 .dcheck.actived span div{
24 24 width: 10px;
25   - height: 10px;
  25 + height: 10px;
26 26 margin: 3px;
27 27 background: #4A4A4A;
28 28 border-radius: 10px;
... ... @@ -72,7 +72,7 @@
72 72 </td>
73 73 </tr>
74 74 </table>
75   - <table class="selectAddress shAr2" style="display: none;" onclick="">
  75 + <table class="selectAddress shAr2" style="display: none;" onclick="">
76 76 <tr>
77 77 <td>
78 78 <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 @@
109 109 个人信息
110 110 </div>
111 111 <div class="danweiResults">
112   -
  112 +
113 113 <table class="danwei danwei1" onclick="">
114 114 <tr>
115 115 <td>
... ... @@ -145,7 +145,7 @@
145 145 </div>
146 146 <!--<div class="geren"></div>
147 147 -->
148   -
  148 +
149 149 </div>
150 150 </div>
151 151 <table class="ftable ftable3">
... ... @@ -178,7 +178,7 @@
178 178 </td>
179 179 </tr>
180 180 </table>
181   -
  181 +
182 182 <table class="ftable ftable2 checkgroup">
183 183 <tr>
184 184 <td>
... ... @@ -267,7 +267,7 @@
267 267 $(function(){
268 268 jsajax.setcss("css/tjfapiao2.css");
269 269 gethuancun();
270   - layui.use(['layer'], function(){
  270 + layui.use(['layer'], function(){
271 271 //向世界问个好
272 272 });
273 273 var an = mUrl.getApporWX();
... ... @@ -281,7 +281,7 @@
281 281 $(this).attr('data-checkname',dname);
282 282 console.log(dname);
283 283 });
284   -
  284 +
285 285 //选择发票支付类型
286 286 $('.ftable2 tr').on('click',function(){
287 287 console.log( $(this).children().children('.dcheck').attr('data-name'));
... ... @@ -308,17 +308,17 @@
308 308 }
309 309 console.log(dname);
310 310 });
311   -
  311 +
312 312 //重新选择收货地址
313 313 $('body').on('click','.shAddressresults .selectAddress',function(){
314 314 window.location.href = '../mailingaddress/selectaddress.html';
315 315 });
316   -
  316 +
317 317 //重选抬头
318 318 $('body').on('click','.danweiResults .danwei',function(){
319 319 window.location.href = '../invoicetitle/selecttaitou.html';
320 320 });
321   -
  321 +
322 322 //点击提交时获取到数据后弹出确认框
323 323 $('body').on('click','.tjfbtn',function(){
324 324 var str = '';
... ... @@ -356,7 +356,7 @@
356 356 fstr = '<tr><td>收件人</td><td>'+func.shoujr+'</td> </tr>'
357 357 +'<tr> <td>收件地址</td><td>'+func.shoujiandz+'</td> </tr>';
358 358 }
359   -
  359 +
360 360 func.index = layer.open({
361 361 type: 1,
362 362 //skin: 'layui-layer-rim', //加上边框
... ... @@ -374,7 +374,7 @@
374 374 +'<button class="cbtn" onclick="tijiaobtn()">确认提交</button> </div>'
375 375 });
376 376 });
377   -
  377 +
378 378 //点击头部关闭提示
379 379 $('body').on('click','.tjclose',function(){
380 380 $('.toptip').slideUp(300);
... ... @@ -388,7 +388,7 @@
388 388 /*$('body').on('click','.zzbtn .cbtn',function(){
389 389 });*/
390 390 })
391   -
  391 +
392 392 //点击确认提交将数据提交到后台
393 393 function tijiaobtn(){
394 394 var salt = jsajax.salt(32);//mUrl.kaipaioHistory
... ... @@ -400,7 +400,7 @@
400 400 var recipients = func.shoujr;//收件人
401 401 var recipientsAddress = func.shoujiandz;//收货地址
402 402 var ticketContent = $.trim($('#ticketContent').val()) ;//发票内容
403   -
  403 +
404 404 var applyDate = Date.parse( new Date());
405 405 var invoiceType = '0';
406 406 var fetchTicketWay = '1';
... ... @@ -408,6 +408,9 @@
408 408 invoiceType = '1';
409 409 }
410 410 if(func.ftname=='自主取票'){fetchTicketWay = '2';}
  411 + localStorage.getItem("orgIdval")
  412 + //alert(localStorage.getItem("orgIdval"))
  413 + var orgIdval = localStorage.getItem("orgIdval")
411 414 var sortd = [
412 415 {keyname:'app_id',value:'0eca8f5373ca4866aec2f8e9d9367104'},
413 416 {keyname:'salt',value:salt},
... ... @@ -419,7 +422,7 @@
419 422 {keyname:'orderIds',value:orderIds},
420 423 {keyname:'invoiceTotalFee',value:invoiceTotalFee},//
421 424 {keyname:'invoiceState',value:'1'},
422   -
  425 +
423 426 //{keyname:'custName',value:token},//购买方名称
424 427 {keyname:'invoiceType',value:invoiceType},
425 428 {keyname:'applyDate',value:applyDate},
... ... @@ -427,10 +430,10 @@
427 430 {keyname:'recipients',value:recipients},//收件人
428 431 {keyname:'recipientsAddress',value:recipientsAddress},//收件地址
429 432 {keyname:'fetchTicketWay',value:fetchTicketWay},
430   - {keyname:'terminalSource',value:func.terminalSource}
431   -
  433 + {keyname:'terminalSource',value:func.terminalSource},
  434 + {keyname:'orgId',value:orgIdval}
432 435 ];
433   -
  436 +
434 437 var jsond = {
435 438 app_id:'0eca8f5373ca4866aec2f8e9d9367104',
436 439 deviceInfo:deviceInfo,
... ... @@ -447,7 +450,8 @@
447 450 //orderActFee:orderActFee,
448 451 invoiceTotalFee:invoiceTotalFee,
449 452 fetchTicketWay:fetchTicketWay,
450   - terminalSource:func.terminalSource
  453 + terminalSource:func.terminalSource,
  454 + orgId:orgIdval
451 455 };
452 456 if(ticketContent&&ticketContent!=''){
453 457 var ticketContents = {keyname:'ticketContent',value:ticketContent};
... ... @@ -472,6 +476,8 @@
472 476 jsond.sign = mdsign;
473 477 console.log('数据1 '+JSON.stringify(sortd));
474 478 console.log('数据 '+JSON.stringify(jsond));
  479 +
  480 + console.log(jsond.orgId)
475 481 jsajax.defaultReq(
476 482 mUrl.kaipaioHistory,
477 483 JSON.stringify(jsond),
... ... @@ -479,7 +485,7 @@
479 485 console.log('返回 '+JSON.stringify(data));
480 486 if(data.code=='0'){
481 487 layer.close(func.index);
482   -
  488 +
483 489 setTimeout(function(){
484 490 layer.msg('数据提交成功', {
485 491 icon: 1,
... ... @@ -489,7 +495,7 @@
489 495 window.location.href = document.referrer;
490 496 });
491 497 })
492   -
  498 +
493 499 //window.history.go(-1);
494 500 }else{
495 501 alert(data.message);
... ... @@ -497,25 +503,25 @@
497 503 }
498 504 )
499 505 }
500   -
501   -
502   -
503   -
  506 +
  507 +
  508 +
  509 +
504 510 /*
505   - * 首先获取缓存中是否有数据
  511 + * 首先获取缓存中是否有数据
506 512 * 缓存抬头数据 selectTtResults
507 513 * 缓存地址数据 selectAdressresults
508 514 * 若有则将数据填充进去,若没有则进行选择
509   - *
  515 + *
510 516 * 点击单位时显示单位抬头的信息
511 517 * 点击个人时判断是余额还是会员或临停若为余额的话则个人中心显示的手机号若不是则显示的车牌号
512   - *
513   - *
  518 + *
  519 + *
514 520 1.先获取默认的详情地址若没有的话则进入选择页面进行选择 selecttaitou.html
515 521 2.若没有默认抬头则点击进入选择默认抬头页面 selectaddress.html
516   -
  522 +
517 523 * */
518   -
  524 +
519 525 //获取缓存中的数据
520 526 function gethuancun(){
521 527 //获取上个页面值
... ... @@ -551,12 +557,12 @@
551 557 }else{
552 558 getAddress();
553 559 }
554   -
  560 +
555 561 }else{
556 562 getAddress();
557 563 }
558 564 });
559   -
  565 +
560 566 }else{
561 567 getAddress();
562 568 }
... ... @@ -579,12 +585,12 @@
579 585 }else{
580 586 getUplist();
581 587 }
582   -
  588 +
583 589 }else{
584 590 getUplist();
585 591 }
586 592 });
587   -
  593 +
588 594 /*setTimeout(function(){
589 595 sessionStorage.setItem('selectTtResults','');
590 596 console.log("获取缓存信息 "+sessionStorage.getItem('selectTtResults'));
... ... @@ -592,7 +598,7 @@
592 598 }else{
593 599 getUplist();
594 600 }
595   -
  601 +
596 602 //获取类型为个人时的信息
597 603 console.log(sessionStorage.getItem('Vipcars'));
598 604 var tjdatas = sessionStorage.getItem('tjfaBFdatas');
... ... @@ -611,7 +617,7 @@
611 617 if(Vipcars.length<3){
612 618 len = Vipcars.length;
613 619 }
614   -
  620 +
615 621 for(var i=0;i<len;i++){
616 622 cars += Vipcars[i]+" ";
617 623 }
... ... @@ -634,7 +640,7 @@
634 640 if(Vipcars.length<3){
635 641 len = Vipcars.length;
636 642 }
637   -
  643 +
638 644 for(var i=0;i<len;i++){
639 645 cars += Vipcars[i]+" ";
640 646 }
... ... @@ -648,10 +654,10 @@
648 654 var phone = mUrl.GetPhone();
649 655 $('.checkResults .geren').text('手机号:'+phone);
650 656 }*/
651   -
652   -
  657 +
  658 +
653 659 }
654   -
  660 +
655 661 //获取默认地址
656 662 function getAddress(){
657 663 var salt = jsajax.salt(32);
... ... @@ -692,7 +698,7 @@
692 698 var phone = datas[i].phone;
693 699 var recipient = datas[i].recipient;
694 700 var id = datas[i].id;
695   -
  701 +
696 702 if(isDefault==1){
697 703 var sphone = phone;
698 704 $('.shAr1').attr('data-id',id);
... ... @@ -721,7 +727,7 @@
721 727 );
722 728  
723 729 }
724   -
  730 +
725 731 //获取默认的发票抬头
726 732 function getUplist(){
727 733 var salt = jsajax.salt(32);
... ... @@ -783,7 +789,7 @@
783 789 );
784 790  
785 791 }
786   -
  792 +
787 793 //根据id查询是否有该抬头
788 794 function getinfobyid(id,fn){
789 795 var salt = jsajax.salt(32);
... ... @@ -816,7 +822,7 @@
816 822 }
817 823 );
818 824 }
819   -
  825 +
820 826 //根据id查询是否有该地址
821 827 //根据id获取收货地址详情
822 828 function getAddressby(id,fn){
... ... @@ -831,7 +837,7 @@
831 837 {keyname:'token',value:token},
832 838 {keyname:'id',value:id},
833 839 ];
834   -
  840 +
835 841 var mdsign = jsajax.getsign(sortd);
836 842 var jsond = {
837 843 app_id:'0eca8f5373ca4866aec2f8e9d9367104',
... ... @@ -851,4 +857,4 @@
851 857 }
852 858 );
853 859 }
854   -</script>
855 860 \ No newline at end of file
  861 +</script>
... ...