Merge branch 'zjl_iteration_20181127' into development

resources/views/detail/changeOrder.blade.php

 <p style="padding-left: 5px;">人工审单</p>
 <div class="tabs-box">
     <div class="order-change-main">
-        @if (($order_info['order_goods_type'] == 1 && $order_info['status'] == 1) || ($order_info['order_goods_type'] != 1 &&in_array($order_info['status'], [1, 2])))
+        @if (($order_info['order_goods_type'] == 1 && $order_info['status'] == 1) || ($order_info['order_goods_type'] != 1 &&in_array($order_info['status'], [1, 2]) && $order_info['adjust_count'] < 2))
         <form id="checkOrderForm" class="form-horizontal table-responsive">
             <input type="hidden" name="order_sn" value="{{$order_info['order_sn']}}">
             <input type="hidden" name="user_id" value="{{$order_info['user_id']}}">
@@ -279,7 +279,7 @@
         </form>
         @endif 
 
-        @if ($order_info['order_goods_type'] == 1 && $order_info['status'] == 2)
+        @if (($order_info['order_goods_type'] == 1 && $order_info['status'] == 2) || ($order_info['order_goods_type'] != 1 && $order_info['adjust_count'] == 2))
         <div class="checked_section">
             <div class="checked_left">
                 <p>交易状态：&nbsp;审核通过，请联系客户及时付款！