Merge branch 'zjl_adjust_20180507' into development

resources/views/orderlist/content.blade.php

@@ -275,6 +275,7 @@
                                         <!-- 管理员和经理显示 && sale_id为空 && 订单状态为待审核 -->
                                         @if (in_array($role, [1, 2]) && $v['status'] == 1)
                                             <a class="btn btn-info" href="{{URL('sendSales', ['order_id'=>$v['order_id']])}}" target="_blank">推送</a>
+                                        @endif
                                         
                                         <?php 
                                             $apiUrl = Config('website.api_domain');