Merge branch 'master' of http://119.23.72.7/zhujilai/Order into zjl_order_track_20190815

resources/views/detail/content.blade.php

@@ -759,7 +759,7 @@
 
                 <!-- 回传合同 -->
                 @if ($order_info['status'] == 2)
-                    <a class="btn btn-warning" id="upload-contract" data-id="{{$order_info['order_id']}}">回传合同</a>
+                    <!-- <a class="btn btn-warning" id="upload-contract" data-id="{{$order_info['order_id']}}">回传合同</a> -->
                 @endif
 
                 @if (in_array($order_info['status'], array(4, 7, 8, 10)) && in_array('order_send', $userPerms)) 

resources/views/orderlist/content.blade.php

@@ -315,11 +315,11 @@
                                         @endif
 
                                         <?php  
-                                            $extend = App\Http\Controllers\getOrderExtend($v['order_id'], 'upload_contract_url'); 
+                                            // $extend = App\Http\Controllers\getOrderExtend($v['order_id'], 'upload_contract_url'); 
 
-                                            if (!empty($extend->upload_contract_url)) {
-                                                echo '<a class="btn btn-warning" href="'.$extend->upload_contract_url.'" target="_blank">客户合同下载</a>';
-                                            }
+                                            // if (!empty($extend->upload_contract_url)) {
+                                            //     echo '<a class="btn btn-warning" href="'.$extend->upload_contract_url.'" target="_blank">客户合同下载</a>';
+                                            // }
                                         ?>
 
                                         @if ($v['status'] == -1 && !$v['cancel_reason'])