anyv / xkeasy · 提交

转到一个项目

作者 刘朕
提交 423bec18c6376a9bfb7d5190d6bda2597f51651d 2 个父辈 14aab771 50f20f44
1 个管道 的构建 通过 耗费 24 秒

合并分支 'liuzhen' 到 'master' 

Liuzhen



查看合并请求 !168
内嵌 并排对比
正在显示 2 个修改的文件 包含 86 行增加 和 16 行删除
@@ -472,6 +472,41 @@ @@ -472,6 +472,41 @@
472 </div> 472 </div>
473 </div> 473 </div>
474 </div> 474 </div>
  475 + <div class=" log_four_contant_ones">
  476 + <div class="log_botms">
  477 + <div class="log_four_contants_left">
  478 + <img class="log_Img9" src="__TMPL__/public/assets/images/39_0.png" alt="" />
  479 + </div>
  480 + <div class="log_four_contants_right">
  481 + 初四
  482 + </div>
  483 + </div>
  484 + <div class="log_four_contants_input_block">
  485 + <div class="log_four_contants_input ">
  486 + <div class="log_four_ooo">
  487 + <div class="log_four_xian_ban">
  488 + <div class="log_four_xian_nei"><input type="number" data-index='9' placeholder="起始班级" name="" id="" value="" /></div>
  489 + <div class="log_four_xian_icon">
  490 + <img src="__TMPL__/public/assets/images/down.png" alt="" />
  491 + </div>
  492 + </div>
  493 + <div class="danwei_class">班</div>
  494 + </div>
  495 + <div class="log_four_xian_wife">~</div>
  496 + <div class="log_four_ooo">
  497 + <div class="log_four_xian_ban2">
  498 + <div class="log_four_xian_nei">
  499 + <input type="number" placeholder="结束班级" data-index='9' />
  500 + </div>
  501 + <div class="log_four_xian_icon">
  502 + <img src="__TMPL__/public/assets/images/down.png" alt="" />
  503 + </div>
  504 + </div>
  505 + <div class="danwei_class">班</div>
  506 + </div>
  507 + </div>
  508 + </div>
  509 + </div>
