合并分支 'liuzhen' 到 'master'

Liuzhen



查看合并请求 !142

@@ -128,7 +128,7 @@ class OrderSalesmanController extends WeChatBaseController
             $where['school'] = ['like',"%$param[school]%"];
         }
         if(!empty($param['grade'])){
-            $param['grade'] = explode(' - ',$param['grade']);
+            $param['grade'] = explode('-',$param['grade']);
             $where['grade'] = ['eq',$param['grade'][0]];
             $where['class'] = ['eq',$param['grade'][1]];
         }

@@ -979,7 +979,7 @@
         var is_courier = express_word
 
         $.ajax({
-            'url': "{:url('order_salesman/get_order_salesman')}",
+            'url': "{:url('order_salesman/getOrderSalesman')}",
             'type': "GET",
             'data': {'school': school, 'grade': grade, 'state': state, 'is_courier': is_courier},
             'success': (function (data) {