4

@@ -633,6 +633,15 @@ class PersonalcenterController extends WeChatBaseController{
                     $where['a.class'] = trim($school_grade_class[1]);
                     $where['a.class'] = trim($school_grade_class[1]);
                 }
                 }
 
 
+                if($res['is_courier'] != ''){
+                    if($res['is_courier'] == '统一配送'){
+                        $where['a.is_courier'] = 1;
+                    }
+                    if($res['is_courier'] == '快递配送'){
+                        $where['a.is_courier'] = 2;
+                    }
+                }
+
                 if($res['start_time'] != '' && $res['end_time'] != ''){
                 if($res['start_time'] != '' && $res['end_time'] != ''){
                     $start_time = strtotime($res['start_time']);
                     $start_time = strtotime($res['start_time']);
                     $end_time = strtotime($res['end_time']);
                     $end_time = strtotime($res['end_time']);

@@ -208,6 +208,17 @@
                     <img src="__TMPL__/public/assets/images/29.png" alt="" />
                     <img src="__TMPL__/public/assets/images/29.png" alt="" />
                 </div>
                 </div>
             </div>
             </div>
+            <div class="log_nine_list_one log_banjis log_three_select_tongyi">
+                <div class="log_nine_list_one_left">
+                    <div class="log_ten_money_select_title ">
+                        选择配送方式
+                    </div>
+                </div>
+                <div class="log_xue school_grade_class express_word xekuaidi">请选择配送方式</div>
+                <div class="log_nine_list_one_right">
+                    <img src="__TMPL__/public/assets/images/29.png" alt="" />
+                </div>
+            </div>
             <div class="log_nine_list_one log_nineKai">
             <div class="log_nine_list_one log_nineKai">
                 <div class="log_nine_list_one_left">
                 <div class="log_nine_list_one_left">
                     <div class="log_ten_money_select_title">
                     <div class="log_ten_money_select_title">
@@ -276,6 +287,13 @@
 <script src="__TMPL__/public/assets/js/mui.picker.min.js"></script>
 <script src="__TMPL__/public/assets/js/mui.picker.min.js"></script>
 <script src="__TMPL__/public/assets/js/city.data-3.js"></script>
 <script src="__TMPL__/public/assets/js/city.data-3.js"></script>
 <script>
 <script>
+
+</script>
+<script>
+    var expresspicker = new mui.PopPicker();
+
+
+
     var schoolpicker = new mui.PopPicker();
     var schoolpicker = new mui.PopPicker();
     var classpicker = new mui.PopPicker();
     var classpicker = new mui.PopPicker();
     var class_arr = '';
     var class_arr = '';
@@ -286,6 +304,13 @@
             school_arr = {$school};
             school_arr = {$school};
             console.log(data_class_arr,'dfdfds');
             console.log(data_class_arr,'dfdfds');
             $.ready(function() {
             $.ready(function() {
+                expresspicker.setData([{
+                    value: '1',
+                    text: '快递配送'
+                }, {
+                    value: '2',
+                    text: '统一配送'
+                }]);
                 schoolpicker.setData(school_arr);
                 schoolpicker.setData(school_arr);
                 classpicker.setData(data_class_arr);
                 classpicker.setData(data_class_arr);
             });
             });
@@ -317,6 +342,17 @@
             alert("请先选择学校")
             alert("请先选择学校")
         }
         }
     })
     })
+    var express_word
+    $(".log_three_select_tongyi").click(function() {
+        expresspicker.show(function(e) {
+            console.log(e, '3333')
+            console.log(e[0].value);
+            console.log(e[0].text);
+            school_name = e[0].value
+            $(".express_word").text(e[0].text);
+            $('.express_word').css('color', '#333333');
+        });
+    })
 </script>
 </script>
 <script>
 <script>
     /**
     /**
@@ -354,7 +390,7 @@
         xegread = $('.xegread').text();
         xegread = $('.xegread').text();
         start_time = $('.start_time').text();
         start_time = $('.start_time').text();
         end_time = $('.end_time').text();
         end_time = $('.end_time').text();
-
+         is_courier = $('.xekuaidi').text();
 
 
                 grade_class =  xeschool+' '+xegread;
                 grade_class =  xeschool+' '+xegread;
                 console.log(grade_class);
                 console.log(grade_class);
@@ -367,12 +403,13 @@
                 if(start_time == '请选择开始时间'){
                 if(start_time == '请选择开始时间'){
                     start_time = '';
                     start_time = '';
                 }
                 }
+                if(is_courier == '请选择配送方式'){
+                    is_courier = '';
+                }
                 if(end_time == '请选择结束时间'){
                 if(end_time == '请选择结束时间'){
                     end_time = '';
                     end_time = '';
                 }
                 }
-                window.location.href = "{:url('Personalcenter/mall_profit')}?school="+xeschool+"&start_time="+start_time+"&end_time="+end_time+"&grade="+xegread;
-
-
+                window.location.href = "{:url('Personalcenter/mall_profit')}?school="+xeschool+"&start_time="+start_time+"&end_time="+end_time+"&grade="+xegread+"&is_courier="+is_courier;
          }
          }
 
 
 </script>
 </script>