anyv / xkeasy · 提交

转到一个项目

作者 anyv
提交 81e47a908e2450ded6d7d33426d9b2b26fab0fb9 1 个父辈 d854a6c6
1 个管道 的构建 通过 耗费 5 秒

14

内嵌 并排对比
正在显示 4 个修改的文件 包含 356 行增加 和 111 行删除
@@ -612,6 +612,7 @@ class PersonalcenterController extends WeChatBaseController{ @@ -612,6 +612,7 @@ class PersonalcenterController extends WeChatBaseController{
612 $where['a.grade'] = $school_grade_class[1]; 612 $where['a.grade'] = $school_grade_class[1];
613 $where['a.class'] = $school_grade_class[3]; 613 $where['a.class'] = $school_grade_class[3];
614 } 614 }
  615 +
615 if($res['start_time'] != '' && $res['end_time'] != ''){ 616 if($res['start_time'] != '' && $res['end_time'] != ''){
616 $start_time = strtotime($res['start_time']); 617 $start_time = strtotime($res['start_time']);
617 $end_time = strtotime($res['end_time']); 618 $end_time = strtotime($res['end_time']);
@@ -34,10 +34,86 @@ @@ -34,10 +34,86 @@
34 font-weight: 400; 34 font-weight: 400;
35 color: rgba(255, 255, 255, 1); 35 color: rgba(255, 255, 255, 1);
36 } 36 }
  37 +
  38 + .tx_mask_class {
  39 + display: none;
  40 + z-index: 3;
  41 + width: 100%;
  42 + height: 100%;
  43 + position: fixed;
  44 + background-color: rgba(0, 0, 0, 0.5);
  45 + }
  46 +
  47 + .tx_maskCon_class {
  48 + width: 100%;
  49 + height: 5.16rem;
  50 + background: #fff;
  51 + position: fixed;
  52 + bottom: 0;
  53 + }
  54 +
  55 + .three_model_class_name {
  56 + height: 0.36rem;
  57 + margin: 0.08rem;
  58 + font-size: 0.24rem;
  59 + font-weight: 400;
  60 + color: #666666;
  61 + opacity: 1;
  62 + padding: 0.2rem 0;
  63 + line-height: 0;
  64 + border-left: none;
  65 + border-right: none
  66 + }
  67 + .get_Go{
  68 + height: 0.36rem;
  69 + margin: 0.08rem;
  70 + font-size: 0.24rem;
  71 + font-weight: 400;
  72 + cursor: pointer;
  73 + color: #666666;
  74 + opacity: 1;
  75 + padding: 0.2rem 0;
  76 + line-height: 0;
  77 + border-left: none;
  78 + border-right: none;
  79 + }
37 </style> 80 </style>
38 </head> 81 </head>
39 82
40 <body style="cursor:pointer;"> 83 <body style="cursor:pointer;">
  84 +
  85 +
  86 +<!--学校弹窗-->
  87 +<div class="tx_mask_school" onclick="$(this).hide()">
  88 + <div class="tx_maskCon_school" onclick="zZFun(this)">
  89 + <div class="three_model_school">
  90 + <div class="three_model_school_title">
  91 + 选择学校
  92 + </div>
  93 + <div class="three_model_school_data there_university" style="display: block;">
  94 + <foreach name="$school" item="s">
  95 + <div class="three_model_school_name <if condition='$key eq 0'>there_unActive</if> school"
  96 + data-id="{$s.id}" style="cursor: pointer;">{$s.school}
  97 + </div>
  98 + </foreach>
  99 + </div>
  100 + </div>
  101 + </div>
  102 +</div>
  103 +<!--班级弹窗-->
  104 +<div class="tx_mask_class" onclick="$(this).hide()">
  105 + <div class="tx_maskCon_class" onclick="zZFun(this)">
  106 + <div class="three_model_school">
  107 + <div class="three_model_school_title">
  108 + 选择班级
  109 + </div>
  110 + <div class="three_model_school_data there_university grade" style="display: block;">
  111 + </div>
  112 + </div>
  113 + </div>
  114 +</div>
  115 +
  116 +<!--
