Merge branch 'zjl_create_order_20180813' into development

resources/views/success/content.blade.php

@@ -16,6 +16,8 @@
                             <p>下单时间：{{ date('Y-m-d H:i:s', $order_info->create_time) }}</p>
                             @if ($type == 1) 
                                 <p class="title-tips"><i class="fa fa-info-circle"></i>可在订单中心完善发票信息，最迟在客户付款前一定要完善发票信息，否则无法同步至ERP</p>
+                            @elseif ($type == 3) 
+                                <p class="title-tips"><i class="fa fa-info-circle"></i>为了方便后续操作，请将如下订单编号，备注在ERP中的采购单中。</p>
                             @endif
                         </div>