Merge branch 'zjl_order_invoice_20181123' into development

resources/views/detail/content.blade.php

@@ -235,7 +235,6 @@
                                 } 
                                 } 
                             ?>
                             ?>
                             <!-- in_array($order_info['status'], [1, 2, 3, 4]) && $order_invoice_info['invoice_status'] < 2 && in_array('self_order_update_invoice', $userPerms) -->
                             <!-- in_array($order_info['status'], [1, 2, 3, 4]) && $order_invoice_info['invoice_status'] < 2 && in_array('self_order_update_invoice', $userPerms) -->
-                                }
                         @elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'erp')
                         @elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'erp')
                             <a href="/changeInvoice/{{$order_info['order_id']}}?tags={{$_REQUEST['tags']}}" class="btn btn-success btn-sm changeBtn">更改发票</a>
                             <a href="/changeInvoice/{{$order_info['order_id']}}?tags={{$_REQUEST['tags']}}" class="btn btn-success btn-sm changeBtn">更改发票</a>
                         @endif
                         @endif