41 <div class="tx_mask_school"> 117 <div class="tx_mask_school">
42 <div class="tx_maskCon_school"> 118 <div class="tx_maskCon_school">
43 <div class="three_model_school"> 119 <div class="three_model_school">
@@ -66,14 +142,14 @@ @@ -66,14 +142,14 @@
66 </div> 142 </div>
67 </div> 143 </div>
68 </div> 144 </div>
69 -</div> 145 +</div>-->
70 <!--统一配送--> 146 <!--统一配送-->
71 <div class="tx_mask_tongyi" onclick="$(this).hide()"> 147 <div class="tx_mask_tongyi" onclick="$(this).hide()">
72 <div class="tx_maskCon_tongyi" onclick="zZFun(this)"> 148 <div class="tx_maskCon_tongyi" onclick="zZFun(this)">
73 <div class="three_model_school"> 149 <div class="three_model_school">
74 <div class="three_model_school_data" style="display: block;"> 150 <div class="three_model_school_data" style="display: block;">
75 - <div class="three_model_school_name there_unActive" data-id="1">统一配送</div>  
76 - <div class="three_model_school_name" data-id="2">快递配送</div> 151 + <div class="three_modal_kuaidi_name there_unActive" data-id="1">统一配送</div>
  152 + <div class="three_modal_kuaidi_name" data-id="2">快递配送</div>
77 </div> 153 </div>
78 </div> 154 </div>
79 </div> 155 </div>
@@ -87,18 +163,18 @@ @@ -87,18 +163,18 @@
87 </div> 163 </div>
88 <div> 164 <div>
89 <div class="three_model_school_data" style="display: block;"> 165 <div class="three_model_school_data" style="display: block;">
90 - <div class="three_model_school_name" data-name="SF">顺丰快递</div>  
91 - <div class="three_model_school_name" data-name="YTO">圆通快递</div>  
92 - <div class="three_model_school_name" data-name="ZTO">中通快递</div>  
93 - <div class="three_model_school_name there_unActive" data-name="STO">申通快递</div>  
94 - <div class="three_model_school_name" data-name="YD">韵达快递</div>  
95 - <div class="three_model_school_name" data-name="HHTT">天天快递</div>  
96 - <div class="three_model_school_name" data-name="HTKY">百世快递</div>  
97 - <div class="three_model_school_name" data-name="YZPY">邮政快递包裹</div>  
98 - <div class="three_model_school_name" data-name="EMS">EMS</div>  
99 - <div class="three_model_school_name" data-name="DBL">德邦快递</div>  
100 - <div class="three_model_school_name" data-name="ZJS">宅急送</div>  
101 - <div class="three_model_school_name" data-name="TNT">TNT快递</div> 166 + <div class="get_Go" data-name="SF">顺丰快递</div>
  167 + <div class="get_Go" data-name="YTO">圆通快递</div>
  168 + <div class="get_Go" data-name="ZTO">中通快递</div>
  169 + <div class="get_Go there_unActive" data-name="STO">申通快递</div>
  170 + <div class="get_Go" data-name="YD">韵达快递</div>
  171 + <div class="get_Go" data-name="HHTT">天天快递</div>
  172 + <div class="get_Go" data-name="HTKY">百世快递</div>
  173 + <div class="get_Go" data-name="YZPY">邮政快递包裹</div>
  174 + <div class="get_Go" data-name="EMS">EMS</div>
  175 + <div class="get_Go" data-name="DBL">德邦快递</div>
  176 + <div class="get_Go" data-name="ZJS">宅急送</div>
  177 + <div class="get_Go" data-name="TNT">TNT快递</div>