475 510
476 </div> 511 </div>
477 </div> 512 </div>
@@ -488,7 +523,7 @@ @@ -488,7 +523,7 @@
488 <div class="log_four_contants_input "> 523 <div class="log_four_contants_input ">
489 <div class="log_four_ooo"> 524 <div class="log_four_ooo">
490 <div class="log_four_xian_ban"> 525 <div class="log_four_xian_ban">
491 - <div class="log_four_xian_nei"><input type="number" data-index='9' placeholder="起始班级" name="" id="" value="" /></div> 526 + <div class="log_four_xian_nei"><input type="number" data-index='10' placeholder="起始班级" name="" id="" value="" /></div>
492 <div class="log_four_xian_icon"> 527 <div class="log_four_xian_icon">
493 <img src="__TMPL__/public/assets/images/down.png" alt="" /> 528 <img src="__TMPL__/public/assets/images/down.png" alt="" />
494 </div> 529 </div>
@@ -499,7 +534,7 @@ @@ -499,7 +534,7 @@
499 <div class="log_four_ooo"> 534 <div class="log_four_ooo">
500 <div class="log_four_xian_ban2"> 535 <div class="log_four_xian_ban2">
501 <div class="log_four_xian_nei"> 536 <div class="log_four_xian_nei">
502 - <input type="number" placeholder="结束班级" data-index='9' /> 537 + <input type="number" placeholder="结束班级" data-index='10' />
503 </div> 538 </div>
504 <div class="log_four_xian_icon"> 539 <div class="log_four_xian_icon">
505 <img src="__TMPL__/public/assets/images/down.png" alt="" /> 540 <img src="__TMPL__/public/assets/images/down.png" alt="" />
@@ -523,7 +558,7 @@ @@ -523,7 +558,7 @@
523 <div class="log_four_contants_input "> 558 <div class="log_four_contants_input ">
524 <div class="log_four_ooo"> 559 <div class="log_four_ooo">
525 <div class="log_four_xian_ban"> 560 <div class="log_four_xian_ban">
526 - <div class="log_four_xian_nei"><input type="number" placeholder="起始班级" name="" id="" value="" data-index='10' /></div> 561 + <div class="log_four_xian_nei"><input type="number" placeholder="起始班级" name="" id="" value="" data-index='11' /></div>
527 <div class="log_four_xian_icon"> 562 <div class="log_four_xian_icon">
528 <img src="__TMPL__/public/assets/images/down.png" alt="" /> 563 <img src="__TMPL__/public/assets/images/down.png" alt="" />
529 </div> 564 </div>
@@ -534,7 +569,7 @@ @@ -534,7 +569,7 @@
534 <div class="log_four_ooo"> 569 <div class="log_four_ooo">
535 <div class="log_four_xian_ban2"> 570 <div class="log_four_xian_ban2">
536 <div class="log_four_xian_nei"> 571 <div class="log_four_xian_nei">
537 - <input type="number" placeholder="结束班级" data-index='10' /> 572 + <input type="number" placeholder="结束班级" data-index='11' />
538 </div> 573 </div>
539 <div class="log_four_xian_icon"> 574 <div class="log_four_xian_icon">
540 <img src="__TMPL__/public/assets/images/down.png" alt="" /> 575 <img src="__TMPL__/public/assets/images/down.png" alt="" />
@@ -558,7 +593,7 @@ @@ -558,7 +593,7 @@
558 <div class="log_four_contants_input "> 593 <div class="log_four_contants_input ">
559 <div class="log_four_ooo"> 594 <div class="log_four_ooo">
560 <div class="log_four_xian_ban"> 595 <div class="log_four_xian_ban">
561 - <div class="log_four_xian_nei"><input type="number" placeholder="起始班级" name="" id="" value="" data-index='11' /></div> 596 + <div class="log_four_xian_nei"><input type="number" placeholder="起始班级" name="" id="" value="" data-index='12' /></div>
562 <div class="log_four_xian_icon"> 597 <div class="log_four_xian_icon">
563 <img src="__TMPL__/public/assets/images/down.png" alt="" /> 598 <img src="__TMPL__/public/assets/images/down.png" alt="" />
564 </div> 599 </div>
@@ -569,7 +604,7 @@ @@ -569,7 +604,7 @@
569 <div class="log_four_ooo"> 604 <div class="log_four_ooo">
570 <div class="log_four_xian_ban2"> 605 <div class="log_four_xian_ban2">
571 <div class="log_four_xian_nei"> 606 <div class="log_four_xian_nei">
572 - <input type="number" placeholder="结束班级" data-index='11' /> 607 + <input type="number" placeholder="结束班级" data-index='12' />
573 </div> 608 </div>
574 <div class="log_four_xian_icon"> 609 <div class="log_four_xian_icon">
575 <img src="__TMPL__/public/assets/images/down.png" alt="" /> 610 <img src="__TMPL__/public/assets/images/down.png" alt="" />
@@ -704,7 +739,7 @@ @@ -704,7 +739,7 @@
704 var inputs = $(this).parents('.log_four_contants_input_block').find('input'); 739 var inputs = $(this).parents('.log_four_contants_input_block').find('input');
705 // var img = $(this).parents(".log_four_contant_ones").find(".log_four_contants_left").find("img"); 740 // var img = $(this).parents(".log_four_contant_ones").find(".log_four_contants_left").find("img");
706 var tempData = ''; 741 var tempData = '';
707 - var classes = index == 0 ? '一年级' : index == 1 ? '二年级' : index == 2 ? '三年级' : index == 3 ? '四年级' : index == 4 ? '五年级' : index == 5 ? '六年级' : index == 6 ? '初一' : index == 7 ? '初二' : index == 8 ? '初三' : index == 9 ? '高一' : index == 10 ? '高二' : index == 11 ? '高三' : ''; 742 + var classes = index == 0 ? '一年级' : index == 1 ? '二年级' : index == 2 ? '三年级' : index == 3 ? '四年级' : index == 4 ? '五年级' : index == 5 ? '六年级' : index == 6 ? '初一' : index == 7 ? '初二' : index == 8 ? '初三' : index == 9 ? '初四' : index == 10 ? '高一' : index == 11 ? '高二' : index == 12 ? '高三' : '';
708 if($(this).parents(".log_four_contant_ones").find(".log_four_contants_left").find("img").attr("src") == "__TMPL__/public/assets/images/73.png") { 743 if($(this).parents(".log_four_contant_ones").find(".log_four_contants_left").find("img").attr("src") == "__TMPL__/public/assets/images/73.png") {
709 if(inputs[0].value && inputs[1].value) { 744 if(inputs[0].value && inputs[1].value) {
710 tempData = classes + '-' + inputs[0].value + '-' + inputs[1].value 745 tempData = classes + '-' + inputs[0].value + '-' + inputs[1].value
@@ -730,7 +765,7 @@ @@ -730,7 +765,7 @@
730 var inputs = $(this).siblings('.log_four_contants_input_block').find('input'); 765 var inputs = $(this).siblings('.log_four_contants_input_block').find('input');
731 // var img = $(this).parents(".log_four_contant_ones").find(".log_four_contants_left").find("img"); 766 // var img = $(this).parents(".log_four_contant_ones").find(".log_four_contants_left").find("img");
732 var tempData = ''; 767 var tempData = '';
733 - var classes = index == 0 ? '一年级' : index == 1 ? '二年级' : index == 2 ? '三年级' : index == 3 ? '四年级' : index == 4 ? '五年级' : index == 5 ? '六年级' : index == 6 ? '初一' : index == 7 ? '初二' : index == 8 ? '初三' : index == 9 ? '高一' : index == 10 ? '高二' : index == 11 ? '高三' : ''; 768 + var classes = index == 0 ? '一年级' : index == 1 ? '二年级' : index == 2 ? '三年级' : index == 3 ? '四年级' : index == 4 ? '五年级' : index == 5 ? '六年级' : index == 6 ? '初一' : index == 7 ? '初二' : index == 8 ? '初三' : index == 9 ? '初四' : index == 10 ? '高一' : index == 11 ? '高二' : index == 12 ? '高三' : '';
734 if($(this).parents(".log_four_contant_ones").find(".log_four_contants_left").find("img").attr("src") == "__TMPL__/public/assets/images/73.png") { 769 if($(this).parents(".log_four_contant_ones").find(".log_four_contants_left").find("img").attr("src") == "__TMPL__/public/assets/images/73.png") {
735 if(inputs.length == 0) { 770 if(inputs.length == 0) {
736 var name = $(this).find('.xuelingqian').data('name'); 771 var name = $(this).find('.xuelingqian').data('name');
@@ -490,6 +490,41 @@ @@ -490,6 +490,41 @@
490 </div> 490 </div>
491 </div> 491 </div>
492 </div> 492 </div>
  493 + <div class=" log_four_contant_ones">
  494 + <div class="log_botms">
  495 + <div class="log_four_contants_left">
  496 + <img class="log_Img9" src="__TMPL__/public/assets/images/39_0.png" alt="" />
  497 + </div>
  498 + <div class="log_four_contants_right">
  499 + 初四
  500 + </div>
  501 + </div>
  502 + <div class="log_four_contants_input_block">
  503 + <div class="log_four_contants_input ">
  504 + <div class="log_four_ooo">
  505 + <div class="log_four_xian_ban">
  506 + <div class="log_four_xian_nei"><input type="number" data-index='9' placeholder="起始班级" name="" id="" value="" /></div>
  507 + <div class="log_four_xian_icon">
  508 + <img src="__TMPL__/public/assets/images/down.png" alt="" />
  509 + </div>
  510 + </div>
  511 + <div class="danwei_class">班</div>
  512 + </div>
  513 + <div class="log_four_xian_wife">——</div>
  514 + <div class="log_four_ooo">
  515 + <div class="log_four_xian_ban2">
  516 + <div class="log_four_xian_nei">
  517 + <input type="number" placeholder=" 结束班级" data-index='9' />
  518 + </div>
  519 + <div class="log_four_xian_icon">
  520 + <img src="__TMPL__/public/assets/images/down.png" alt="" />
  521 + </div>
  522 + </div>
  523 + <div class="danwei_class">班</div>
  524 + </div>
  525 + </div>
  526 + </div>
  527 + </div>
493 528
494 </div> 529 </div>
495 </div> 530 </div>
@@ -506,7 +541,7 @@ @@ -506,7 +541,7 @@
506 <div class="log_four_contants_input "> 541 <div class="log_four_contants_input ">
507 <div class="log_four_ooo"> 542 <div class="log_four_ooo">
508 <div class="log_four_xian_ban"> 543 <div class="log_four_xian_ban">
509 - <div class="log_four_xian_nei"><input type="number" data-index='9' placeholder="起始班级" name="" id="" value="" /></div> 544 + <div class="log_four_xian_nei"><input type="number" data-index='10' placeholder="起始班级" name="" id="" value="" /></div>
510 <div class="log_four_xian_icon"> 545 <div class="log_four_xian_icon">
511 <img src="__TMPL__/public/assets/images/down.png" alt="" /> 546 <img src="__TMPL__/public/assets/images/down.png" alt="" />
512 </div> 547 </div>
@@ -517,7 +552,7 @@ @@ -517,7 +552,7 @@
517 <div class="log_four_ooo"> 552 <div class="log_four_ooo">
518 <div class="log_four_xian_ban2"> 553 <div class="log_four_xian_ban2">
519 <div class="log_four_xian_nei"> 554 <div class="log_four_xian_nei">
520 - <input type="number" placeholder=" 结束班级" data-index='9' /> 555 + <input type="number" placeholder=" 结束班级" data-index='10' />
521 </div> 556 </div>
522 <div class="log_four_xian_icon"> 557 <div class="log_four_xian_icon">
523 <img src="__TMPL__/public/assets/images/down.png" alt="" /> 558 <img src="__TMPL__/public/assets/images/down.png" alt="" />
@@ -541,7 +576,7 @@ @@ -541,7 +576,7 @@
541 <div class="log_four_contants_input "> 576 <div class="log_four_contants_input ">
542 <div class="log_four_ooo"> 577 <div class="log_four_ooo">
543 <div class="log_four_xian_ban"> 578 <div class="log_four_xian_ban">
544 - <div class="log_four_xian_nei"><input type="number" placeholder="起始班级" name="" id="" value="" data-index='10' /></div> 579 + <div class="log_four_xian_nei"><input type="number" placeholder="起始班级" name="" id="" value="" data-index='11' /></div>
545 <div class="log_four_xian_icon"> 580 <div class="log_four_xian_icon">
546 <img src="__TMPL__/public/assets/images/down.png" alt="" /> 581 <img src="__TMPL__/public/assets/images/down.png" alt="" />
547 </div> 582 </div>
@@ -552,7 +587,7 @@ @@ -552,7 +587,7 @@
552 <div class="log_four_ooo"> 587 <div class="log_four_ooo">
553 <div class="log_four_xian_ban2"> 588 <div class="log_four_xian_ban2">
554 <div class="log_four_xian_nei"> 589 <div class="log_four_xian_nei">
555 - <input type="number" placeholder=" 结束班级" data-index='10' /> 590 + <input type="number" placeholder=" 结束班级" data-index='11' />
556 </div> 591 </div>
557 <div class="log_four_xian_icon"> 592 <div class="log_four_xian_icon">
558 <img src="__TMPL__/public/assets/images/down.png" alt="" /> 593 <img src="__TMPL__/public/assets/images/down.png" alt="" />
@@ -576,7 +611,7 @@ @@ -576,7 +611,7 @@
576 <div class="log_four_contants_input "> 611 <div class="log_four_contants_input ">
577 <div class="log_four_ooo"> 612 <div class="log_four_ooo">
578 <div class="log_four_xian_ban"> 613 <div class="log_four_xian_ban">
579 - <div class="log_four_xian_nei"><input type="number" placeholder="起始班级" name="" id="" value="" data-index='11' /></div> 614 + <div class="log_four_xian_nei"><input type="number" placeholder="起始班级" name="" id="" value="" data-index='12' /></div>
580 <div class="log_four_xian_icon"> 615 <div class="log_four_xian_icon">
581 <img src="__TMPL__/public/assets/images/down.png" alt="" /> 616 <img src="__TMPL__/public/assets/images/down.png" alt="" />
582 </div> 617 </div>
@@ -587,7 +622,7 @@ @@ -587,7 +622,7 @@
587 <div class="log_four_ooo"> 622 <div class="log_four_ooo">
588 <div class="log_four_xian_ban2"> 623 <div class="log_four_xian_ban2">
589 <div class="log_four_xian_nei"> 624 <div class="log_four_xian_nei">
590 - <input type="number" placeholder=" 结束班级" data-index='11' /> 625 + <input type="number" placeholder=" 结束班级" data-index='12' />
591 </div> 626 </div>
592 <div class="log_four_xian_icon"> 627 <div class="log_four_xian_icon">
593 <img src="__TMPL__/public/assets/images/down.png" alt="" /> 628 <img src="__TMPL__/public/assets/images/down.png" alt="" />
@@ -716,7 +751,7 @@ @@ -716,7 +751,7 @@
716 var inputs = $(this).parents('.log_four_contants_input_block').find('input'); 751 var inputs = $(this).parents('.log_four_contants_input_block').find('input');
717 // var img = $(this).parents(".log_four_contant_ones").find(".log_four_contants_left").find("img"); 752 // var img = $(this).parents(".log_four_contant_ones").find(".log_four_contants_left").find("img");
718 var tempData = ''; 753 var tempData = '';
719 - var classes = index == 0 ? '一年级' : index == 1 ? '二年级' : index == 2 ? '三年级' : index == 3 ? '四年级' : index == 4 ? '五年级' : index == 5 ? '六年级' : index == 6 ? '初一' : index == 7 ? '初二' : index == 8 ? '初三' : index == 9 ? '高一' : index == 10 ? '高二' : index == 11 ? '高三' : ''; 754 + var classes = index == 0 ? '一年级' : index == 1 ? '二年级' : index == 2 ? '三年级' : index == 3 ? '四年级' : index == 4 ? '五年级' : index == 5 ? '六年级' : index == 6 ? '初一' : index == 7 ? '初二' : index == 8 ? '初三' : index == 9 ? '初四' : index == 10 ? '高一' : index == 11 ? '高二' : index == 12 ? '高三' : '';
720 if($(this).parents(".log_four_contant_ones").find(".log_four_contants_left").find("img").attr("src") == "__TMPL__/public/assets/images/73.png") { 755 if($(this).parents(".log_four_contant_ones").find(".log_four_contants_left").find("img").attr("src") == "__TMPL__/public/assets/images/73.png") {
721 if(inputs[0].value && inputs[1].value) { 756 if(inputs[0].value && inputs[1].value) {
722 tempData = classes + '-' + inputs[0].value + '-' + inputs[1].value 757 tempData = classes + '-' + inputs[0].value + '-' + inputs[1].value
@@ -739,7 +774,7 @@ @@ -739,7 +774,7 @@
739 var inputs = $(this).siblings('.log_four_contants_input_block').find('input'); 774 var inputs = $(this).siblings('.log_four_contants_input_block').find('input');
740 // var img = $(this).parents(".log_four_contant_ones").find(".log_four_contants_left").find("img"); 775 // var img = $(this).parents(".log_four_contant_ones").find(".log_four_contants_left").find("img");
741 var tempData = ''; 776 var tempData = '';
742 - var classes = index == 0 ? '一年级' : index == 1 ? '二年级' : index == 2 ? '三年级' : index == 3 ? '四年级' : index == 4 ? '五年级' : index == 5 ? '六年级' : index == 6 ? '初一' : index == 7 ? '初二' : index == 8 ? '初三' : index == 9 ? '高一' : index == 10 ? '高二' : index == 11 ? '高三' : ''; 777 + var classes = index == 0 ? '一年级' : index == 1 ? '二年级' : index == 2 ? '三年级' : index == 3 ? '四年级' : index == 4 ? '五年级' : index == 5 ? '六年级' : index == 6 ? '初一' : index == 7 ? '初二' : index == 8 ? '初三' : index == 9 ? '初四' : index == 10 ? '高一' : index == 11 ? '高二' : index == 12 ? '高三' : '';
743 if($(this).parents(".log_four_contant_ones").find(".log_four_contants_left").find("img").attr("src") == "__TMPL__/public/assets/images/73.png") { 778 if($(this).parents(".log_four_contant_ones").find(".log_four_contants_left").find("img").attr("src") == "__TMPL__/public/assets/images/73.png") {
744 if(inputs.length == 0) { 779 if(inputs.length == 0) {
745 var name = $(this).find('.xuelingqian').data('name'); 780 var name = $(this).find('.xuelingqian').data('name');