fix conflict

resources/views/orderlist/content.blade.php

@@ -272,6 +272,10 @@
     	                                    <a class="btn btn-success" href="{{URL('change', ['order_id'=>$v['order_id']])}}" target="_blank">人工审单</a>
                                         @endif
                                         
+                                        <!-- 管理员和经理显示 && 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>
+
                                         <?php 
                                             $apiUrl = Config('website.api_domain');
                                             $k1  = time();
@@ -282,11 +286,6 @@
                                         @if (in_array('download_contract', $userPerms))
                                             <a class="btn btn-info" href="{{$downLoadUrl}}">下载合同</a>
                                         @endif
-                                        
-                                        <!-- 管理员和经理显示 && 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
                                 </div>
                             </td>
                         </tr>