102 </div> 178 </div>
103 </div> 179 </div>
104 </div> 180 </div>
@@ -157,7 +233,7 @@ @@ -157,7 +233,7 @@
157 <div class="log_three_model_one logistic"> 233 <div class="log_three_model_one logistic">
158 <div class="log_three_model_left">选择快递</div> 234 <div class="log_three_model_left">选择快递</div>
159 <div class="log_psong log_psong_select"> 235 <div class="log_psong log_psong_select">
160 - <div class="log_ps_title">请选择快递公司</div> 236 + <div class="log_ps_title2 get_Gofo">请选择快递公司</div>
161 <div class="log_ps_img"> 237 <div class="log_ps_img">
162 <img src="__TMPL__/public/assets/images/29.png"/> 238 <img src="__TMPL__/public/assets/images/29.png"/>
163 <input type="hidden" id="logistic_name" placeholder="请选择快递公司"/> 239 <input type="hidden" id="logistic_name" placeholder="请选择快递公司"/>
@@ -193,21 +269,41 @@ @@ -193,21 +269,41 @@
193 </div> 269 </div>
194 <!-- 下拉框 --> 270 <!-- 下拉框 -->
195 <div class="log_three_select"> 271 <div class="log_three_select">
196 - <div class="log_three_select_one log_three_select_school" style="cursor: pointer"> 272 + <!-- <div class="log_three_select_one log_three_select_school" style="cursor: pointer">
197 <div class="log_three_select_title log_three_select_school2"> 273 <div class="log_three_select_title log_three_select_school2">
198 请选择学校/班级 274 请选择学校/班级
199 </div> 275 </div>
200 <div class="log_three_select_img"> 276 <div class="log_three_select_img">
201 <img src="__TMPL__/public/assets/images/75.png" alt=""/> 277 <img src="__TMPL__/public/assets/images/75.png" alt=""/>
202 </div> 278 </div>
  279 + </div>-->
  280 +
  281 +
  282 + <div class="log_three_select_one log_three_select_school">
  283 + <div class="log_three_select_title log_three_select_school2">
  284 + 请选择学校
  285 + </div>
  286 + <!--<div class="log_three_select_img">-->
  287 + <!--<img src="__TMPL__/public/assets/images/75.png" alt="" />-->
  288 + <!--</div>-->
  289 + </div>
  290 + <div class="log_three_select_one log_three_select_school">
  291 + <div class="log_three_select_title log_three_select_class2">
  292 + 请选择班级
  293 + </div>
  294 + <!--<div class="log_three_select_img">-->
  295 + <!--<img src="__TMPL__/public/assets/images/75.png" alt="" />-->
  296 + <!--</div>-->
203 </div> 297 </div>
  298 +
  299 +
204 <div class="log_three_select_one log_three_select_peisong log_three_select_tongyi" style="cursor: pointer"> 300 <div class="log_three_select_one log_three_select_peisong log_three_select_tongyi" style="cursor: pointer">
205 <div class="log_three_select_title log_three_select_contant"> 301 <div class="log_three_select_title log_three_select_contant">
206 统一配送 302 统一配送
207 </div> 303 </div>
208 - <div class="log_three_select_img">  
209 - <img src="__TMPL__/public/assets/images/75.png" alt=""/>  
210 - </div> 304 + <!--<div class="log_three_select_img">-->
  305 + <!--<img src="__TMPL__/public/assets/images/75.png" alt=""/>-->
  306 + <!--</div>-->
211 </div> 307 </div>
212 <div class="log_three_select_one log_three_select_btn search"> 308 <div class="log_three_select_one log_three_select_btn search">
213 搜索 309 搜索
@@ -480,14 +576,44 @@ @@ -480,14 +576,44 @@
480 <script src="__TMPL__/public/assets/js/mui.picker.min.js"></script> 576 <script src="__TMPL__/public/assets/js/mui.picker.min.js"></script>
481 <script src="__TMPL__/public/assets/js/city.data-3.js"></script> 577 <script src="__TMPL__/public/assets/js/city.data-3.js"></script>
482 <script> 578 <script>
  579 + //选择学校
  580 + $(".log_three_select_school2").click(function() {
  581 + $(".tx_mask_school").css("display", "block")
  582 + });
  583 + $(".three_model_school_name").click(function() {
  584 + var str = $(this).text();
  585 + $('#school').val(str);
  586 + console.log(str);
  587 + $(this).addClass("there_unActive").siblings().removeClass("there_unActive");
  588 + $(".log_three_select_school2").text(str);
  589 + $(".tx_mask_school").css("display", "none")
  590 + });
  591 + //选择班级
  592 + $(".log_three_select_class2").click(function() {
  593 + $(".tx_mask_class").css("display", "block")
  594 + });
  595 + $("body .grade").on('click', '.three_model_class_name', function () {
  596 + var str = $(this).text();
  597 + console.log(str);
  598 + $('#grade').val(str)
  599 + $(this).addClass("there_unActive").siblings().removeClass("there_unActive");
  600 + $(".log_three_select_class2").text(str);
  601 + $(".tx_mask_class").css("display", "none")
  602 + })
  603 +
  604 + function zZFun(e) {
  605 + window.event ? (window.event.cancelBubble = true) : e.stopPropagation();
  606 + }
  607 +</script>
  608 +<script>
