Merge branch 'zjl_iteration_20191226'

resources/views/detail/content.blade.php

@@ -814,7 +814,7 @@
                 <!-- 判断邮件发送时机 -->
                 <!-- 判断邮件发送时机 -->
               
               
                 @if (!empty($order_temp_info['erp_sn']) )
                 @if (!empty($order_temp_info['erp_sn']) )
-                    <!-- <a class="btn btn-primary send_mail" >发送邮件</a>         -->
+                    <a class="btn btn-primary send_mail" >发送邮件</a>        
                 @endif
                 @endif
                 <!-- 预付款 管理员完成首款对账后改变'对账'按钮 -->
                 <!-- 预付款 管理员完成首款对账后改变'对账'按钮 -->
                 @if (in_array($order_info['status'], [2, 3]) && in_array('check_account', $userPerms))
                 @if (in_array($order_info['status'], [2, 3]) && in_array('check_account', $userPerms))