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

7dc9cc48 · PRY5YKGJ82EZEPX\Administrator · d510a9bc · d11577ba · 7dc9cc48 · 7dc9cc48
Commit 7dc9cc48 authored Dec 28, 2018 by $PRY5YKGJ82EZEPX\Administrator's avatar$ PRY5YKGJ82EZEPX\Administrator
Showing with 1 additions and 2 deletions
resources/views/detail/content.blade.php
resources/views/selfOrder/content.blade.php
--- a/resources/views/detail/content.blade.php
+++ b/resources/views/detail/content.blade.php
@@ -32,7 +32,6 @@
                    @endif

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

--- a/resources/views/selfOrder/content.blade.php
+++ b/resources/views/selfOrder/content.blade.php
@@ -159,7 +159,7 @@
                        <div class="search-btn">
                            <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>
                            @endif
                        </div>