483 function zZFun(e) { 609 function zZFun(e) {
484 window.event ? (window.event.cancelBubble = true) : e.stopPropagation(); 610 window.event ? (window.event.cancelBubble = true) : e.stopPropagation();
485 } 611 }
486 // 选择学校 612 // 选择学校
487 - $(".three_model_school_left").click(function () {  
488 - var indexs = $(this).index();  
489 - $(".three_model_school_data").eq(indexs).css("display", "block").siblings().css("display", "none");  
490 - }); 613 +// $(".three_model_school_left").click(function () {
  614 +// var indexs = $(this).index();
  615 +// $(".three_model_school_data").eq(indexs).css("display", "block").siblings().css("display", "none");
  616 +// });
491 617
492 $(".log_three_tab_one").click(function () { 618 $(".log_three_tab_one").click(function () {
493 var tabIndex = $(this).index(); 619 var tabIndex = $(this).index();
@@ -560,7 +686,7 @@ @@ -560,7 +686,7 @@
560 display: "block" 686 display: "block"
561 }); 687 });
562 }) 688 })
563 - $(".tx_mask_tongyi .three_model_school_name").click(function () { 689 + $(".tx_mask_tongyi .three_modal_kuaidi_name").click(function () {
564 var index = $(this).index(); 690 var index = $(this).index();
565 $(this).addClass('there_unActive').siblings().removeClass('there_unActive'); 691 $(this).addClass('there_unActive').siblings().removeClass('there_unActive');
566 $('.log_three_select_contant').text($(this).text()).css("color", "#333"); 692 $('.log_three_select_contant').text($(this).text()).css("color", "#333");
@@ -573,12 +699,13 @@ @@ -573,12 +699,13 @@
573 display: "block" 699 display: "block"
574 }); 700 });
575 }); 701 });
576 - $(".tx_mask_kuaidi .three_model_school_name").click(function () { 702 + $(".tx_mask_kuaidi .get_Go").click(function () {
577 var index = $(this).index(); 703 var index = $(this).index();
  704 + console.log($(this).text());
578 $(this).addClass('there_unActive').siblings().removeClass('there_unActive'); 705 $(this).addClass('there_unActive').siblings().removeClass('there_unActive');
579 - $('.log_ps_title').text($(this).text()).css("color", "#333"); 706 + $('.get_Gofo').text($(this).text()).css("color", "#333");
580 $(".tx_mask_kuaidi").hide(); 707 $(".tx_mask_kuaidi").hide();
581 - $('#logistic_name').val($(this).attr('data-name')) 708 +// $('#logistic_name').val($(this).attr('data-name'))
582 }); 709 });
583 var index = $(".log_three_bottom").index(); 710 var index = $(".log_three_bottom").index();
584 $("body").on('click', '.log_three_bottom', function () { 711 $("body").on('click', '.log_three_bottom', function () {
@@ -588,24 +715,24 @@ @@ -588,24 +715,24 @@
588 }); 715 });
589 716
590 //学校/弹窗 717 //学校/弹窗
591 - $(".log_three_select_school").click(function () {  
592 - $(".tx_mask_school").css({  
593 - display: "block"  
594 - });  
595 - }); 718 +// $(".log_three_select_school").click(function () {
  719 +// $(".tx_mask_school").css({
  720 +// display: "block"
  721 +// });
  722 +// });
596 // tab 大学 723 // tab 大学
597 - var $xuexiao  
598 - $(".there_university div").click(function () {  
599 - var index = $(this).index();  
600 - $(this).addClass("there_unActive").siblings().removeClass("there_unActive");  
601 - if ($(this).hasClass("there_unActive")) {  
602 - $xuexiao = $(this).text();  
603 - $(".there_university").hide();  
604 - $(".there_class").show();  
605 - $('.three_model_school_left').eq(0).removeClass('word_color').removeClass('three_model_school_hover');  
606 - $('.three_model_school_left').eq(1).addClass('word_color').addClass('three_model_school_hover');  
607 - }  
608 - }); 724 +// var $xuexiao
  725 +// $(".there_university div").click(function () {
  726 +// var index = $(this).index();
  727 +// $(this).addClass("there_unActive").siblings().removeClass("there_unActive");
  728 +// if ($(this).hasClass("there_unActive")) {
  729 +// $xuexiao = $(this).text();
  730 +// $(".there_university").hide();
  731 +// $(".there_class").show();
  732 +// $('.three_model_school_left').eq(0).removeClass('word_color').removeClass('three_model_school_hover');
  733 +// $('.three_model_school_left').eq(1).addClass('word_color').addClass('three_model_school_hover');
  734 +// }
  735 +// });
