Merge branch 'zjl_iteration_20190802' into development

resources/views/detail/content.blade.php

@@ -751,7 +751,7 @@
 
 
                 <!-- 回传合同 -->
                 <!-- 回传合同 -->
                 @if ($order_info['status'] == 2)
                 @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
                 @endif
 
 
                 @if (in_array($order_info['status'], array(4, 7, 8, 10)) && in_array('order_send', $userPerms)) 
                 @if (in_array($order_info['status'], array(4, 7, 8, 10)) && in_array('order_send', $userPerms))