Merge branch 'zjl_iteration_20181127' into development

resources/views/detail/changeOrder.blade.php

@@ -348,7 +348,8 @@
     </div>
 </div>
 
-@if ($order_info['status'] == 1 && $order_temp_info['status'] == 1)
+<!-- 自营订单客服调价低于80% 显示经理审核 -->
+@if ($order_info['order_goods_type'] != 1 && in_array($order_info['status'], [1, 2]) && $order_temp_info['status'] == 1)
 <script>
     $('#checkOrderForm').find('input').attr('disabled', true);
     $('#checkOrderForm').find('select').attr('disabled', true);