609 $('body').on('click', ".there_class div", function () { 736 $('body').on('click', ".there_class div", function () {
610 var index2 = $(this).index(); 737 var index2 = $(this).index();
611 $(this).addClass("there_unActive").siblings().removeClass("there_unActive"); 738 $(this).addClass("there_unActive").siblings().removeClass("there_unActive");
@@ -774,7 +901,7 @@ @@ -774,7 +901,7 @@
774 // if(i == 0){ 901 // if(i == 0){
775 // html += "<div class=\"three_model_school_name there_unActive\" data-id=\""+result[i].id+"\">"+result[i].grade+"—"+i2+"</div>"; 902 // html += "<div class=\"three_model_school_name there_unActive\" data-id=\""+result[i].id+"\">"+result[i].grade+"—"+i2+"</div>";
776 // } 903 // }
777 - html += "<div class=\"three_model_school_name\" data-id=\"" + result[i].id + "\">" + result[i].grade + "-" + i2 + "班</div>"; 904 + html += "<div class=\"three_model_class_name\" data-id=\"" + result[i].id + "\">" + result[i].grade + "-" + i2 + "班</div>";
778 } 905 }
779 } 906 }
780 $('.grade').html(html); 907 $('.grade').html(html);
@@ -29,11 +29,75 @@ @@ -29,11 +29,75 @@
29 .mui-dtpicker-header,.mui-dtpicker-title h5{ 29 .mui-dtpicker-header,.mui-dtpicker-title h5{
30 background-color: white; 30 background-color: white;
31 } 31 }
  32 + .tx_mask_class {
  33 + display: none;
  34 + z-index: 3;
  35 + width: 100%;
  36 + height: 100%;
  37 + position: fixed;
  38 + background-color: rgba(0, 0, 0, 0.5);
  39 + }
  40 +
  41 + .tx_maskCon_class {
  42 + width: 100%;
  43 + height: 5.16rem;
  44 + background: #fff;
  45 + position: fixed;
  46 + bottom: 0;
  47 + }
  48 +
  49 + .three_model_class_name {
  50 + height: 0.36rem;
  51 + margin: 0.08rem;
  52 + font-size: 0.24rem;
  53 + font-weight: 400;
  54 + color: #666666;
  55 + opacity: 1;
  56 + padding: 0.2rem 0;
  57 + line-height: 0;
  58 + border-left: none;
  59 + border-right: none
  60 + }
32 </style> 61 </style>
33 </head> 62 </head>
34 63
35 <body> 64 <body>
36 -<div class="tx_mask_school"> 65 +
  66 +
  67 +<!--学校弹窗-->
  68 +<div class="tx_mask_school" onclick="$(this).hide()">
  69 + <div class="tx_maskCon_school" onclick="zZFun(this)">
  70 + <div class="three_model_school">
  71 + <div class="three_model_school_title">
  72 + 选择学校
  73 + </div>
  74 + <div class="three_model_school_data there_university" style="display: block;">
  75 + <volist name="school" id="vo">
  76 + <div class="three_model_school_name <eq name='key' value='0'>there_unActive</eq>" onclick="click_school({$vo.id})">{$vo.school}</div>
  77 + </volist>
  78 + </div>
  79 + </div>
  80 + </div>
  81 +</div>
  82 +<!--班级弹窗-->
  83 +<div class="tx_mask_class" onclick="$(this).hide()">
  84 + <div class="tx_maskCon_class" onclick="zZFun(this)">
  85 + <div class="three_model_school">
  86 + <div class="three_model_school_title">
  87 + 选择班级
  88 + </div>
  89 + <div class="three_model_school_data there_university banjiadd" style="display: block;">
  90 + <!--<volist name="grade_class_show" id="vo">
  91 + <div class="three_model_school_name banji">{$vo}</div>
  92 + </volist>-->
  93 + </div>
  94 + </div>
  95 + </div>
  96 +</div>
  97 +
  98 +
  99 +
  100 +<!--<div class="tx_mask_school">
