Merge branch 'master' of http://119.23.72.7/zhujilai/Order into hcy_pcb_20181221-r

resources/views/detail/content.blade.php

@@ -32,7 +32,6 @@
                     @endif
                     @endif
 
 
                     @if ($order_info['order_pay_type'] == 2)
                     @if ($order_info['order_pay_type'] == 2)
-                        <th>订单类型</th>
                         <th>预付款</th>
                         <th>预付款</th>
                         <th>尾款</th>
                         <th>尾款</th>
                     @endif
                     @endif

resources/views/selfOrder/content.blade.php

@@ -159,7 +159,7 @@
                         <div class="search-btn">
                         <div class="search-btn">
                             <button class="nbtn search_self_order">搜索</button>
                             <button class="nbtn search_self_order">搜索</button>
 
 
-                            @if (in_array('export', $userPerms))
+                            @if (in_array('self_order_export', $userPerms))
                                 <button class="nbtn self_export" style="margin-left: 20px; background: #23c6c8 !important;">导出</button>
                                 <button class="nbtn self_export" style="margin-left: 20px; background: #23c6c8 !important;">导出</button>
                             @endif
                             @endif
                         </div>
                         </div>