合并分支 'liuzhen' 到 'master'

订单截图页面调试



查看合并请求 !141

@@ -792,7 +792,7 @@ class PersonalcenterController extends WeChatBaseController{
                     }
                 } else {
                     for($i=$class[0];$i<=$class[1];$i++){
-                        $grade_class_show[] = $val['grade'].'- '.$i."班";
+                        $grade_class_show[] = $val['grade'].'-'.$i."班";
                     }
                 }
             }

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