37 <div class="tx_maskCon_school"> 101 <div class="tx_maskCon_school">
38 <div class="three_model_school"> 102 <div class="three_model_school">
39 <div class="three_model_school_title"> 103 <div class="three_model_school_title">
@@ -61,7 +125,7 @@ @@ -61,7 +125,7 @@
61 </div> 125 </div>
62 </div> 126 </div>
63 </div> 127 </div>
64 -</div> 128 +</div>-->
65 <div class="log_top_co"> 129 <div class="log_top_co">
66 <!-- 顶部 --> 130 <!-- 顶部 -->
67 <div class=" order_top log_top_co"> 131 <div class=" order_top log_top_co">
@@ -113,13 +177,24 @@ @@ -113,13 +177,24 @@
113 <div class="log_ten_money_selcet"> 177 <div class="log_ten_money_selcet">
114 <div class="log_ten_money_select_top"><span>总盈利：</span>￥{$total_money}</div> 178 <div class="log_ten_money_select_top"><span>总盈利：</span>￥{$total_money}</div>
115 <div class="log_ten_money_select_bottom"> 179 <div class="log_ten_money_select_bottom">
116 - <div class="log_nine_list_one log_banjis"> 180 + <div class="log_nine_list_one log_banjis log_three_select_school2">
117 <div class="log_nine_list_one_left"> 181 <div class="log_nine_list_one_left">
118 <div class="log_ten_money_select_title "> 182 <div class="log_ten_money_select_title ">
119 选择学校 183 选择学校
120 </div> 184 </div>
121 </div> 185 </div>
122 - <div class="log_xue school_grade_class">请选择学校和班级</div> 186 + <div class="log_xue school_grade_class select_school2 xeschool">请选择学校</div>
  187 + <div class="log_nine_list_one_right">
  188 + <img src="__TMPL__/public/assets/images/29.png" alt="" />
  189 + </div>
  190 + </div>
  191 + <div class="log_nine_list_one log_banjis log_three_select_class2">
  192 + <div class="log_nine_list_one_left">
  193 + <div class="log_ten_money_select_title ">
  194 + 选择班级
  195 + </div>
  196 + </div>
  197 + <div class="log_xue school_grade_class select_class2 xegread">请选择班级</div>
123 <div class="log_nine_list_one_right"> 198 <div class="log_nine_list_one_right">
124 <img src="__TMPL__/public/assets/images/29.png" alt="" /> 199 <img src="__TMPL__/public/assets/images/29.png" alt="" />
125 </div> 200 </div>
@@ -201,7 +276,7 @@ @@ -201,7 +276,7 @@
201 grade = JSON.parse(data); 276 grade = JSON.parse(data);
202 $('.banji').remove(); 277 $('.banji').remove();
203 for(i=0;i<grade.length;i++){ 278 for(i=0;i<grade.length;i++){
204 - $('.banjiadd').append("<div class='three_model_school_name banji'>"+grade[i]+"</div>"); 279 + $('.banjiadd').append("<div class='three_model_class_name banji'>"+grade[i]+"</div>");
205 } 280 }
206 }else{ 281 }else{
207 $('.banji').remove(); 282 $('.banji').remove();
@@ -223,20 +298,28 @@ @@ -223,20 +298,28 @@
223 * 298 *
224 */ 299 */
225 function my_query(){ 300 function my_query(){
226 - grade_class = $('.school_grade_class').text(); 301 + xeschool = $('.xeschool').text();
  302 + xegread = $('.xegread').text();
227 start_time = $('.start_time').text(); 303 start_time = $('.start_time').text();
228 end_time = $('.end_time').text(); 304 end_time = $('.end_time').text();
229 - if(grade_class == '请选择学校和班级'){  
230 - grade_class = '';  
231 - }  
232 - if(start_time == '请选择开始时间'){  
233 - start_time = '';  
234 - }  
235 - if(end_time == '请选择结束时间'){  
236 - end_time = ''; 305 +
  306 + if(xeschool == '请选择学校'){
  307 + alert('请选择学校');
  308 + }else{
  309 + if(xegread == '请选择班级'){
  310 + alert('请选择班级');
  311 + }else{
  312 + grade_class = xeschool+' '+xegread;
  313 + if(start_time == '请选择开始时间'){
  314 + start_time = '';
  315 + }
  316 + if(end_time == '请选择结束时间'){
  317 + end_time = '';
  318 + }
  319 + window.location.href = "{:url('Personalcenter/mall_profit')}?grade_class="+grade_class+"&start_time="+start_time+"&end_time="+end_time;
  320 + }
237 } 321 }
238 - window.location.href = "{:url('Personalcenter/mall_profit')}?grade_class="+grade_class+"&start_time="+start_time+"&end_time="+end_time;  
239 - } 322 + }
240 323
241 </script> 324 </script>
242 <script> 325 <script>
@@ -256,21 +339,26 @@ @@ -256,21 +339,26 @@
256 .removeClass("log_ten_block"); 339 .removeClass("log_ten_block");
257 }); 340 });
258 341
  342 +// var dtpicker = new mui.DtPicker({
  343 +// type: "date", //设置日历初始视图模式
  344 +// beginDate: new Date(2015, 04, 25), //设置开始日期
  345 +// labels: ['年', '月', '日'], //设置默认标签区域提示语
  346 +// customData: {
  347 +// h: [{
  348 +// value: 'AM',
  349 +// text: 'AM'
  350 +// },
  351 +// {
  352 +// value: 'PM',
  353 +// text: 'PM'
  354 +// }
  355 +// ]
  356 +// }
  357 +// })
259 var dtpicker = new mui.DtPicker({ 358 var dtpicker = new mui.DtPicker({
260 - type: "date", //设置日历初始视图模式 359 + type: "datetime", //设置日历初始视图模式
261 beginDate: new Date(2015, 04, 25), //设置开始日期 360 beginDate: new Date(2015, 04, 25), //设置开始日期
262 - labels: ['年', '月', '日'], //设置默认标签区域提示语  
263 - customData: {  
264 - h: [{  
265 - value: 'AM',  
266 - text: 'AM'  
267 - },  
268 - {  
269 - value: 'PM',  
270 - text: 'PM'  
271 - }  
272 - ]  
273 - } 361 + labels: ['年', '月', '日','时','分','秒'], //设置默认标签区域提示语
274 }) 362 })
275 //时间/日期别名 363 //时间/日期别名
276 $('.log_nineKai').click(function(){ 364 $('.log_nineKai').click(function(){
@@ -287,12 +375,12 @@ @@ -287,12 +375,12 @@
287 $('.log_jsu').css('color', '#333333'); 375 $('.log_jsu').css('color', '#333333');
288 }); 376 });
289 }) 377 })
290 - //学校/班级弹窗  
291 - $(".log_banjis").click(function() {  
292 - $(".tx_mask_school").css({  
293 - display: "block"  
294 - });  
295 - }); 378 +// //学校/班级弹窗
  379 +// $(".log_banjis").click(function() {
  380 +// $(".tx_mask_school").css({
  381 +// display: "block"
  382 +// });
  383 +// });
296 //tab弹框 384 //tab弹框
297 $(".three_model_school_tab>div").click(function() { 385 $(".three_model_school_tab>div").click(function() {
298 var tabindex = $(this).index(); 386 var tabindex = $(this).index();
@@ -300,39 +388,68 @@ @@ -300,39 +388,68 @@
300 $('.three_model_school_data').eq(tabindex).css('display', 'block').siblings().css('display', 'none'); 388 $('.three_model_school_data').eq(tabindex).css('display', 'block').siblings().css('display', 'none');
301 }); 389 });
302 // tab 大学 390 // tab 大学
303 - var $xuexiao  
304 - $(".there_university div").click(function() {  
305 - var index = $(this).index(); 391 +// var $xuexiao
  392 +// $(".there_university div").click(function() {
  393 +// var index = $(this).index();
  394 +// $(this).addClass("there_unActive").siblings().removeClass("there_unActive");
  395 +// if($(this).hasClass("there_unActive")) {
  396 +// console.log($(this).text());
  397 +// $xuexiao = $(this).text()
  398 +// $(".there_university").hide();
  399 +// $(".there_class").show();
  400 +// $('.three_model_school_left').eq(0).removeClass('word_color').removeClass('three_model_school_hover');
  401 +// $('.three_model_school_left').eq(1).addClass('word_color').addClass('three_model_school_hover');
  402 +// }
  403 +// });
  404 +// $('.there_class div').click(function() {
  405 +// console.log($xuexiao)
  406 +// var index2 = $(this).index();
  407 +// $(this).addClass("there_unActive").siblings().removeClass("there_unActive");
  408 +// if($xuexiao == undefined) {
  409 +// alert('请选择学校')
  410 +// } else if($(this).hasClass("there_unActive")) {
  411 +// var banji = $(this).text();
  412 +// $('.log_xue').text($xuexiao + ' ' + "—" + ' ' + banji);
  413 +// $(".log_xue").css("color","#333")
  414 +// $(".tx_mask_school").hide();
  415 +// }
  416 +// })
  417 + //选择学校
  418 + $(".log_three_select_school2").click(function() {
  419 + $(".tx_mask_school").css("display", "block")
  420 + })
  421 + $(".three_model_school_name").click(function() {
  422 + var str = $(this).text();
  423 + console.log(str);
306 $(this).addClass("there_unActive").siblings().removeClass("there_unActive"); 424 $(this).addClass("there_unActive").siblings().removeClass("there_unActive");
307 - if($(this).hasClass("there_unActive")) {  
308 - console.log($(this).text());  
309 - $xuexiao = $(this).text()  
310 - $(".there_university").hide();  
311 - $(".there_class").show();  
312 - $('.three_model_school_left').eq(0).removeClass('word_color').removeClass('three_model_school_hover');  
313 - $('.three_model_school_left').eq(1).addClass('word_color').addClass('three_model_school_hover');  
314 - }  
315 - });  
316 - $('.there_class div').click(function() {  
317 - console.log($xuexiao)  
318 - var index2 = $(this).index(); 425 + $(".select_school2").text(str);
  426 + $('.select_school2').css('color', '#333333');
  427 + $(".tx_mask_school").css("display", "none")
  428 + })
  429 + //选择班级
  430 + $(".log_three_select_class2").click(function() {
  431 + $(".tx_mask_class").css("display", "block")
  432 + })
  433 + $("body .banjiadd").on('click', '.three_model_class_name', function () {
  434 + var str = $(this).text();
  435 + console.log(str)
319 $(this).addClass("there_unActive").siblings().removeClass("there_unActive"); 436 $(this).addClass("there_unActive").siblings().removeClass("there_unActive");
320 - if($xuexiao == undefined) {  
321 - alert('请选择学校')  
322 - } else if($(this).hasClass("there_unActive")) {  
323 - var banji = $(this).text();  
324 - $('.log_xue').text($xuexiao + ' ' + "—" + ' ' + banji);  
325 - $(".log_xue").css("color","#333")  
326 - $(".tx_mask_school").hide();  
327 - } 437 + $(".select_class2").text(str);
  438 + $('.select_class2').css('color', '#333333');
  439 + $(".tx_mask_class").css("display", "none")
  440 + console.log($(".select_class2").text(str))
328 }) 441 })
  442 +
  443 + function zZFun(e) {
  444 + window.event ? (window.event.cancelBubble = true) : e.stopPropagation();
  445 + }
329 // 关闭弹窗 446 // 关闭弹窗
330 - $(document).mouseup(function(e) {  
331 - var _con = $('.tx_maskCon_school');  
332 - if(!_con.is(e.target) && _con.has(e.target).length === 0) {  
333 - $('.tx_mask_school').hide()  
334 - }  
335 - }) 447 +// $(document).mouseup(function(e) {
  448 +// var _con = $('.tx_maskCon_school');
  449 +// if(!_con.is(e.target) && _con.has(e.target).length === 0) {
  450 +// $('.tx_mask_school').hide()
  451 +// }
  452 +// })
336 </script> 453 </script>
337 </body> 454 </body>
338 455
@@ -204,7 +204,7 @@ class WeChatBaseController extends BaseController @@ -204,7 +204,7 @@ class WeChatBaseController extends BaseController
204 */ 204 */
205 public function checkWeChatUserLogin() 205 public function checkWeChatUserLogin()
206 { 206 {
207 - /*$user = Db::name('user')->where('id',2)->find(); 207 + /*$user = Db::name('user')->where('id',6)->find();
208 cmf_update_current_user($user);*/ 208 cmf_update_current_user($user);*/
209 $userId = cmf_get_current_user_id(); 209 $userId = cmf_get_current_user_id();
210 if (empty($userId)) { 210 if (empty($userId)) {